diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..11abea6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,127 @@
+#-------------------------
+# Operating Specific Junk Files
+#-------------------------
+
+# OS X
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# OS X Thumbnails
+._*
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# Linux
+*~
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+#-------------------------
+# Environment Files
+#-------------------------
+# These should never be under version control,
+# as it poses a security risk.
+.env
+.vagrant
+Vagrantfile
+
+#-------------------------
+# Temporary Files
+#-------------------------
+writable/cache/*
+!writable/cache/index.html
+
+writable/logs/*
+!writable/logs/index.html
+
+writable/session/*
+!writable/session/index.html
+
+writable/uploads/*
+!writable/uploads/index.html
+
+writable/debugbar/*
+
+php_errors.log
+
+#-------------------------
+# User Guide Temp Files
+#-------------------------
+user_guide_src/build/*
+user_guide_src/cilexer/build/*
+user_guide_src/cilexer/dist/*
+user_guide_src/cilexer/pycilexer.egg-info/*
+
+#-------------------------
+# Test Files
+#-------------------------
+tests/coverage*
+
+# Don't save phpunit under version control.
+phpunit
+
+#-------------------------
+# Composer
+#-------------------------
+vendor/
+
+#-------------------------
+# IDE / Development Files
+#-------------------------
+
+# Modules Testing
+_modules/*
+
+# phpenv local config
+.php-version
+
+# Jetbrains editors (PHPStorm, etc)
+.idea/
+*.iml
+
+# Netbeans
+nbproject/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+.nb-gradle/
+
+# Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.sublime-workspace
+*.sublime-project
+.phpintel
+/api/
+
+# Visual Studio Code
+.vscode/
+
+/results/
+/phpunit*.xml
+/.phpunit.*.cache
+
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..a5d6c2a
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,49 @@
+# Disable directory browsing
+Options All -Indexes
+
+# ----------------------------------------------------------------------
+# Rewrite engine
+# ----------------------------------------------------------------------
+
+# Turning on the rewrite engine is necessary for the following rules and features.
+# FollowSymLinks must be enabled for this to work.
+<IfModule mod_rewrite.c>
+	Options +FollowSymlinks
+	RewriteEngine On
+
+	# If you installed CodeIgniter in a subfolder, you will need to
+	# change the following line to match the subfolder you need.
+	# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
+	# RewriteBase /
+
+	# Redirect Trailing Slashes...
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteCond %{REQUEST_URI} (.+)/$
+	RewriteRule ^ %1 [L,R=301]
+
+	# Rewrite "www.example.com -> example.com"
+	RewriteCond %{HTTPS} !=on
+	RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+	RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
+
+	# Checks to see if the user is attempting to access a valid file,
+	# such as an image or css document, if this isn't true it sends the
+	# request to the front controller, index.php
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^([\s\S]*)$ index.php/$1 [L,NC,QSA]
+
+	# Ensure Authorization header is passed along
+	RewriteCond %{HTTP:Authorization} .
+	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+</IfModule>
+
+<IfModule !mod_rewrite.c>
+	# If we don't have mod_rewrite installed, all 404's
+	# can be sent to index.php, and everything works as normal.
+	ErrorDocument 404 index.php
+</IfModule>
+
+# Disable server signature start
+	ServerSignature Off
+# Disable server signature end
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..daac9e5
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 British Columbia Institute of Technology
+Copyright (c) 2019-2021 CodeIgniter Foundation
+
+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.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1f95a41
--- /dev/null
+++ b/README.md
@@ -0,0 +1,56 @@
+# CodeIgniter 4 Framework
+
+## What is CodeIgniter?
+
+CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure.
+More information can be found at the [official site](http://codeigniter.com).
+
+This repository holds the distributable version of the framework,
+including the user guide. It has been built from the
+[development repository](https://github.com/codeigniter4/CodeIgniter4).
+
+More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
+
+The user guide corresponding to this version of the framework can be found
+[here](https://codeigniter4.github.io/userguide/).
+
+
+## Important Change with index.php
+
+`index.php` is no longer in the root of the project! It has been moved inside the *public* folder,
+for better security and separation of components.
+
+This means that you should configure your web server to "point" to your project's *public* folder, and
+not to the project root. A better practice would be to configure a virtual host to point there. A poor practice would be to point your web server to the project root and expect to enter *public/...*, as the rest of your logic and the
+framework are exposed.
+
+**Please** read the user guide for a better explanation of how CI4 works!
+
+## Repository Management
+
+We use Github issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
+FEATURE REQUESTS.
+
+This repository is a "distribution" one, built by our release preparation script.
+Problems with it can be raised on our forum, or as issues in the main repository.
+
+## Contributing
+
+We welcome contributions from the community.
+
+Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md) section in the development repository.
+
+## Server Requirements
+
+PHP version 7.3 or higher is required, with the following extensions installed:
+
+- [intl](http://php.net/manual/en/intl.requirements.php)
+- [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
+
+Additionally, make sure that the following extensions are enabled in your PHP:
+
+- json (enabled by default - don't turn it off)
+- [mbstring](http://php.net/manual/en/mbstring.installation.php)
+- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php)
+- xml (enabled by default - don't turn it off)
diff --git a/app/.htaccess b/app/.htaccess
new file mode 100644
index 0000000..f24db0a
--- /dev/null
+++ b/app/.htaccess
@@ -0,0 +1,6 @@
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/app/Common.php b/app/Common.php
new file mode 100644
index 0000000..780ba3f
--- /dev/null
+++ b/app/Common.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * The goal of this file is to allow developers a location
+ * where they can overwrite core procedural functions and
+ * replace them with their own. This file is loaded during
+ * the bootstrap process and is called during the frameworks
+ * execution.
+ *
+ * This can be looked at as a `master helper` file that is
+ * loaded early on, and may also contain additional functions
+ * that you'd like to use throughout your entire application
+ *
+ * @link: https://codeigniter4.github.io/CodeIgniter4/
+ */
diff --git a/app/Config/App.php b/app/Config/App.php
new file mode 100644
index 0000000..efa7a33
--- /dev/null
+++ b/app/Config/App.php
@@ -0,0 +1,465 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class App extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Base Site URL
+	 * --------------------------------------------------------------------------
+	 *
+	 * URL to your CodeIgniter root. Typically this will be your base URL,
+	 * WITH a trailing slash:
+	 *
+	 *    http://example.com/
+	 *
+	 * If this is not set then CodeIgniter will try guess the protocol, domain
+	 * and path to your installation. However, you should always configure this
+	 * explicitly and never rely on auto-guessing, especially in production
+	 * environments.
+	 *
+	 * @var string
+	 */
+	public $baseURL = 'http://localhost/domino_api';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Index File
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically this will be your index.php file, unless you've renamed it to
+	 * something else. If you are using mod_rewrite to remove the page set this
+	 * variable so that it is blank.
+	 *
+	 * @var string
+	 */
+	public $indexPage = 'index.php';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * URI PROTOCOL
+	 * --------------------------------------------------------------------------
+	 *
+	 * This item determines which getServer global should be used to retrieve the
+	 * URI string.  The default setting of 'REQUEST_URI' works for most servers.
+	 * If your links do not seem to work, try one of the other delicious flavors:
+	 *
+	 * 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+	 * 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+	 * 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+	 *
+	 * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
+	 *
+	 * @var string
+	 */
+	public $uriProtocol = 'REQUEST_URI';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Default Locale
+	 * --------------------------------------------------------------------------
+	 *
+	 * The Locale roughly represents the language and location that your visitor
+	 * is viewing the site from. It affects the language strings and other
+	 * strings (like currency markers, numbers, etc), that your program
+	 * should run under for this request.
+	 *
+	 * @var string
+	 */
+	public $defaultLocale = 'es';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Negotiate Locale
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, the current Request object will automatically determine the
+	 * language to use based on the value of the Accept-Language header.
+	 *
+	 * If false, no automatic detection will be performed.
+	 *
+	 * @var boolean
+	 */
+	public $negotiateLocale = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Supported Locales
+	 * --------------------------------------------------------------------------
+	 *
+	 * If $negotiateLocale is true, this array lists the locales supported
+	 * by the application in descending order of priority. If no match is
+	 * found, the first locale will be used.
+	 *
+	 * @var string[]
+	 */
+	public $supportedLocales = ['en'];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Application Timezone
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default timezone that will be used in your application to display
+	 * dates with the date helper, and can be retrieved through app_timezone()
+	 *
+	 * @var string
+	 */
+	public $appTimezone = 'America/Chicago';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Default Character Set
+	 * --------------------------------------------------------------------------
+	 *
+	 * This determines which character set is used by default in various methods
+	 * that require a character set to be provided.
+	 *
+	 * @see http://php.net/htmlspecialchars for a list of supported charsets.
+	 *
+	 * @var string
+	 */
+	public $charset = 'UTF-8';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * URI PROTOCOL
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, this will force every request made to this application to be
+	 * made via a secure connection (HTTPS). If the incoming request is not
+	 * secure, the user will be redirected to a secure version of the page
+	 * and the HTTP Strict Transport Security header will be set.
+	 *
+	 * @var boolean
+	 */
+	public $forceGlobalSecureRequests = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Driver
+	 * --------------------------------------------------------------------------
+	 *
+	 * The session storage driver to use:
+	 * - `CodeIgniter\Session\Handlers\FileHandler`
+	 * - `CodeIgniter\Session\Handlers\DatabaseHandler`
+	 * - `CodeIgniter\Session\Handlers\MemcachedHandler`
+	 * - `CodeIgniter\Session\Handlers\RedisHandler`
+	 *
+	 * @var string
+	 */
+	public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The session cookie name, must contain only [0-9a-z_-] characters
+	 *
+	 * @var string
+	 */
+	public $sessionCookieName = 'ci_session';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Expiration
+	 * --------------------------------------------------------------------------
+	 *
+	 * The number of SECONDS you want the session to last.
+	 * Setting to 0 (zero) means expire when the browser is closed.
+	 *
+	 * @var integer
+	 */
+	public $sessionExpiration = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Save Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * The location to save sessions to and is driver dependent.
+	 *
+	 * For the 'files' driver, it's a path to a writable directory.
+	 * WARNING: Only absolute paths are supported!
+	 *
+	 * For the 'database' driver, it's a table name.
+	 * Please read up the manual for the format with other session drivers.
+	 *
+	 * IMPORTANT: You are REQUIRED to set a valid save path!
+	 *
+	 * @var string
+	 */
+	public $sessionSavePath = WRITEPATH . 'session';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Match IP
+	 * --------------------------------------------------------------------------
+	 *
+	 * Whether to match the user's IP address when reading the session data.
+	 *
+	 * WARNING: If you're using the database driver, don't forget to update
+	 *          your session table's PRIMARY KEY when changing this setting.
+	 *
+	 * @var boolean
+	 */
+	public $sessionMatchIP = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Time to Update
+	 * --------------------------------------------------------------------------
+	 *
+	 * How many seconds between CI regenerating the session ID.
+	 *
+	 * @var integer
+	 */
+	public $sessionTimeToUpdate = 300;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Regenerate Destroy
+	 * --------------------------------------------------------------------------
+	 *
+	 * Whether to destroy session data associated with the old session ID
+	 * when auto-regenerating the session ID. When set to FALSE, the data
+	 * will be later deleted by the garbage collector.
+	 *
+	 * @var boolean
+	 */
+	public $sessionRegenerateDestroy = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$prefix property instead.
+	 */
+	public $cookiePrefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$domain property instead.
+	 */
+	public $cookieDomain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$path property instead.
+	 */
+	public $cookiePath = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated use Config\Cookie::$secure property instead.
+	 */
+	public $cookieSecure = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HttpOnly
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated use Config\Cookie::$httponly property instead.
+	 */
+	public $cookieHTTPOnly = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Alternatively, you can use the constant names:
+	 * - `Cookie::SAMESITE_NONE`
+	 * - `Cookie::SAMESITE_LAX`
+	 * - `Cookie::SAMESITE_STRICT`
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
+	 * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$samesite property instead.
+	 */
+	public $cookieSameSite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Reverse Proxy IPs
+	 * --------------------------------------------------------------------------
+	 *
+	 * If your server is behind a reverse proxy, you must whitelist the proxy
+	 * IP addresses from which CodeIgniter should trust headers such as
+	 * HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+	 * the visitor's IP address.
+	 *
+	 * You can use both an array or a comma-separated list of proxy addresses,
+	 * as well as specifying whole subnets. Here are a few examples:
+	 *
+	 * Comma-separated:	'10.0.1.200,192.168.5.0/24'
+	 * Array: ['10.0.1.200', '192.168.5.0/24']
+	 *
+	 * @var string|string[]
+	 */
+	public $proxyIPs = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Token Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The token name.
+	 *
+	 * @deprecated Use `Config\Security` $tokenName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFTokenName = 'csrf_test_name';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Header Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The header name.
+	 *
+	 * @deprecated Use `Config\Security` $headerName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFHeaderName = 'X-CSRF-TOKEN';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The cookie name.
+	 *
+	 * @deprecated Use `Config\Security` $cookieName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFCookieName = 'csrf_cookie_name';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Expire
+	 * --------------------------------------------------------------------------
+	 *
+	 * The number in seconds the token should expire.
+	 *
+	 * @deprecated Use `Config\Security` $expire property instead of using this property.
+	 *
+	 * @var integer
+	 */
+	public $CSRFExpire = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Regenerate
+	 * --------------------------------------------------------------------------
+	 *
+	 * Regenerate token on every submission?
+	 *
+	 * @deprecated Use `Config\Security` $regenerate property instead of using this property.
+	 *
+	 * @var boolean
+	 */
+	public $CSRFRegenerate = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Redirect
+	 * --------------------------------------------------------------------------
+	 *
+	 * Redirect to previous page with error on failure?
+	 *
+	 * @deprecated Use `Config\Security` $redirect property instead of using this property.
+	 *
+	 * @var boolean
+	 */
+	public $CSRFRedirect = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Setting for CSRF SameSite cookie token. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Defaults to `Lax` as recommended in this link:
+	 *
+	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
+	 *
+	 * @deprecated Use `Config\Security` $samesite property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFSameSite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Content Security Policy
+	 * --------------------------------------------------------------------------
+	 *
+	 * Enables the Response's Content Secure Policy to restrict the sources that
+	 * can be used for images, scripts, CSS files, audio, video, etc. If enabled,
+	 * the Response object will populate default values for the policy from the
+	 * `ContentSecurityPolicy.php` file. Controllers can always add to those
+	 * restrictions at run time.
+	 *
+	 * For a better understanding of CSP, see these documents:
+	 *
+	 * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
+	 * @see http://www.w3.org/TR/CSP/
+	 *
+	 * @var boolean
+	 */
+	public $CSPEnabled = false;
+}
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
new file mode 100644
index 0000000..1ed5e3f
--- /dev/null
+++ b/app/Config/Autoload.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
+/**
+ * -------------------------------------------------------------------
+ * AUTOLOADER CONFIGURATION
+ * -------------------------------------------------------------------
+ *
+ * This file defines the namespaces and class maps so the Autoloader
+ * can find the files as needed.
+ *
+ * NOTE: If you use an identical key in $psr4 or $classmap, then
+ * the values in this file will overwrite the framework's values.
+ */
+class Autoload extends AutoloadConfig
+{
+	/**
+	 * -------------------------------------------------------------------
+	 * Namespaces
+	 * -------------------------------------------------------------------
+	 * This maps the locations of any namespaces in your application to
+	 * their location on the file system. These are used by the autoloader
+	 * to locate files the first time they have been instantiated.
+	 *
+	 * The '/app' and '/system' directories are already mapped for you.
+	 * you may change the name of the 'App' namespace if you wish,
+	 * but this should be done prior to creating any namespaced classes,
+	 * else you will need to modify all of those classes for this to work.
+	 *
+	 * Prototype:
+	 *```
+	 *   $psr4 = [
+	 *       'CodeIgniter' => SYSTEMPATH,
+	 *       'App'	       => APPPATH
+	 *   ];
+	 *```
+	 * @var array<string, string>
+	 */
+	public $psr4 = [
+		APP_NAMESPACE => APPPATH, // For custom app namespace
+		'Config'      => APPPATH . 'Config',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Class Map
+	 * -------------------------------------------------------------------
+	 * The class map provides a map of class names and their exact
+	 * location on the drive. Classes loaded in this manner will have
+	 * slightly faster performance because they will not have to be
+	 * searched for within one or more directories as they would if they
+	 * were being autoloaded through a namespace.
+	 *
+	 * Prototype:
+	 *```
+	 *   $classmap = [
+	 *       'MyClass'   => '/path/to/class/file.php'
+	 *   ];
+	 *```
+	 * @var array<string, string>
+	 */
+	public $classmap = [];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Files
+	 * -------------------------------------------------------------------
+	 * The files array provides a list of paths to __non-class__ files
+	 * that will be autoloaded. This can be useful for bootstrap operations
+	 * or for loading functions.
+	 *
+	 * Prototype:
+	 * ```
+	 *	  $files = [
+	 *	 	   '/path/to/my/file.php',
+	 *    ];
+	 * ```
+	 * @var array<int, string>
+	 */
+	public $files = [];
+}
diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
new file mode 100644
index 0000000..05a8612
--- /dev/null
+++ b/app/Config/Boot/development.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
+ */
+error_reporting(-1);
+ini_set('display_errors', '1');
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG BACKTRACES
+ |--------------------------------------------------------------------------
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
+ */
+defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. This will control whether Kint is loaded, and a few other
+ | items. It can always be used within your own application too.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php
new file mode 100644
index 0000000..21d2580
--- /dev/null
+++ b/app/Config/Boot/production.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | Don't show ANY in production environments. Instead, let the system catch
+ | it and display a generic error message.
+ */
+ini_set('display_errors', '0');
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', false);
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
new file mode 100644
index 0000000..e07a1d4
--- /dev/null
+++ b/app/Config/Boot/testing.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
+ */
+error_reporting(-1);
+ini_set('display_errors', '1');
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG BACKTRACES
+ |--------------------------------------------------------------------------
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
+ */
+defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
new file mode 100644
index 0000000..e5711a3
--- /dev/null
+++ b/app/Config/Cache.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Cache\Handlers\DummyHandler;
+use CodeIgniter\Cache\Handlers\FileHandler;
+use CodeIgniter\Cache\Handlers\MemcachedHandler;
+use CodeIgniter\Cache\Handlers\PredisHandler;
+use CodeIgniter\Cache\Handlers\RedisHandler;
+use CodeIgniter\Cache\Handlers\WincacheHandler;
+use CodeIgniter\Config\BaseConfig;
+
+class Cache extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Primary Handler
+	 * --------------------------------------------------------------------------
+	 *
+	 * The name of the preferred handler that should be used. If for some reason
+	 * it is not available, the $backupHandler will be used in its place.
+	 *
+	 * @var string
+	 */
+	public $handler = 'file';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Backup Handler
+	 * --------------------------------------------------------------------------
+	 *
+	 * The name of the handler that will be used in case the first one is
+	 * unreachable. Often, 'file' is used here since the filesystem is
+	 * always available, though that's not always practical for the app.
+	 *
+	 * @var string
+	 */
+	public $backupHandler = 'dummy';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cache Directory Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * The path to where cache files should be stored, if using a file-based
+	 * system.
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use the driver-specific variant under $file
+	 */
+	public $storePath = WRITEPATH . 'cache/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cache Include Query String
+	 * --------------------------------------------------------------------------
+	 *
+	 * Whether to take the URL query string into consideration when generating
+	 * output cache files. Valid options are:
+	 *
+	 *    false      = Disabled
+	 *    true       = Enabled, take all query parameters into account.
+	 *                 Please be aware that this may result in numerous cache
+	 *                 files generated for the same page over and over again.
+	 *    array('q') = Enabled, but only take into account the specified list
+	 *                 of query parameters.
+	 *
+	 * @var boolean|string[]
+	 */
+	public $cacheQueryString = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Key Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * This string is added to all cache item names to help avoid collisions
+	 * if you run multiple applications with the same cache engine.
+	 *
+	 * @var string
+	 */
+	public $prefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Default TTL
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default number of seconds to save items when none is specified.
+	 *
+	 * WARNING: This is not used by framework handlers where 60 seconds is
+	 * hard-coded, but may be useful to projects and modules. This will replace
+	 * the hard-coded value in a future release.
+	 *
+	 * @var integer
+	 */
+	public $ttl = 60;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * File settings
+	 * --------------------------------------------------------------------------
+	 * Your file storage preferences can be specified below, if you are using
+	 * the File driver.
+	 *
+	 * @var array<string, string|int|null>
+	 */
+	public $file = [
+		'storePath' => WRITEPATH . 'cache/',
+		'mode'      => 0640,
+	];
+
+	/**
+	 * -------------------------------------------------------------------------
+	 * Memcached settings
+	 * -------------------------------------------------------------------------
+	 * Your Memcached servers can be specified below, if you are using
+	 * the Memcached drivers.
+	 *
+	 * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
+	 *
+	 * @var array<string, string|int|boolean>
+	 */
+	public $memcached = [
+		'host'   => '127.0.0.1',
+		'port'   => 11211,
+		'weight' => 1,
+		'raw'    => false,
+	];
+
+	/**
+	 * -------------------------------------------------------------------------
+	 * Redis settings
+	 * -------------------------------------------------------------------------
+	 * Your Redis server can be specified below, if you are using
+	 * the Redis or Predis drivers.
+	 *
+	 * @var array<string, string|int|null>
+	 */
+	public $redis = [
+		'host'     => '127.0.0.1',
+		'password' => null,
+		'port'     => 6379,
+		'timeout'  => 0,
+		'database' => 0,
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Available Cache Handlers
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is an array of cache engine alias' and class names. Only engines
+	 * that are listed here are allowed to be used.
+	 *
+	 * @var array<string, string>
+	 */
+	public $validHandlers = [
+		'dummy'     => DummyHandler::class,
+		'file'      => FileHandler::class,
+		'memcached' => MemcachedHandler::class,
+		'predis'    => PredisHandler::class,
+		'redis'     => RedisHandler::class,
+		'wincache'  => WincacheHandler::class,
+	];
+}
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
new file mode 100644
index 0000000..8f8498a
--- /dev/null
+++ b/app/Config/Constants.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ | --------------------------------------------------------------------
+ | App Namespace
+ | --------------------------------------------------------------------
+ |
+ | This defines the default Namespace that is used throughout
+ | CodeIgniter to refer to the Application directory. Change
+ | this constant to change the namespace that all application
+ | classes should use.
+ |
+ | NOTE: changing this will require manually modifying the
+ | existing namespaces of App\* namespaced-classes.
+ */
+defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');
+
+/*
+ | --------------------------------------------------------------------------
+ | Composer Path
+ | --------------------------------------------------------------------------
+ |
+ | The path that Composer's autoload file is expected to live. By default,
+ | the vendor folder is in the Root directory, but you can customize that here.
+ */
+defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . 'vendor/autoload.php');
+
+/*
+ |--------------------------------------------------------------------------
+ | Timing Constants
+ |--------------------------------------------------------------------------
+ |
+ | Provide simple ways to work with the myriad of PHP functions that
+ | require information to be in seconds.
+ */
+defined('SECOND') || define('SECOND', 1);
+defined('MINUTE') || define('MINUTE', 60);
+defined('HOUR')   || define('HOUR', 3600);
+defined('DAY')    || define('DAY', 86400);
+defined('WEEK')   || define('WEEK', 604800);
+defined('MONTH')  || define('MONTH', 2592000);
+defined('YEAR')   || define('YEAR', 31536000);
+defined('DECADE') || define('DECADE', 315360000);
+
+/*
+ | --------------------------------------------------------------------------
+ | Exit Status Codes
+ | --------------------------------------------------------------------------
+ |
+ | Used to indicate the conditions under which the script is exit()ing.
+ | While there is no universal standard for error codes, there are some
+ | broad conventions.  Three such conventions are mentioned below, for
+ | those who wish to make use of them.  The CodeIgniter defaults were
+ | chosen for the least overlap with these conventions, while still
+ | leaving room for others to be defined in future versions and user
+ | applications.
+ |
+ | The three main conventions used for determining exit status codes
+ | are as follows:
+ |
+ |    Standard C/C++ Library (stdlibc):
+ |       http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
+ |       (This link also contains other GNU-specific conventions)
+ |    BSD sysexits.h:
+ |       http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits
+ |    Bash scripting:
+ |       http://tldp.org/LDP/abs/html/exitcodes.html
+ |
+ */
+defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR')          || define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
+defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
new file mode 100644
index 0000000..a04e3d0
--- /dev/null
+++ b/app/Config/ContentSecurityPolicy.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Stores the default settings for the ContentSecurityPolicy, if you
+ * choose to use it. The values here will be read in and set as defaults
+ * for the site. If needed, they can be overridden on a page-by-page basis.
+ *
+ * Suggested reference for explanations:
+ *
+ * @see https://www.html5rocks.com/en/tutorials/security/content-security-policy/
+ */
+class ContentSecurityPolicy extends BaseConfig
+{
+	//-------------------------------------------------------------------------
+	// Broadbrush CSP management
+	//-------------------------------------------------------------------------
+
+	/**
+	 * Default CSP report context
+	 *
+	 * @var boolean
+	 */
+	public $reportOnly = false;
+
+	/**
+	 * Specifies a URL where a browser will send reports
+	 * when a content security policy is violated.
+	 *
+	 * @var string|null
+	 */
+	public $reportURI = null;
+
+	/**
+	 * Instructs user agents to rewrite URL schemes, changing
+	 * HTTP to HTTPS. This directive is for websites with
+	 * large numbers of old URLs that need to be rewritten.
+	 *
+	 * @var boolean
+	 */
+	public $upgradeInsecureRequests = false;
+
+	//-------------------------------------------------------------------------
+	// Sources allowed
+	// Note: once you set a policy to 'none', it cannot be further restricted
+	//-------------------------------------------------------------------------
+
+	/**
+	 * Will default to self if not overridden
+	 *
+	 * @var string|string[]|null
+	 */
+	public $defaultSrc = null;
+
+	/**
+	 * Lists allowed scripts' URLs.
+	 *
+	 * @var string|string[]
+	 */
+	public $scriptSrc = 'self';
+
+	/**
+	 * Lists allowed stylesheets' URLs.
+	 *
+	 * @var string|string[]
+	 */
+	public $styleSrc = 'self';
+
+	/**
+	 * Defines the origins from which images can be loaded.
+	 *
+	 * @var string|string[]
+	 */
+	public $imageSrc = 'self';
+
+	/**
+	 * Restricts the URLs that can appear in a page's `<base>` element.
+	 *
+	 * Will default to self if not overridden
+	 *
+	 * @var string|string[]|null
+	 */
+	public $baseURI = null;
+
+	/**
+	 * Lists the URLs for workers and embedded frame contents
+	 *
+	 * @var string|string[]
+	 */
+	public $childSrc = 'self';
+
+	/**
+	 * Limits the origins that you can connect to (via XHR,
+	 * WebSockets, and EventSource).
+	 *
+	 * @var string|string[]
+	 */
+	public $connectSrc = 'self';
+
+	/**
+	 * Specifies the origins that can serve web fonts.
+	 *
+	 * @var string|string[]
+	 */
+	public $fontSrc = null;
+
+	/**
+	 * Lists valid endpoints for submission from `<form>` tags.
+	 *
+	 * @var string|string[]
+	 */
+	public $formAction = 'self';
+
+	/**
+	 * Specifies the sources that can embed the current page.
+	 * This directive applies to `<frame>`, `<iframe>`, `<embed>`,
+	 * and `<applet>` tags. This directive can't be used in
+	 * `<meta>` tags and applies only to non-HTML resources.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $frameAncestors = null;
+
+	/**
+	 * The frame-src directive restricts the URLs which may
+	 * be loaded into nested browsing contexts.
+	 *
+	 * @var array|string|null
+	 */
+	public $frameSrc = null;
+
+	/**
+	 * Restricts the origins allowed to deliver video and audio.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $mediaSrc = null;
+
+	/**
+	 * Allows control over Flash and other plugins.
+	 *
+	 * @var string|string[]
+	 */
+	public $objectSrc = 'self';
+
+	/**
+	 * @var string|string[]|null
+	 */
+	public $manifestSrc = null;
+
+	/**
+	 * Limits the kinds of plugins a page may invoke.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $pluginTypes = null;
+
+	/**
+	 * List of actions allowed.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $sandbox = null;
+}
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
new file mode 100644
index 0000000..4e4e20d
--- /dev/null
+++ b/app/Config/Cookie.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use DateTimeInterface;
+
+class Cookie extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 */
+	public $prefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Expires Timestamp
+	 * --------------------------------------------------------------------------
+	 *
+	 * Default expires timestamp for cookies. Setting this to `0` will mean the
+	 * cookie will not have the `Expires` attribute and will behave as a session
+	 * cookie.
+	 *
+	 * @var DateTimeInterface|integer|string
+	 */
+	public $expires = 0;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 */
+	public $path = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 */
+	public $domain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 */
+	public $secure = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HTTPOnly
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 */
+	public $httponly = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Alternatively, you can use the constant names:
+	 * - `Cookie::SAMESITE_NONE`
+	 * - `Cookie::SAMESITE_LAX`
+	 * - `Cookie::SAMESITE_STRICT`
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
+	 * will be set on cookies. If set to `None`, `$secure` must also be set.
+	 *
+	 * @var string
+	 */
+	public $samesite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Raw
+	 * --------------------------------------------------------------------------
+	 *
+	 * This flag allows setting a "raw" cookie, i.e., its name and value are
+	 * not URL encoded using `rawurlencode()`.
+	 *
+	 * If this is set to `true`, cookie names should be compliant of RFC 2616's
+	 * list of allowed characters.
+	 *
+	 * @var boolean
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
+	 * @see https://tools.ietf.org/html/rfc2616#section-2.2
+	 */
+	public $raw = false;
+}
diff --git a/app/Config/Database.php b/app/Config/Database.php
new file mode 100644
index 0000000..a0b46c3
--- /dev/null
+++ b/app/Config/Database.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Database\Config;
+
+/**
+ * Database Configuration
+ */
+class Database extends Config
+{
+	/**
+	 * The directory that holds the Migrations
+	 * and Seeds directories.
+	 *
+	 * @var string
+	 */
+	public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
+
+	/**
+	 * Lets you choose which connection group to
+	 * use if no other is specified.
+	 *
+	 * @var string
+	 */
+	public $defaultGroup = 'default';
+
+	/**
+	 * The default database connection.
+	 *
+	 * @var array
+	 */
+	public $default = [
+		'DSN'      => '',
+		'hostname' => 'localhost',
+		'username' => '',
+		'password' => '',
+		'database' => '',
+		'DBDriver' => 'MySQLi',
+		'DBPrefix' => '',
+		'pConnect' => false,
+		'DBDebug'  => (ENVIRONMENT !== 'production'),
+		'charset'  => 'utf8',
+		'DBCollat' => 'utf8_general_ci',
+		'swapPre'  => '',
+		'encrypt'  => false,
+		'compress' => false,
+		'strictOn' => false,
+		'failover' => [],
+		'port'     => 3306,
+	];
+
+	/**
+	 * This database connection is used when
+	 * running PHPUnit database tests.
+	 *
+	 * @var array
+	 */
+	public $tests = [
+		'DSN'      => '',
+		'hostname' => '127.0.0.1',
+		'username' => '',
+		'password' => '',
+		'database' => ':memory:',
+		'DBDriver' => 'SQLite3',
+		'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
+		'pConnect' => false,
+		'DBDebug'  => (ENVIRONMENT !== 'production'),
+		'charset'  => 'utf8',
+		'DBCollat' => 'utf8_general_ci',
+		'swapPre'  => '',
+		'encrypt'  => false,
+		'compress' => false,
+		'strictOn' => false,
+		'failover' => [],
+		'port'     => 3306,
+	];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Ensure that we always set the database group to 'tests' if
+		// we are currently running an automated test suite, so that
+		// we don't overwrite live data on accident.
+		if (ENVIRONMENT === 'testing')
+		{
+			$this->defaultGroup = 'tests';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+}
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
new file mode 100644
index 0000000..dc85c04
--- /dev/null
+++ b/app/Config/DocTypes.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Config;
+
+class DocTypes
+{
+	/**
+	 * List of valid document types.
+	 *
+	 * @var array<string, string>
+	 */
+	public $list = [
+		'xhtml11'           => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+		'xhtml1-strict'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+		'xhtml1-trans'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+		'xhtml1-frame'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+		'xhtml-basic11'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+		'html5'             => '<!DOCTYPE html>',
+		'html4-strict'      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+		'html4-trans'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+		'html4-frame'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+		'mathml1'           => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+		'mathml2'           => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+		'svg10'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+		'svg11'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+		'svg11-basic'       => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+		'svg11-tiny'        => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+		'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+		'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+		'xhtml-rdfa-1'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+		'xhtml-rdfa-2'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
+	];
+}
diff --git a/app/Config/Email.php b/app/Config/Email.php
new file mode 100644
index 0000000..1d0c181
--- /dev/null
+++ b/app/Config/Email.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Email extends BaseConfig
+{
+	/**
+	 * @var string
+	 */
+	public $fromEmail;
+
+	/**
+	 * @var string
+	 */
+	public $fromName;
+
+	/**
+	 * @var string
+	 */
+	public $recipients;
+
+	/**
+	 * The "user agent"
+	 *
+	 * @var string
+	 */
+	public $userAgent = 'CodeIgniter';
+
+	/**
+	 * The mail sending protocol: mail, sendmail, smtp
+	 *
+	 * @var string
+	 */
+	public $protocol = 'mail';
+
+	/**
+	 * The server path to Sendmail.
+	 *
+	 * @var string
+	 */
+	public $mailPath = '/usr/sbin/sendmail';
+
+	/**
+	 * SMTP Server Address
+	 *
+	 * @var string
+	 */
+	public $SMTPHost;
+
+	/**
+	 * SMTP Username
+	 *
+	 * @var string
+	 */
+	public $SMTPUser;
+
+	/**
+	 * SMTP Password
+	 *
+	 * @var string
+	 */
+	public $SMTPPass;
+
+	/**
+	 * SMTP Port
+	 *
+	 * @var integer
+	 */
+	public $SMTPPort = 25;
+
+	/**
+	 * SMTP Timeout (in seconds)
+	 *
+	 * @var integer
+	 */
+	public $SMTPTimeout = 5;
+
+	/**
+	 * Enable persistent SMTP connections
+	 *
+	 * @var boolean
+	 */
+	public $SMTPKeepAlive = false;
+
+	/**
+	 * SMTP Encryption. Either tls or ssl
+	 *
+	 * @var string
+	 */
+	public $SMTPCrypto = 'tls';
+
+	/**
+	 * Enable word-wrap
+	 *
+	 * @var boolean
+	 */
+	public $wordWrap = true;
+
+	/**
+	 * Character count to wrap at
+	 *
+	 * @var integer
+	 */
+	public $wrapChars = 76;
+
+	/**
+	 * Type of mail, either 'text' or 'html'
+	 *
+	 * @var string
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (utf-8, iso-8859-1, etc.)
+	 *
+	 * @var string
+	 */
+	public $charset = 'UTF-8';
+
+	/**
+	 * Whether to validate the email address
+	 *
+	 * @var boolean
+	 */
+	public $validate = false;
+
+	/**
+	 * Email Priority. 1 = highest. 5 = lowest. 3 = normal
+	 *
+	 * @var integer
+	 */
+	public $priority = 3;
+
+	/**
+	 * Newline character. (Use ā€œ\r\nā€ to comply with RFC 822)
+	 *
+	 * @var string
+	 */
+	public $CRLF = "\r\n";
+
+	/**
+	 * Newline character. (Use ā€œ\r\nā€ to comply with RFC 822)
+	 *
+	 * @var string
+	 */
+	public $newline = "\r\n";
+
+	/**
+	 * Enable BCC Batch Mode.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * Number of emails in each BCC batch
+	 *
+	 * @var integer
+	 */
+	public $BCCBatchSize = 200;
+
+	/**
+	 * Enable notify message from server
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+}
diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
new file mode 100644
index 0000000..39c6fd3
--- /dev/null
+++ b/app/Config/Encryption.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Encryption configuration.
+ *
+ * These are the settings used for encryption, if you don't pass a parameter
+ * array to the encrypter for creation/initialization.
+ */
+class Encryption extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Encryption Key Starter
+	 * --------------------------------------------------------------------------
+	 *
+	 * If you use the Encryption class you must set an encryption key (seed).
+	 * You need to ensure it is long enough for the cipher and mode you plan to use.
+	 * See the user guide for more info.
+	 *
+	 * @var string
+	 */
+	public $key = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Encryption Driver to Use
+	 * --------------------------------------------------------------------------
+	 *
+	 * One of the supported encryption drivers.
+	 *
+	 * Available drivers:
+	 * - OpenSSL
+	 * - Sodium
+	 *
+	 * @var string
+	 */
+	public $driver = 'OpenSSL';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * SodiumHandler's Padding Length in Bytes
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is the number of bytes that will be padded to the plaintext message
+	 * before it is encrypted. This value should be greater than zero.
+	 *
+	 * See the user guide for more information on padding.
+	 *
+	 * @var integer
+	 */
+	public $blockSize = 16;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Encryption digest
+	 * --------------------------------------------------------------------------
+	 *
+	 * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
+	 *
+	 * @var string
+	 */
+	public $digest = 'SHA512';
+}
diff --git a/app/Config/Events.php b/app/Config/Events.php
new file mode 100644
index 0000000..49dd96e
--- /dev/null
+++ b/app/Config/Events.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
+
+/*
+ * --------------------------------------------------------------------
+ * Application Events
+ * --------------------------------------------------------------------
+ * Events allow you to tap into the execution of the program without
+ * modifying or extending core files. This file provides a central
+ * location to define your events, though they can always be added
+ * at run-time, also, if needed.
+ *
+ * You create code that can execute by subscribing to events with
+ * the 'on()' method. This accepts any form of callable, including
+ * Closures, that will be executed when the event is triggered.
+ *
+ * Example:
+ *      Events::on('create', [$myInstance, 'myMethod']);
+ */
+
+Events::on('pre_system', function () {
+	if (ENVIRONMENT !== 'testing')
+	{
+		if (ini_get('zlib.output_compression'))
+		{
+			throw FrameworkException::forEnabledZlibOutputCompression();
+		}
+
+		while (ob_get_level() > 0)
+		{
+			ob_end_flush();
+		}
+
+		ob_start(function ($buffer) {
+			return $buffer;
+		});
+	}
+
+	/*
+	 * --------------------------------------------------------------------
+	 * Debug Toolbar Listeners.
+	 * --------------------------------------------------------------------
+	 * If you delete, they will no longer be collected.
+	 */
+	if (CI_DEBUG && ! is_cli())
+	{
+		Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+		Services::toolbar()->respond();
+	}
+});
diff --git a/app/Config/Exceptions.php b/app/Config/Exceptions.php
new file mode 100644
index 0000000..671b078
--- /dev/null
+++ b/app/Config/Exceptions.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Setup how the exception handler works.
+ */
+class Exceptions extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * LOG EXCEPTIONS?
+	 * --------------------------------------------------------------------------
+	 * If true, then exceptions will be logged
+	 * through Services::Log.
+	 *
+	 * Default: true
+	 *
+	 * @var boolean
+	 */
+	public $log = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * DO NOT LOG STATUS CODES
+	 * --------------------------------------------------------------------------
+	 * Any status codes here will NOT be logged if logging is turned on.
+	 * By default, only 404 (Page Not Found) exceptions are ignored.
+	 *
+	 * @var array
+	 */
+	public $ignoreCodes = [404];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Error Views Path
+	 * --------------------------------------------------------------------------
+	 * This is the path to the directory that contains the 'cli' and 'html'
+	 * directories that hold the views used to generate errors.
+	 *
+	 * Default: APPPATH.'Views/errors'
+	 *
+	 * @var string
+	 */
+	public $errorViewPath = APPPATH . 'Views/errors';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * HIDE FROM DEBUG TRACE
+	 * --------------------------------------------------------------------------
+	 * Any data that you would like to hide from the debug trace.
+	 * In order to specify 2 levels, use "/" to separate.
+	 * ex. ['server', 'setup/password', 'secret_token']
+	 *
+	 * @var array
+	 */
+	public $sensitiveDataInTrace = [];
+}
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
new file mode 100644
index 0000000..515aff3
--- /dev/null
+++ b/app/Config/Filters.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Filters\CSRF;
+use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Filters\Honeypot;
+
+class Filters extends BaseConfig
+{
+	/**
+	 * Configures aliases for Filter classes to
+	 * make reading things nicer and simpler.
+	 *
+	 * @var array
+	 */
+	public $aliases = [
+		'csrf'     => CSRF::class,
+		'toolbar'  => DebugToolbar::class,
+		'honeypot' => Honeypot::class,
+	];
+
+	/**
+	 * List of filter aliases that are always
+	 * applied before and after every request.
+	 *
+	 * @var array
+	 */
+	public $globals = [
+		'before' => [
+			// 'honeypot',
+			// 'csrf',
+		],
+		'after'  => [
+			'toolbar',
+			// 'honeypot',
+		],
+	];
+
+	/**
+	 * List of filter aliases that works on a
+	 * particular HTTP method (GET, POST, etc.).
+	 *
+	 * Example:
+	 * 'post' => ['csrf', 'throttle']
+	 *
+	 * @var array
+	 */
+	public $methods = [];
+
+	/**
+	 * List of filter aliases that should run on any
+	 * before or after URI patterns.
+	 *
+	 * Example:
+	 * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
+	 *
+	 * @var array
+	 */
+	public $filters = [];
+}
diff --git a/app/Config/ForeignCharacters.php b/app/Config/ForeignCharacters.php
new file mode 100644
index 0000000..174ddb1
--- /dev/null
+++ b/app/Config/ForeignCharacters.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
+
+class ForeignCharacters extends BaseForeignCharacters
+{
+}
diff --git a/app/Config/Format.php b/app/Config/Format.php
new file mode 100644
index 0000000..fdaa640
--- /dev/null
+++ b/app/Config/Format.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Format\FormatterInterface;
+
+class Format extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Available Response Formats
+	 * --------------------------------------------------------------------------
+	 *
+	 * When you perform content negotiation with the request, these are the
+	 * available formats that your application supports. This is currently
+	 * only used with the API\ResponseTrait. A valid Formatter must exist
+	 * for the specified format.
+	 *
+	 * These formats are only checked when the data passed to the respond()
+	 * method is an array.
+	 *
+	 * @var string[]
+	 */
+	public $supportedResponseFormats = [
+		'application/json',
+		'application/xml', // machine-readable XML
+		'text/xml', // human-readable XML
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Formatters
+	 * --------------------------------------------------------------------------
+	 *
+	 * Lists the class to use to format responses with of a particular type.
+	 * For each mime type, list the class that should be used. Formatters
+	 * can be retrieved through the getFormatter() method.
+	 *
+	 * @var array<string, string>
+	 */
+	public $formatters = [
+		'application/json' => 'CodeIgniter\Format\JSONFormatter',
+		'application/xml'  => 'CodeIgniter\Format\XMLFormatter',
+		'text/xml'         => 'CodeIgniter\Format\XMLFormatter',
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Formatters Options
+	 * --------------------------------------------------------------------------
+	 *
+	 * Additional Options to adjust default formatters behaviour.
+	 * For each mime type, list the additional options that should be used.
+	 *
+	 * @var array<string, int>
+	 */
+	public $formatterOptions = [
+		'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+		'application/xml'  => 0,
+		'text/xml'         => 0,
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A Factory method to return the appropriate formatter for the given mime type.
+	 *
+	 * @param string $mime
+	 *
+	 * @return FormatterInterface
+	 *
+	 * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
+	 */
+	public function getFormatter(string $mime)
+	{
+		return Services::format()->getFormatter($mime);
+	}
+}
diff --git a/app/Config/Generators.php b/app/Config/Generators.php
new file mode 100644
index 0000000..2c32587
--- /dev/null
+++ b/app/Config/Generators.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Generators extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Generator Commands' Views
+	 * --------------------------------------------------------------------------
+	 *
+	 * This array defines the mapping of generator commands to the view files
+	 * they are using. If you need to customize them for your own, copy these
+	 * view files in your own folder and indicate the location here.
+	 *
+	 * You will notice that the views have special placeholders enclosed in
+	 * curly braces `{...}`. These placeholders are used internally by the
+	 * generator commands in processing replacements, thus you are warned
+	 * not to delete them or modify the names. If you will do so, you may
+	 * end up disrupting the scaffolding process and throw errors.
+	 *
+	 * YOU HAVE BEEN WARNED!
+	 *
+	 * @var array<string, string>
+	 */
+	public $views = [
+		'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
+		'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
+		'make:entity'       => 'CodeIgniter\Commands\Generators\Views\entity.tpl.php',
+		'make:filter'       => 'CodeIgniter\Commands\Generators\Views\filter.tpl.php',
+		'make:migration'    => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
+		'make:model'        => 'CodeIgniter\Commands\Generators\Views\model.tpl.php',
+		'make:seeder'       => 'CodeIgniter\Commands\Generators\Views\seeder.tpl.php',
+		'make:validation'   => 'CodeIgniter\Commands\Generators\Views\validation.tpl.php',
+		'session:migration' => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
+	];
+}
diff --git a/app/Config/Honeypot.php b/app/Config/Honeypot.php
new file mode 100644
index 0000000..54bdcd4
--- /dev/null
+++ b/app/Config/Honeypot.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Honeypot extends BaseConfig
+{
+	/**
+	 * Makes Honeypot visible or not to human
+	 *
+	 * @var boolean
+	 */
+	public $hidden = true;
+
+	/**
+	 * Honeypot Label Content
+	 *
+	 * @var string
+	 */
+	public $label = 'Fill This Field';
+
+	/**
+	 * Honeypot Field Name
+	 *
+	 * @var string
+	 */
+	public $name = 'honeypot';
+
+	/**
+	 * Honeypot HTML Template
+	 *
+	 * @var string
+	 */
+	public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
+
+	/**
+	 * Honeypot container
+	 *
+	 * @var string
+	 */
+	public $container = '<div style="display:none">{template}</div>';
+}
diff --git a/app/Config/Images.php b/app/Config/Images.php
new file mode 100644
index 0000000..87cc5f8
--- /dev/null
+++ b/app/Config/Images.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Images\Handlers\GDHandler;
+use CodeIgniter\Images\Handlers\ImageMagickHandler;
+
+class Images extends BaseConfig
+{
+	/**
+	 * Default handler used if no other handler is specified.
+	 *
+	 * @var string
+	 */
+	public $defaultHandler = 'gd';
+
+	/**
+	 * The path to the image library.
+	 * Required for ImageMagick, GraphicsMagick, or NetPBM.
+	 *
+	 * @var string
+	 */
+	public $libraryPath = '/usr/local/bin/convert';
+
+	/**
+	 * The available handler classes.
+	 *
+	 * @var array<string, string>
+	 */
+	public $handlers = [
+		'gd'      => GDHandler::class,
+		'imagick' => ImageMagickHandler::class,
+	];
+}
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
new file mode 100644
index 0000000..665de0b
--- /dev/null
+++ b/app/Config/Kint.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use Kint\Renderer\Renderer;
+
+/**
+ * --------------------------------------------------------------------------
+ * Kint
+ * --------------------------------------------------------------------------
+ *
+ * We use Kint's `RichRenderer` and `CLIRenderer`. This area contains options
+ * that you can set to customize how Kint works for you.
+ *
+ * @see https://kint-php.github.io/kint/ for details on these settings.
+ */
+class Kint extends BaseConfig
+{
+	/*
+	|--------------------------------------------------------------------------
+	| Global Settings
+	|--------------------------------------------------------------------------
+	*/
+
+	public $plugins = null;
+
+	public $maxDepth = 6;
+
+	public $displayCalledFrom = true;
+
+	public $expanded = false;
+
+	/*
+	|--------------------------------------------------------------------------
+	| RichRenderer Settings
+	|--------------------------------------------------------------------------
+	*/
+	public $richTheme = 'aante-light.css';
+
+	public $richFolder = false;
+
+	public $richSort = Renderer::SORT_FULL;
+
+	public $richObjectPlugins = null;
+
+	public $richTabPlugins = null;
+
+	/*
+	|--------------------------------------------------------------------------
+	| CLI Settings
+	|--------------------------------------------------------------------------
+	*/
+	public $cliColors = true;
+
+	public $cliForceUTF8 = false;
+
+	public $cliDetectWidth = true;
+
+	public $cliMinWidth = 40;
+}
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
new file mode 100644
index 0000000..0cee08d
--- /dev/null
+++ b/app/Config/Logger.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Logger extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Error Logging Threshold
+	 * --------------------------------------------------------------------------
+	 *
+	 * You can enable error logging by setting a threshold over zero. The
+	 * threshold determines what gets logged. Any values below or equal to the
+	 * threshold will be logged.
+	 *
+	 * Threshold options are:
+	 *
+	 * - 0 = Disables logging, Error logging TURNED OFF
+	 * - 1 = Emergency Messages - System is unusable
+	 * - 2 = Alert Messages - Action Must Be Taken Immediately
+	 * - 3 = Critical Messages - Application component unavailable, unexpected exception.
+	 * - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
+	 * - 5 = Warnings - Exceptional occurrences that are not errors.
+	 * - 6 = Notices - Normal but significant events.
+	 * - 7 = Info - Interesting events, like user logging in, etc.
+	 * - 8 = Debug - Detailed debug information.
+	 * - 9 = All Messages
+	 *
+	 * You can also pass an array with threshold levels to show individual error types
+	 *
+	 *     array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
+	 *
+	 * For a live site you'll usually enable Critical or higher (3) to be logged otherwise
+	 * your log files will fill up very fast.
+	 *
+	 * @var integer|array
+	 */
+	public $threshold = 4;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Date Format for Logs
+	 * --------------------------------------------------------------------------
+	 *
+	 * Each item that is logged has an associated date. You can use PHP date
+	 * codes to set your own date formatting
+	 *
+	 * @var string
+	 */
+	public $dateFormat = 'Y-m-d H:i:s';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Log Handlers
+	 * --------------------------------------------------------------------------
+	 *
+	 * The logging system supports multiple actions to be taken when something
+	 * is logged. This is done by allowing for multiple Handlers, special classes
+	 * designed to write the log to their chosen destinations, whether that is
+	 * a file on the getServer, a cloud-based service, or even taking actions such
+	 * as emailing the dev team.
+	 *
+	 * Each handler is defined by the class name used for that handler, and it
+	 * MUST implement the `CodeIgniter\Log\Handlers\HandlerInterface` interface.
+	 *
+	 * The value of each key is an array of configuration items that are sent
+	 * to the constructor of each handler. The only required configuration item
+	 * is the 'handles' element, which must be an array of integer log levels.
+	 * This is most easily handled by using the constants defined in the
+	 * `Psr\Log\LogLevel` class.
+	 *
+	 * Handlers are executed in the order defined in this array, starting with
+	 * the handler on top and continuing down.
+	 *
+	 * @var array
+	 */
+	public $handlers = [
+
+		/*
+		 * --------------------------------------------------------------------
+		 * File Handler
+		 * --------------------------------------------------------------------
+		 */
+		'CodeIgniter\Log\Handlers\FileHandler' => [
+
+			/*
+			 * The log levels that this handler will handle.
+			 */
+			'handles'         => [
+				'critical',
+				'alert',
+				'emergency',
+				'debug',
+				'error',
+				'info',
+				'notice',
+				'warning',
+			],
+
+			/*
+			 * The default filename extension for log files.
+			 * An extension of 'php' allows for protecting the log files via basic
+			 * scripting, when they are to be stored under a publicly accessible directory.
+			 *
+			 * Note: Leaving it blank will default to 'log'.
+			 */
+			'fileExtension'   => '',
+
+			/*
+			 * The file system permissions to be applied on newly created log files.
+			 *
+			 * IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
+			 * integer notation (i.e. 0700, 0644, etc.)
+			 */
+			'filePermissions' => 0644,
+
+			/*
+			 * Logging Directory Path
+			 *
+			 * By default, logs are written to WRITEPATH . 'logs/'
+			 * Specify a different destination here, if desired.
+			 */
+			'path'            => '',
+		],
+
+		/**
+		 * The ChromeLoggerHandler requires the use of the Chrome web browser
+		 * and the ChromeLogger extension. Uncomment this block to use it.
+		 */
+		// 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
+		//     /*
+		//      * The log levels that this handler will handle.
+		//      */
+		//     'handles' => ['critical', 'alert', 'emergency', 'debug',
+		//                   'error', 'info', 'notice', 'warning'],
+		// ],
+
+		/**
+		 * The ErrorlogHandler writes the logs to PHP's native `error_log()` function.
+		 * Uncomment this block to use it.
+		 */
+		// 'CodeIgniter\Log\Handlers\ErrorlogHandler' => [
+		// 		/* The log levels this handler can handle. */
+		// 		'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+		//
+		// 		/*
+		// 		 * The message type where the error should go. Can be 0 or 4, or use the
+		// 		 * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
+		// 		 */
+		// 		'messageType' => 0,
+		// ],
+	];
+}
diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php
new file mode 100644
index 0000000..1fa3100
--- /dev/null
+++ b/app/Config/Migrations.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Migrations extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable/Disable Migrations
+	 * --------------------------------------------------------------------------
+	 *
+	 * Migrations are enabled by default.
+	 *
+	 * You should enable migrations whenever you intend to do a schema migration
+	 * and disable it back when you're done.
+	 *
+	 * @var boolean
+	 */
+	public $enabled = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Migrations Table
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is the name of the table that will store the current migrations state.
+	 * When migrations runs it will store in a database table which migration
+	 * level the system is at. It then compares the migration level in this
+	 * table to the $config['migration_version'] if they are not the same it
+	 * will migrate up. This must be set.
+	 *
+	 * @var string
+	 */
+	public $table = 'migrations';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Timestamp Format
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is the format that will be used when creating new migrations
+	 * using the CLI command:
+	 *   > php spark migrate:create
+	 *
+	 * Typical formats:
+	 * - YmdHis_
+	 * - Y-m-d-His_
+	 * - Y_m_d_His_
+	 *
+	 * @var string
+	 */
+	public $timestampFormat = 'Y-m-d-His_';
+}
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
new file mode 100644
index 0000000..7a32e84
--- /dev/null
+++ b/app/Config/Mimes.php
@@ -0,0 +1,543 @@
+<?php
+
+namespace Config;
+
+/**
+ * Mimes
+ *
+ * This file contains an array of mime types.  It is used by the
+ * Upload class to help identify allowed file types.
+ *
+ * When more than one variation for an extension exist (like jpg, jpeg, etc)
+ * the most common one should be first in the array to aid the guess*
+ * methods. The same applies when more than one mime-type exists for a
+ * single extension.
+ *
+ * When working with mime types, please make sure you have the Ā“fileinfoĀ“
+ * extension enabled to reliably detect the media types.
+ */
+
+class Mimes
+{
+	/**
+	 * Map of extensions to mime types.
+	 *
+	 * @var array
+	 */
+	public static $mimes = [
+		'hqx'   => [
+			'application/mac-binhex40',
+			'application/mac-binhex',
+			'application/x-binhex40',
+			'application/x-mac-binhex40',
+		],
+		'cpt'   => 'application/mac-compactpro',
+		'csv'   => [
+			'text/csv',
+			'text/x-comma-separated-values',
+			'text/comma-separated-values',
+			'application/vnd.ms-excel',
+			'application/x-csv',
+			'text/x-csv',
+			'application/csv',
+			'application/excel',
+			'application/vnd.msexcel',
+			'text/plain',
+		],
+		'bin'   => [
+			'application/macbinary',
+			'application/mac-binary',
+			'application/octet-stream',
+			'application/x-binary',
+			'application/x-macbinary',
+		],
+		'dms'   => 'application/octet-stream',
+		'lha'   => 'application/octet-stream',
+		'lzh'   => 'application/octet-stream',
+		'exe'   => [
+			'application/octet-stream',
+			'application/x-msdownload',
+		],
+		'class' => 'application/octet-stream',
+		'psd'   => [
+			'application/x-photoshop',
+			'image/vnd.adobe.photoshop',
+		],
+		'so'    => 'application/octet-stream',
+		'sea'   => 'application/octet-stream',
+		'dll'   => 'application/octet-stream',
+		'oda'   => 'application/oda',
+		'pdf'   => [
+			'application/pdf',
+			'application/force-download',
+			'application/x-download',
+		],
+		'ai'    => [
+			'application/pdf',
+			'application/postscript',
+		],
+		'eps'   => 'application/postscript',
+		'ps'    => 'application/postscript',
+		'smi'   => 'application/smil',
+		'smil'  => 'application/smil',
+		'mif'   => 'application/vnd.mif',
+		'xls'   => [
+			'application/vnd.ms-excel',
+			'application/msexcel',
+			'application/x-msexcel',
+			'application/x-ms-excel',
+			'application/x-excel',
+			'application/x-dos_ms_excel',
+			'application/xls',
+			'application/x-xls',
+			'application/excel',
+			'application/download',
+			'application/vnd.ms-office',
+			'application/msword',
+		],
+		'ppt'   => [
+			'application/vnd.ms-powerpoint',
+			'application/powerpoint',
+			'application/vnd.ms-office',
+			'application/msword',
+		],
+		'pptx'  => [
+			'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+			'application/x-zip',
+			'application/zip',
+		],
+		'wbxml' => 'application/wbxml',
+		'wmlc'  => 'application/wmlc',
+		'dcr'   => 'application/x-director',
+		'dir'   => 'application/x-director',
+		'dxr'   => 'application/x-director',
+		'dvi'   => 'application/x-dvi',
+		'gtar'  => 'application/x-gtar',
+		'gz'    => 'application/x-gzip',
+		'gzip'  => 'application/x-gzip',
+		'php'   => [
+			'application/x-php',
+			'application/x-httpd-php',
+			'application/php',
+			'text/php',
+			'text/x-php',
+			'application/x-httpd-php-source',
+		],
+		'php4'  => 'application/x-httpd-php',
+		'php3'  => 'application/x-httpd-php',
+		'phtml' => 'application/x-httpd-php',
+		'phps'  => 'application/x-httpd-php-source',
+		'js'    => [
+			'application/x-javascript',
+			'text/plain',
+		],
+		'swf'   => 'application/x-shockwave-flash',
+		'sit'   => 'application/x-stuffit',
+		'tar'   => 'application/x-tar',
+		'tgz'   => [
+			'application/x-tar',
+			'application/x-gzip-compressed',
+		],
+		'z'     => 'application/x-compress',
+		'xhtml' => 'application/xhtml+xml',
+		'xht'   => 'application/xhtml+xml',
+		'zip'   => [
+			'application/x-zip',
+			'application/zip',
+			'application/x-zip-compressed',
+			'application/s-compressed',
+			'multipart/x-zip',
+		],
+		'rar'   => [
+			'application/vnd.rar',
+			'application/x-rar',
+			'application/rar',
+			'application/x-rar-compressed',
+		],
+		'mid'   => 'audio/midi',
+		'midi'  => 'audio/midi',
+		'mpga'  => 'audio/mpeg',
+		'mp2'   => 'audio/mpeg',
+		'mp3'   => [
+			'audio/mpeg',
+			'audio/mpg',
+			'audio/mpeg3',
+			'audio/mp3',
+		],
+		'aif'   => [
+			'audio/x-aiff',
+			'audio/aiff',
+		],
+		'aiff'  => [
+			'audio/x-aiff',
+			'audio/aiff',
+		],
+		'aifc'  => 'audio/x-aiff',
+		'ram'   => 'audio/x-pn-realaudio',
+		'rm'    => 'audio/x-pn-realaudio',
+		'rpm'   => 'audio/x-pn-realaudio-plugin',
+		'ra'    => 'audio/x-realaudio',
+		'rv'    => 'video/vnd.rn-realvideo',
+		'wav'   => [
+			'audio/x-wav',
+			'audio/wave',
+			'audio/wav',
+		],
+		'bmp'   => [
+			'image/bmp',
+			'image/x-bmp',
+			'image/x-bitmap',
+			'image/x-xbitmap',
+			'image/x-win-bitmap',
+			'image/x-windows-bmp',
+			'image/ms-bmp',
+			'image/x-ms-bmp',
+			'application/bmp',
+			'application/x-bmp',
+			'application/x-win-bitmap',
+		],
+		'gif'   => 'image/gif',
+		'jpg'   => [
+			'image/jpeg',
+			'image/pjpeg',
+		],
+		'jpeg'  => [
+			'image/jpeg',
+			'image/pjpeg',
+		],
+		'jpe'   => [
+			'image/jpeg',
+			'image/pjpeg',
+		],
+		'jp2'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'j2k'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpf'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpg2'  => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpx'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpm'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'mj2'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'mjp2'  => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'png'   => [
+			'image/png',
+			'image/x-png',
+		],
+		'tif'   => 'image/tiff',
+		'tiff'  => 'image/tiff',
+		'css'   => [
+			'text/css',
+			'text/plain',
+		],
+		'html'  => [
+			'text/html',
+			'text/plain',
+		],
+		'htm'   => [
+			'text/html',
+			'text/plain',
+		],
+		'shtml' => [
+			'text/html',
+			'text/plain',
+		],
+		'txt'   => 'text/plain',
+		'text'  => 'text/plain',
+		'log'   => [
+			'text/plain',
+			'text/x-log',
+		],
+		'rtx'   => 'text/richtext',
+		'rtf'   => 'text/rtf',
+		'xml'   => [
+			'application/xml',
+			'text/xml',
+			'text/plain',
+		],
+		'xsl'   => [
+			'application/xml',
+			'text/xsl',
+			'text/xml',
+		],
+		'mpeg'  => 'video/mpeg',
+		'mpg'   => 'video/mpeg',
+		'mpe'   => 'video/mpeg',
+		'qt'    => 'video/quicktime',
+		'mov'   => 'video/quicktime',
+		'avi'   => [
+			'video/x-msvideo',
+			'video/msvideo',
+			'video/avi',
+			'application/x-troff-msvideo',
+		],
+		'movie' => 'video/x-sgi-movie',
+		'doc'   => [
+			'application/msword',
+			'application/vnd.ms-office',
+		],
+		'docx'  => [
+			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			'application/zip',
+			'application/msword',
+			'application/x-zip',
+		],
+		'dot'   => [
+			'application/msword',
+			'application/vnd.ms-office',
+		],
+		'dotx'  => [
+			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			'application/zip',
+			'application/msword',
+		],
+		'xlsx'  => [
+			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+			'application/zip',
+			'application/vnd.ms-excel',
+			'application/msword',
+			'application/x-zip',
+		],
+		'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+		'xlsm'  => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+		'word'  => [
+			'application/msword',
+			'application/octet-stream',
+		],
+		'xl'    => 'application/excel',
+		'eml'   => 'message/rfc822',
+		'json'  => [
+			'application/json',
+			'text/json',
+		],
+		'pem'   => [
+			'application/x-x509-user-cert',
+			'application/x-pem-file',
+			'application/octet-stream',
+		],
+		'p10'   => [
+			'application/x-pkcs10',
+			'application/pkcs10',
+		],
+		'p12'   => 'application/x-pkcs12',
+		'p7a'   => 'application/x-pkcs7-signature',
+		'p7c'   => [
+			'application/pkcs7-mime',
+			'application/x-pkcs7-mime',
+		],
+		'p7m'   => [
+			'application/pkcs7-mime',
+			'application/x-pkcs7-mime',
+		],
+		'p7r'   => 'application/x-pkcs7-certreqresp',
+		'p7s'   => 'application/pkcs7-signature',
+		'crt'   => [
+			'application/x-x509-ca-cert',
+			'application/x-x509-user-cert',
+			'application/pkix-cert',
+		],
+		'crl'   => [
+			'application/pkix-crl',
+			'application/pkcs-crl',
+		],
+		'der'   => 'application/x-x509-ca-cert',
+		'kdb'   => 'application/octet-stream',
+		'pgp'   => 'application/pgp',
+		'gpg'   => 'application/gpg-keys',
+		'sst'   => 'application/octet-stream',
+		'csr'   => 'application/octet-stream',
+		'rsa'   => 'application/x-pkcs7',
+		'cer'   => [
+			'application/pkix-cert',
+			'application/x-x509-ca-cert',
+		],
+		'3g2'   => 'video/3gpp2',
+		'3gp'   => [
+			'video/3gp',
+			'video/3gpp',
+		],
+		'mp4'   => 'video/mp4',
+		'm4a'   => 'audio/x-m4a',
+		'f4v'   => [
+			'video/mp4',
+			'video/x-f4v',
+		],
+		'flv'   => 'video/x-flv',
+		'webm'  => 'video/webm',
+		'aac'   => 'audio/x-acc',
+		'm4u'   => 'application/vnd.mpegurl',
+		'm3u'   => 'text/plain',
+		'xspf'  => 'application/xspf+xml',
+		'vlc'   => 'application/videolan',
+		'wmv'   => [
+			'video/x-ms-wmv',
+			'video/x-ms-asf',
+		],
+		'au'    => 'audio/x-au',
+		'ac3'   => 'audio/ac3',
+		'flac'  => 'audio/x-flac',
+		'ogg'   => [
+			'audio/ogg',
+			'video/ogg',
+			'application/ogg',
+		],
+		'kmz'   => [
+			'application/vnd.google-earth.kmz',
+			'application/zip',
+			'application/x-zip',
+		],
+		'kml'   => [
+			'application/vnd.google-earth.kml+xml',
+			'application/xml',
+			'text/xml',
+		],
+		'ics'   => 'text/calendar',
+		'ical'  => 'text/calendar',
+		'zsh'   => 'text/x-scriptzsh',
+		'7zip'  => [
+			'application/x-compressed',
+			'application/x-zip-compressed',
+			'application/zip',
+			'multipart/x-zip',
+		],
+		'cdr'   => [
+			'application/cdr',
+			'application/coreldraw',
+			'application/x-cdr',
+			'application/x-coreldraw',
+			'image/cdr',
+			'image/x-cdr',
+			'zz-application/zz-winassoc-cdr',
+		],
+		'wma'   => [
+			'audio/x-ms-wma',
+			'video/x-ms-asf',
+		],
+		'jar'   => [
+			'application/java-archive',
+			'application/x-java-application',
+			'application/x-jar',
+			'application/x-compressed',
+		],
+		'svg'   => [
+			'image/svg+xml',
+			'image/svg',
+			'application/xml',
+			'text/xml',
+		],
+		'vcf'   => 'text/x-vcard',
+		'srt'   => [
+			'text/srt',
+			'text/plain',
+		],
+		'vtt'   => [
+			'text/vtt',
+			'text/plain',
+		],
+		'ico'   => [
+			'image/x-icon',
+			'image/x-ico',
+			'image/vnd.microsoft.icon',
+		],
+		'stl'   => [
+			'application/sla',
+			'application/vnd.ms-pki.stl',
+			'application/x-navistyle',
+		],
+	];
+
+	/**
+	 * Attempts to determine the best mime type for the given file extension.
+	 *
+	 * @param string $extension
+	 *
+	 * @return string|null The mime type found, or none if unable to determine.
+	 */
+	public static function guessTypeFromExtension(string $extension)
+	{
+		$extension = trim(strtolower($extension), '. ');
+
+		if (! array_key_exists($extension, static::$mimes))
+		{
+			return null;
+		}
+
+		return is_array(static::$mimes[$extension]) ? static::$mimes[$extension][0] : static::$mimes[$extension];
+	}
+
+	/**
+	 * Attempts to determine the best file extension for a given mime type.
+	 *
+	 * @param string      $type
+	 * @param string|null $proposedExtension - default extension (in case there is more than one with the same mime type)
+	 *
+	 * @return string|null The extension determined, or null if unable to match.
+	 */
+	public static function guessExtensionFromType(string $type, string $proposedExtension = null)
+	{
+		$type = trim(strtolower($type), '. ');
+
+		$proposedExtension = trim(strtolower($proposedExtension));
+
+		if ($proposedExtension !== '')
+		{
+			if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true))
+			{
+				// The detected mime type matches with the proposed extension.
+				return $proposedExtension;
+			}
+
+			// An extension was proposed, but the media type does not match the mime type list.
+			return null;
+		}
+
+		// Reverse check the mime type list if no extension was proposed.
+		// This search is order sensitive!
+		foreach (static::$mimes as $ext => $types)
+		{
+			if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true)))
+			{
+				return $ext;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
new file mode 100644
index 0000000..0814a0c
--- /dev/null
+++ b/app/Config/Modules.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Modules\Modules as BaseModules;
+
+class Modules extends BaseModules
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable Auto-Discovery?
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, then auto-discovery will happen across all elements listed in
+	 * $aliases below. If false, no auto-discovery will happen at all,
+	 * giving a slight performance boost.
+	 *
+	 * @var boolean
+	 */
+	public $enabled = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable Auto-Discovery Within Composer Packages?
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, then auto-discovery will happen across all namespaces loaded
+	 * by Composer, as well as the namespaces configured locally.
+	 *
+	 * @var boolean
+	 */
+	public $discoverInComposer = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Auto-Discovery Rules
+	 * --------------------------------------------------------------------------
+	 *
+	 * Aliases list of all discovery classes that will be active and used during
+	 * the current application request.
+	 *
+	 * If it is not listed, only the base application elements will be used.
+	 *
+	 * @var string[]
+	 */
+	public $aliases = [
+		'events',
+		'filters',
+		'registrars',
+		'routes',
+		'services',
+	];
+}
diff --git a/app/Config/Pager.php b/app/Config/Pager.php
new file mode 100644
index 0000000..4499313
--- /dev/null
+++ b/app/Config/Pager.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Pager extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Templates
+	 * --------------------------------------------------------------------------
+	 *
+	 * Pagination links are rendered out using views to configure their
+	 * appearance. This array contains aliases and the view names to
+	 * use when rendering the links.
+	 *
+	 * Within each view, the Pager object will be available as $pager,
+	 * and the desired group as $pagerGroup;
+	 *
+	 * @var array<string, string>
+	 */
+	public $templates = [
+		'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+		'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+		'default_head'   => 'CodeIgniter\Pager\Views\default_head',
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Items Per Page
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default number of results shown in a single page.
+	 *
+	 * @var integer
+	 */
+	public $perPage = 20;
+}
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
new file mode 100644
index 0000000..bd77d27
--- /dev/null
+++ b/app/Config/Paths.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Config;
+
+/**
+ * Paths
+ *
+ * Holds the paths that are used by the system to
+ * locate the main directories, app, system, etc.
+ *
+ * Modifying these allows you to restructure your application,
+ * share a system folder between multiple applications, and more.
+ *
+ * All paths are relative to the project's root folder.
+ */
+
+class Paths
+{
+	/**
+	 * ---------------------------------------------------------------
+	 * SYSTEM FOLDER NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This must contain the name of your "system" folder. Include
+	 * the path if the folder is not in the same directory as this file.
+	 *
+	 * @var string
+	 */
+	public $systemDirectory = __DIR__ . '/../../system';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * APPLICATION FOLDER NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * If you want this front controller to use a different "app"
+	 * folder than the default one you can set its name here. The folder
+	 * can also be renamed or relocated anywhere on your getServer. If
+	 * you do, use a full getServer path.
+	 *
+	 * @see http://codeigniter.com/user_guide/general/managing_apps.html
+	 *
+	 * @var string
+	 */
+	public $appDirectory = __DIR__ . '/..';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * WRITABLE DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This variable must contain the name of your "writable" directory.
+	 * The writable directory allows you to group all directories that
+	 * need write permission to a single place that can be tucked away
+	 * for maximum security, keeping it out of the app and/or
+	 * system directories.
+	 *
+	 * @var string
+	 */
+	public $writableDirectory = __DIR__ . '/../../writable';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * TESTS DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This variable must contain the name of your "tests" directory.
+	 *
+	 * @var string
+	 */
+	public $testsDirectory = __DIR__ . '/../../tests';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * VIEW DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This variable must contain the name of the directory that
+	 * contains the view files used by your application. By
+	 * default this is in `app/Views`. This value
+	 * is used when no value is provided to `Services::renderer()`.
+	 *
+	 * @var string
+	 */
+	public $viewDirectory = __DIR__ . '/../Views';
+}
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
new file mode 100644
index 0000000..def2b58
--- /dev/null
+++ b/app/Config/Routes.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Config;
+
+// Create a new instance of our RouteCollection class.
+$routes = Services::routes();
+
+// Load the system's routing file first, so that the app and ENVIRONMENT
+// can override as needed.
+if (file_exists(SYSTEMPATH . 'Config/Routes.php'))
+{
+	require SYSTEMPATH . 'Config/Routes.php';
+}
+
+/**
+ * --------------------------------------------------------------------
+ * Router Setup
+ * --------------------------------------------------------------------
+ */
+$routes->setDefaultNamespace('App\Controllers');
+$routes->setDefaultController('Home');
+$routes->setDefaultMethod('index');
+$routes->setTranslateURIDashes(false);
+$routes->set404Override();
+$routes->setAutoRoute(true);
+
+/*
+ * --------------------------------------------------------------------
+ * Route Definitions
+ * --------------------------------------------------------------------
+ */
+
+// We get a performance increase by specifying the default
+// route since we don't have to scan directories.
+$routes->get('/', 'Home::index');
+
+$routes->group('api', ['namespace' => 'App\Controllers\API'], function($routes){
+
+	// Eventos CRUD
+	$routes->get('eventos', 'Eventos::index');
+	$routes->post('eventos/create', 'Eventos::create');
+	$routes->get('eventos/edit/(:num)', 'Eventos::edit/$1');
+	$routes->put('eventos/update/(:num)', 'Eventos::update/$1');
+	$routes->delete('eventos/delete/(:num)', 'Eventos::delete/$1');
+
+	// Eventos Reglas de negocio
+	$routes->get('evento/(:num)/rondas/', 'Eventos::rondas/$1');
+	$routes->get('evento/(:num)/mesas/', 'Eventos::mesas/$1');
+	$routes->get('evento/(:num)/ronda-activa', 'Eventos::rondaActiva/$1');
+
+	// Rondas CRUD		
+	$routes->get('rondas', 'Rondas::index');
+	$routes->post('rondas/create', 'Rondas::create');
+	$routes->get('rondas/edit/(:num)', 'Rondas::edit/$1');
+	$routes->put('rondas/update/(:num)', 'Rondas::update/$1');
+	$routes->delete('rondas/delete/(:num)', 'Rondas::delete/$1');
+	
+	$routes->get('rondas/activa/(:num)', 'Rondas::rondaActivaEvento/$1');
+	$routes->get('rondas/evento/(:num)', 'Rondas::rondasEvento/$1');
+
+	$routes->get('mesas', 'Mesas::index');
+	$routes->post('mesas/create', 'Mesas::create');
+	$routes->get('mesas/edit/(:num)', 'Mesas::edit/$1');
+	$routes->put('mesas/update/(:num)', 'Mesas::update/$1');
+	$routes->delete('mesas/delete/(:num)', 'Mesas::delete/$1');
+	$routes->get('mesas/(:num)', 'Mesas::MesasEvento/$1');
+
+
+	$routes->get('jugadores', 'Jugadores::index');
+	$routes->post('jugadores/create', 'Jugadores::create');
+	$routes->get('jugadores/edit/(:num)', 'Jugadores::edit/$1');
+	$routes->put('jugadores/update/(:num)', 'Jugadores::update/$1');
+	$routes->delete('jugadores/delete/(:num)', 'Jugadores::delete/$1');
+
+	$routes->get('parejas', 'Parejas::index');
+	$routes->post('parejas/create', 'Parejas::create');
+	$routes->get('parejas/edit/(:num)', 'Parejas::edit/$1');
+	$routes->put('parejas/update/(:num)', 'Parejas::update/$1');
+	$routes->delete('parejas/delete/(:num)', 'Parejas::delete/$1');
+
+	$routes->get('boletas', 'Boletas::index');
+	$routes->post('boletas/create', 'Boletas::create');
+	$routes->get('boletas/edit/(:num)', 'Boletas::edit/$1');
+	$routes->put('boletas/update/(:num)', 'Boletas::update/$1');
+	$routes->delete('boletas/delete/(:num)', 'Boletas::delete/$1');
+
+	$routes->get('boletaparejas', 'BoletaParejas::index');
+	$routes->post('boletaparejas/create', 'BoletaParejas::create');
+	$routes->get('boletaparejas/edit/(:num)', 'BoletaParejas::edit/$1');
+	$routes->put('boletaparejas/update/(:num)', 'BoletaParejas::update/$1');
+	$routes->delete('boletaparejas/delete/(:num)', 'BoletaParejas::delete/$1');
+
+	$routes->get('datas', 'Datas::index');
+	$routes->post('datas/create', 'Datas::create');
+	$routes->get('datas/edit/(:num)', 'Datas::edit/$1');
+	$routes->put('datas/update/(:num)', 'Datas::update/$1');
+	$routes->delete('datas/delete/(:num)', 'Datas::delete/$1');
+});
+
+/*
+ * --------------------------------------------------------------------
+ * Additional Routing
+ * --------------------------------------------------------------------
+ *
+ * There will often be times that you need additional routing and you
+ * need it to be able to override any defaults in this file. Environment
+ * based routes is one such time. require() additional route files here
+ * to make that happen.
+ *
+ * You will have access to the $routes object within that file without
+ * needing to reload it.
+ */
+if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php'))
+{
+	require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
+}
diff --git a/app/Config/Security.php b/app/Config/Security.php
new file mode 100644
index 0000000..afdfd2e
--- /dev/null
+++ b/app/Config/Security.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Security extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Token Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * Token name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	public $tokenName = 'csrf_test_name';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Header Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * Token name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	public $headerName = 'X-CSRF-TOKEN';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	 public $cookieName = 'csrf_cookie_name';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Expires
+	 * --------------------------------------------------------------------------
+	 *
+	 * Expiration time for Cross Site Request Forgery protection cookie.
+	 *
+	 * Defaults to two hours (in seconds).
+	 *
+	 * @var integer
+	 */
+	public $expires = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Regenerate
+	 * --------------------------------------------------------------------------
+	 *
+	 * Regenerate CSRF Token on every request.
+	 *
+	 * @var boolean
+	 */
+	public $regenerate = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Redirect
+	 * --------------------------------------------------------------------------
+	 *
+	 * Redirect to previous page with error on failure.
+	 *
+	 * @var boolean
+	 */
+	public $redirect = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Setting for CSRF SameSite cookie token.
+	 *
+	 * Allowed values are: None - Lax - Strict - ''.
+	 *
+	 * Defaults to `Lax` as recommended in this link:
+	 *
+	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
+	 *
+	 * @var string
+	 *
+	 * @deprecated
+	 */
+	public $samesite = 'Lax';
+}
diff --git a/app/Config/Services.php b/app/Config/Services.php
new file mode 100644
index 0000000..898bcd0
--- /dev/null
+++ b/app/Config/Services.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
+/**
+ * Services Configuration file.
+ *
+ * Services are simply other classes/libraries that the system uses
+ * to do its job. This is used by CodeIgniter to allow the core of the
+ * framework to be swapped out easily without affecting the usage within
+ * the rest of your application.
+ *
+ * This file holds any application-specific services, or service overrides
+ * that you might need. An example has been included with the general
+ * method format you should use for your service methods. For more examples,
+ * see the core Services file at system/Config/Services.php.
+ */
+class Services extends BaseService
+{
+	// public static function example($getShared = true)
+	// {
+	//     if ($getShared)
+	//     {
+	//         return static::getSharedInstance('example');
+	//     }
+	//
+	//     return new \CodeIgniter\Example();
+	// }
+}
diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
new file mode 100644
index 0000000..c7603e2
--- /dev/null
+++ b/app/Config/Toolbar.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Debug\Toolbar\Collectors\Database;
+use CodeIgniter\Debug\Toolbar\Collectors\Events;
+use CodeIgniter\Debug\Toolbar\Collectors\Files;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\Debug\Toolbar\Collectors\Routes;
+use CodeIgniter\Debug\Toolbar\Collectors\Timers;
+use CodeIgniter\Debug\Toolbar\Collectors\Views;
+
+/**
+ * --------------------------------------------------------------------------
+ * Debug Toolbar
+ * --------------------------------------------------------------------------
+ *
+ * The Debug Toolbar provides a way to see information about the performance
+ * and state of your application during that page display. By default it will
+ * NOT be displayed under production environments, and will only display if
+ * `CI_DEBUG` is true, since if it's not, there's not much to display anyway.
+ */
+class Toolbar extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Toolbar Collectors
+	 * --------------------------------------------------------------------------
+	 *
+	 * List of toolbar collectors that will be called when Debug Toolbar
+	 * fires up and collects data from.
+	 *
+	 * @var string[]
+	 */
+	public $collectors = [
+		Timers::class,
+		Database::class,
+		Logs::class,
+		Views::class,
+		// \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+		Files::class,
+		Routes::class,
+		Events::class,
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Max History
+	 * --------------------------------------------------------------------------
+	 *
+	 * `$maxHistory` sets a limit on the number of past requests that are stored,
+	 * helping to conserve file space used to store them. You can set it to
+	 * 0 (zero) to not have any history stored, or -1 for unlimited history.
+	 *
+	 * @var integer
+	 */
+	public $maxHistory = 20;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Toolbar Views Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * The full path to the the views that are used by the toolbar.
+	 * This MUST have a trailing slash.
+	 *
+	 * @var string
+	 */
+	public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Max Queries
+	 * --------------------------------------------------------------------------
+	 *
+	 * If the Database Collector is enabled, it will log every query that the
+	 * the system generates so they can be displayed on the toolbar's timeline
+	 * and in the query log. This can lead to memory issues in some instances
+	 * with hundreds of queries.
+	 *
+	 * `$maxQueries` defines the maximum amount of queries that will be stored.
+	 *
+	 * @var integer
+	 */
+	public $maxQueries = 100;
+}
diff --git a/app/Config/UserAgents.php b/app/Config/UserAgents.php
new file mode 100644
index 0000000..db17d73
--- /dev/null
+++ b/app/Config/UserAgents.php
@@ -0,0 +1,252 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * -------------------------------------------------------------------
+ * User Agents
+ * -------------------------------------------------------------------
+ *
+ * This file contains four arrays of user agent data. It is used by the
+ * User Agent Class to help identify browser, platform, robot, and
+ * mobile device data. The array keys are used to identify the device
+ * and the array values are used to set the actual name of the item.
+ */
+class UserAgents extends BaseConfig
+{
+	/**
+	 * -------------------------------------------------------------------
+	 * OS Platforms
+	 * -------------------------------------------------------------------
+	 *
+	 * @var array<string, string>
+	 */
+	public $platforms = [
+		'windows nt 10.0' => 'Windows 10',
+		'windows nt 6.3'  => 'Windows 8.1',
+		'windows nt 6.2'  => 'Windows 8',
+		'windows nt 6.1'  => 'Windows 7',
+		'windows nt 6.0'  => 'Windows Vista',
+		'windows nt 5.2'  => 'Windows 2003',
+		'windows nt 5.1'  => 'Windows XP',
+		'windows nt 5.0'  => 'Windows 2000',
+		'windows nt 4.0'  => 'Windows NT 4.0',
+		'winnt4.0'        => 'Windows NT 4.0',
+		'winnt 4.0'       => 'Windows NT',
+		'winnt'           => 'Windows NT',
+		'windows 98'      => 'Windows 98',
+		'win98'           => 'Windows 98',
+		'windows 95'      => 'Windows 95',
+		'win95'           => 'Windows 95',
+		'windows phone'   => 'Windows Phone',
+		'windows'         => 'Unknown Windows OS',
+		'android'         => 'Android',
+		'blackberry'      => 'BlackBerry',
+		'iphone'          => 'iOS',
+		'ipad'            => 'iOS',
+		'ipod'            => 'iOS',
+		'os x'            => 'Mac OS X',
+		'ppc mac'         => 'Power PC Mac',
+		'freebsd'         => 'FreeBSD',
+		'ppc'             => 'Macintosh',
+		'linux'           => 'Linux',
+		'debian'          => 'Debian',
+		'sunos'           => 'Sun Solaris',
+		'beos'            => 'BeOS',
+		'apachebench'     => 'ApacheBench',
+		'aix'             => 'AIX',
+		'irix'            => 'Irix',
+		'osf'             => 'DEC OSF',
+		'hp-ux'           => 'HP-UX',
+		'netbsd'          => 'NetBSD',
+		'bsdi'            => 'BSDi',
+		'openbsd'         => 'OpenBSD',
+		'gnu'             => 'GNU/Linux',
+		'unix'            => 'Unknown Unix OS',
+		'symbian'         => 'Symbian OS',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Browsers
+	 * -------------------------------------------------------------------
+	 *
+	 * The order of this array should NOT be changed. Many browsers return
+	 * multiple browser types so we want to identify the subtype first.
+	 *
+	 * @var array<string, string>
+	 */
+	public $browsers = [
+		'OPR'               => 'Opera',
+		'Flock'             => 'Flock',
+		'Edge'              => 'Spartan',
+		'Edg'               => 'Edge',
+		'Chrome'            => 'Chrome',
+		// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
+		'Opera.*?Version'   => 'Opera',
+		'Opera'             => 'Opera',
+		'MSIE'              => 'Internet Explorer',
+		'Internet Explorer' => 'Internet Explorer',
+		'Trident.* rv'      => 'Internet Explorer',
+		'Shiira'            => 'Shiira',
+		'Firefox'           => 'Firefox',
+		'Chimera'           => 'Chimera',
+		'Phoenix'           => 'Phoenix',
+		'Firebird'          => 'Firebird',
+		'Camino'            => 'Camino',
+		'Netscape'          => 'Netscape',
+		'OmniWeb'           => 'OmniWeb',
+		'Safari'            => 'Safari',
+		'Mozilla'           => 'Mozilla',
+		'Konqueror'         => 'Konqueror',
+		'icab'              => 'iCab',
+		'Lynx'              => 'Lynx',
+		'Links'             => 'Links',
+		'hotjava'           => 'HotJava',
+		'amaya'             => 'Amaya',
+		'IBrowse'           => 'IBrowse',
+		'Maxthon'           => 'Maxthon',
+		'Ubuntu'            => 'Ubuntu Web Browser',
+		'Vivaldi'           => 'Vivaldi',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Mobiles
+	 * -------------------------------------------------------------------
+	 *
+	 * @var array<string, string>
+	 */
+	public $mobiles = [
+		// legacy array, old values commented out
+		'mobileexplorer'       => 'Mobile Explorer',
+		// 'openwave'             => 'Open Wave',
+		// 'opera mini'           => 'Opera Mini',
+		// 'operamini'            => 'Opera Mini',
+		// 'elaine'               => 'Palm',
+		'palmsource'           => 'Palm',
+		// 'digital paths'        => 'Palm',
+		// 'avantgo'              => 'Avantgo',
+		// 'xiino'                => 'Xiino',
+		'palmscape'            => 'Palmscape',
+		// 'nokia'                => 'Nokia',
+		// 'ericsson'             => 'Ericsson',
+		// 'blackberry'           => 'BlackBerry',
+		// 'motorola'             => 'Motorola'
+
+		// Phones and Manufacturers
+		'motorola'             => 'Motorola',
+		'nokia'                => 'Nokia',
+		'palm'                 => 'Palm',
+		'iphone'               => 'Apple iPhone',
+		'ipad'                 => 'iPad',
+		'ipod'                 => 'Apple iPod Touch',
+		'sony'                 => 'Sony Ericsson',
+		'ericsson'             => 'Sony Ericsson',
+		'blackberry'           => 'BlackBerry',
+		'cocoon'               => 'O2 Cocoon',
+		'blazer'               => 'Treo',
+		'lg'                   => 'LG',
+		'amoi'                 => 'Amoi',
+		'xda'                  => 'XDA',
+		'mda'                  => 'MDA',
+		'vario'                => 'Vario',
+		'htc'                  => 'HTC',
+		'samsung'              => 'Samsung',
+		'sharp'                => 'Sharp',
+		'sie-'                 => 'Siemens',
+		'alcatel'              => 'Alcatel',
+		'benq'                 => 'BenQ',
+		'ipaq'                 => 'HP iPaq',
+		'mot-'                 => 'Motorola',
+		'playstation portable' => 'PlayStation Portable',
+		'playstation 3'        => 'PlayStation 3',
+		'playstation vita'     => 'PlayStation Vita',
+		'hiptop'               => 'Danger Hiptop',
+		'nec-'                 => 'NEC',
+		'panasonic'            => 'Panasonic',
+		'philips'              => 'Philips',
+		'sagem'                => 'Sagem',
+		'sanyo'                => 'Sanyo',
+		'spv'                  => 'SPV',
+		'zte'                  => 'ZTE',
+		'sendo'                => 'Sendo',
+		'nintendo dsi'         => 'Nintendo DSi',
+		'nintendo ds'          => 'Nintendo DS',
+		'nintendo 3ds'         => 'Nintendo 3DS',
+		'wii'                  => 'Nintendo Wii',
+		'open web'             => 'Open Web',
+		'openweb'              => 'OpenWeb',
+
+		// Operating Systems
+		'android'              => 'Android',
+		'symbian'              => 'Symbian',
+		'SymbianOS'            => 'SymbianOS',
+		'elaine'               => 'Palm',
+		'series60'             => 'Symbian S60',
+		'windows ce'           => 'Windows CE',
+
+		// Browsers
+		'obigo'                => 'Obigo',
+		'netfront'             => 'Netfront Browser',
+		'openwave'             => 'Openwave Browser',
+		'mobilexplorer'        => 'Mobile Explorer',
+		'operamini'            => 'Opera Mini',
+		'opera mini'           => 'Opera Mini',
+		'opera mobi'           => 'Opera Mobile',
+		'fennec'               => 'Firefox Mobile',
+
+		// Other
+		'digital paths'        => 'Digital Paths',
+		'avantgo'              => 'AvantGo',
+		'xiino'                => 'Xiino',
+		'novarra'              => 'Novarra Transcoder',
+		'vodafone'             => 'Vodafone',
+		'docomo'               => 'NTT DoCoMo',
+		'o2'                   => 'O2',
+
+		// Fallback
+		'mobile'               => 'Generic Mobile',
+		'wireless'             => 'Generic Mobile',
+		'j2me'                 => 'Generic Mobile',
+		'midp'                 => 'Generic Mobile',
+		'cldc'                 => 'Generic Mobile',
+		'up.link'              => 'Generic Mobile',
+		'up.browser'           => 'Generic Mobile',
+		'smartphone'           => 'Generic Mobile',
+		'cellphone'            => 'Generic Mobile',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Robots
+	 * -------------------------------------------------------------------
+	 *
+	 * There are hundred of bots but these are the most common.
+	 *
+	 * @var array<string, string>
+	 */
+	public $robots = [
+		'googlebot'            => 'Googlebot',
+		'msnbot'               => 'MSNBot',
+		'baiduspider'          => 'Baiduspider',
+		'bingbot'              => 'Bing',
+		'slurp'                => 'Inktomi Slurp',
+		'yahoo'                => 'Yahoo',
+		'ask jeeves'           => 'Ask Jeeves',
+		'fastcrawler'          => 'FastCrawler',
+		'infoseek'             => 'InfoSeek Robot 1.0',
+		'lycos'                => 'Lycos',
+		'yandex'               => 'YandexBot',
+		'mediapartners-google' => 'MediaPartners Google',
+		'CRAZYWEBCRAWLER'      => 'Crazy Webcrawler',
+		'adsbot-google'        => 'AdsBot Google',
+		'feedfetcher-google'   => 'Feedfetcher Google',
+		'curious george'       => 'Curious George',
+		'ia_archiver'          => 'Alexa Crawler',
+		'MJ12bot'              => 'Majestic-12',
+		'Uptimebot'            => 'Uptimebot',
+	];
+}
diff --git a/app/Config/Validation.php b/app/Config/Validation.php
new file mode 100644
index 0000000..9cb802e
--- /dev/null
+++ b/app/Config/Validation.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
+
+class Validation
+{
+	//--------------------------------------------------------------------
+	// Setup
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores the classes that contain the
+	 * rules that are available.
+	 *
+	 * @var string[]
+	 */
+	public $ruleSets = [
+		Rules::class,
+		FormatRules::class,
+		FileRules::class,
+		CreditCardRules::class,
+	];
+
+	/**
+	 * Specifies the views that are used to display the
+	 * errors.
+	 *
+	 * @var array<string, string>
+	 */
+	public $templates = [
+		'list'   => 'CodeIgniter\Validation\Views\list',
+		'single' => 'CodeIgniter\Validation\Views\single',
+	];
+
+	//--------------------------------------------------------------------
+	// Rules
+	//--------------------------------------------------------------------
+}
diff --git a/app/Config/View.php b/app/Config/View.php
new file mode 100644
index 0000000..c945e2e
--- /dev/null
+++ b/app/Config/View.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
+class View extends BaseView
+{
+	/**
+	 * When false, the view method will clear the data between each
+	 * call. This keeps your data safe and ensures there is no accidental
+	 * leaking between calls, so you would need to explicitly pass the data
+	 * to each view. You might prefer to have the data stick around between
+	 * calls so that it is available to all views. If that is the case,
+	 * set $saveData to true.
+	 *
+	 * @var boolean
+	 */
+	public $saveData = true;
+
+	/**
+	 * Parser Filters map a filter name with any PHP callable. When the
+	 * Parser prepares a variable for display, it will chain it
+	 * through the filters in the order defined, inserting any parameters.
+	 * To prevent potential abuse, all filters MUST be defined here
+	 * in order for them to be available for use within the Parser.
+	 *
+	 * Examples:
+	 *  { title|esc(js) }
+	 *  { created_on|date(Y-m-d)|esc(attr) }
+	 *
+	 * @var array
+	 */
+	public $filters = [];
+
+	/**
+	 * Parser Plugins provide a way to extend the functionality provided
+	 * by the core Parser by creating aliases that will be replaced with
+	 * any callable. Can be single or tag pair.
+	 *
+	 * @var array
+	 */
+	public $plugins = [];
+}
diff --git a/app/Controllers/API/BaseAPI.php b/app/Controllers/API/BaseAPI.php
new file mode 100644
index 0000000..afb69bc
--- /dev/null
+++ b/app/Controllers/API/BaseAPI.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\EventoModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class BaseAPI extends ResourceController
+{
+    private $nombreObjeto='BaseAPI';
+    public function __construct() {
+        $this->model = $this->setModel(new EventoModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/BoletaParejas.php b/app/Controllers/API/BoletaParejas.php
new file mode 100644
index 0000000..a9562d6
--- /dev/null
+++ b/app/Controllers/API/BoletaParejas.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\BoletaParejaModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class BoletaParejas extends ResourceController
+{
+    private $nombreObjeto='boleta pareja';
+    public function __construct() {
+        $this->model = $this->setModel(new BoletaParejaModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/Boletas.php b/app/Controllers/API/Boletas.php
new file mode 100644
index 0000000..e2e6820
--- /dev/null
+++ b/app/Controllers/API/Boletas.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\BoletaModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class Boletas extends ResourceController
+{
+    private $nombreObjeto='boleta';
+    public function __construct() {
+        $this->model = $this->setModel(new BoletaModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/Datas.php b/app/Controllers/API/Datas.php
new file mode 100644
index 0000000..5012b01
--- /dev/null
+++ b/app/Controllers/API/Datas.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\DataModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class Datas extends ResourceController
+{
+    private $nombreObjeto='data';
+    public function __construct() {
+        $this->model = $this->setModel(new DataModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/Eventos.php b/app/Controllers/API/Eventos.php
new file mode 100644
index 0000000..787a87e
--- /dev/null
+++ b/app/Controllers/API/Eventos.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\EventoModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\RESTful\ResourceController;
+use App\Controllers\API\Rondas;
+
+class Eventos extends ResourceController
+{
+    private $objeto='evento';
+    public function __construct() {
+        $this->model = $this->setModel(new EventoModel());
+    }
+
+	public function index()
+	{
+        try {
+            $eventos = $this->model->findAll();
+            return $this->respond( array("eventos" => $eventos) );
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $evento = $this->request->getJSON();
+            if ($this->model->insert($evento)):
+                $evento->id = $this->model->insertID;
+                return $this->respondCreated($evento);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->objeto .' vƔlido');
+
+            $evento = $this->model->find($id);
+            if($evento == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->objeto .' con el id: '. $id); 
+
+            return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->objeto .' vƔlido');
+
+            $eventoVerificado = $this->model->find($id);
+            if($eventoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->objeto .' con el id: '. $id); 
+
+            $evento = $this->request->getJSON();
+            if ($this->model->update($id, $evento)):
+                $evento->id = $id;
+                return $this->respondUpdated($evento);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->objeto .' vƔlido');
+
+            $eventoVerificado = $this->model->find($id);
+            if($eventoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->objeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($eventoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->objeto . ' con el id: '. $id);
+            endif;
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function rondas($evento_id = null)
+    {
+        try {
+            if ($evento_id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de evento vƔlido');
+            }
+
+            $evento_buscado = $this->model->find($evento_id);
+            if ($evento_buscado == null) {
+                return $this->failNotFound('No se ha encontrado un evento con el id: ' . $evento_id);
+            }
+
+            $listaRondas = $this->model->getRondas($evento_id);
+            return $this->respond( array("rondas" => $listaRondas) );
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+    public function rondaActiva($evento_id = null)
+    {
+        try {
+            if ($evento_id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de evento vƔlido');
+            }
+
+            $evento_buscado = $this->model->find($evento_id);
+            if ($evento_buscado == null) {
+                return $this->failNotFound('No se ha encontrado un evento con el id: ' . $evento_id);
+            }
+
+            $rondaAct = $this->model->getRondaActiva($evento_id);
+            return $this->respond( array("rondaActiva" => $rondaAct) );
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+
+    public function mesas($evento_id = null)
+    {
+        try {
+            if ($evento_id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de evento vƔlido');
+            }
+
+            $evento = new EventoModel();
+            $evento_buscado = $evento->find($evento_id);
+            if ($evento_buscado == null) {
+                return $this->failNotFound('No se ha encontrado un evento con el id: ' . $evento_id);
+            }
+
+            $listaMesas = $this->model->getMesas($evento_id);
+            return $this->respond( array("mesas" => $listaMesas) );
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+
+}
+
diff --git a/app/Controllers/API/Jugadores.php b/app/Controllers/API/Jugadores.php
new file mode 100644
index 0000000..26c2f88
--- /dev/null
+++ b/app/Controllers/API/Jugadores.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\JugadorModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class Jugadores extends ResourceController
+{
+    private $nombreObjeto='jugador';
+    public function __construct() {
+        $this->model = $this->setModel(new JugadorModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/Mesas.php b/app/Controllers/API/Mesas.php
new file mode 100644
index 0000000..29ff4a6
--- /dev/null
+++ b/app/Controllers/API/Mesas.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\MesaModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class Mesas extends ResourceController
+{
+    private $nombreObjeto='mesa';
+    public function __construct() {
+        $this->model = $this->setModel(new MesaModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function MesasEvento($evento_id = null)
+    {
+        try {
+            if($evento_id == null)
+                return $this->failValidationErrors('No se ha pasado un id de evento vƔlido');
+
+            $evento = new EventoModel();
+            $evento_buscado = $evento->find($evento_id);
+            if($evento_buscado == null)
+                return $this->failNotFound('No se ha encontrado un evento con el id: '. $evento_id); 
+
+            $ronda_activa = $this->model->getRondaActivaDelEvento($evento_id);
+            return $this->respond($ronda_activa);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/Parejas.php b/app/Controllers/API/Parejas.php
new file mode 100644
index 0000000..9c54be1
--- /dev/null
+++ b/app/Controllers/API/Parejas.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\EventoModel;
+use App\Models\ParejaModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\RESTful\ResourceController;
+
+class Parejas extends ResourceController
+{
+    private $nombreObjeto='pareja';
+    public function __construct() {
+        $this->model = $this->setModel(new ParejaModel());
+    }
+
+	public function index()
+	{
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+	}
+
+    public function create(){
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)):
+                $objeto->id = $this->model->insertID;
+                return $this->respondCreated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:'.$err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objeto = $this->model->find($id);
+            if($objeto == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            return $this->respond($objeto);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)):
+                $objeto->id = $id;
+                return $this->respondUpdated($objeto);
+            else:
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if($id == null)
+                return $this->failValidationErrors('No se ha pasado un id de '. $this->nombreObjeto .' vƔlido');
+
+            $objetoVerificado = $this->model->find($id);
+            if($objetoVerificado == null)
+                return $this->failNotFound('No se ha encontrado un '. $this->nombreObjeto .' con el id: '. $id); 
+
+            if ($this->model->delete($id)):
+                return $this->respondDeleted($objetoVerificado);
+            else:
+                return $this->failServerError('No se ha podido eliminar el '. $this->nombreObjeto . ' con el id: '. $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: '.$err->getMessage());
+        }
+    }
+
+}
diff --git a/app/Controllers/API/Rondas.php b/app/Controllers/API/Rondas.php
new file mode 100644
index 0000000..1420c2d
--- /dev/null
+++ b/app/Controllers/API/Rondas.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Controllers\API;
+
+use App\Models\EventoModel;
+use App\Models\RondaModel;
+use CodeIgniter\CLI\Console;
+use CodeIgniter\RESTful\ResourceController;
+
+class Rondas extends ResourceController
+{
+    private $nombreObjeto = 'ronda';
+    public function __construct()
+    {
+        $this->model = $this->setModel(new RondaModel());
+    }
+
+    public function index()
+    {
+        try {
+            $objetos = $this->model->findAll();
+            return $this->respond($objetos);
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:' . $err->getMessage());
+        }
+    }
+
+    public function create()
+    {
+        try {
+            $objeto = $this->request->getJSON();
+            if ($this->model->insert($objeto)) :
+                $objeto->id = $this->model->insertID;
+            return $this->respondCreated($objeto); else :
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+        } catch (\Exception $err) {
+            return $this->failServerError('Exception ha ocurrido un error en el servidor:' . $err->getMessage());
+        }
+    }
+
+    public function edit($id = null)
+    {
+        try {
+            if ($id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de ' . $this->nombreObjeto . ' vƔlido');
+            }
+
+            $objeto = $this->model->find($id);
+            if ($objeto == null) {
+                return $this->failNotFound('No se ha encontrado un ' . $this->nombreObjeto . ' con el id: ' . $id);
+            }
+
+            return $this->respond($objeto);
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+    public function update($id = null)
+    {
+        try {
+            if ($id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de ' . $this->nombreObjeto . ' vƔlido');
+            }
+
+            $objetoVerificado = $this->model->find($id);
+            if ($objetoVerificado == null) {
+                return $this->failNotFound('No se ha encontrado un ' . $this->nombreObjeto . ' con el id: ' . $id);
+            }
+
+            $objeto = $this->request->getJSON();
+            if ($this->model->update($id, $objeto)) :
+                $objeto->id = $id;
+            return $this->respondUpdated($objeto); else :
+                return $this->failValidationErrors($this->model->validation->listErrors());
+            endif;
+
+
+
+            // return $this->respond($evento);
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+    public function delete($id = null)
+    {
+        try {
+            if ($id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de ' . $this->nombreObjeto . ' vƔlido');
+            }
+
+            $objetoVerificado = $this->model->find($id);
+            if ($objetoVerificado == null) {
+                return $this->failNotFound('No se ha encontrado un ' . $this->nombreObjeto . ' con el id: ' . $id);
+            }
+
+            if ($this->model->delete($id)) :
+                return $this->respondDeleted($objetoVerificado); else :
+                return $this->failServerError('No se ha podido eliminar el ' . $this->nombreObjeto . ' con el id: ' . $id);
+            endif;
+
+
+
+            // return $this->respond($evento);
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el iguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+    public function rondaActivaEvento($evento_id = null)
+    {
+        try {
+            if ($evento_id == null) {
+                return $this->failValidationErrors('No se ha pasado un id de evento vƔlido');
+            }
+
+            $evento = new EventoModel();
+            $evento_buscado = $evento->find($evento_id);
+            if ($evento_buscado == null) {
+                return $this->failNotFound('No se ha encontrado un evento con el id: ' . $evento_id);
+            }
+
+            $ronda_activa = $this->model->getRondaActivaDelEvento($evento_id);
+            return $this->respond($ronda_activa);
+        } catch (\Exception $err) {
+            return $this->failServerError('Ha ocurrido el siguiente error en el servidor: ' . $err->getMessage());
+        }
+    }
+
+    
+}
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
new file mode 100644
index 0000000..5a1946b
--- /dev/null
+++ b/app/Controllers/BaseController.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class BaseController
+ *
+ * BaseController provides a convenient place for loading components
+ * and performing functions that are needed by all your controllers.
+ * Extend this class in any new controllers:
+ *     class Home extends BaseController
+ *
+ * For security be sure to declare any new methods as protected or private.
+ */
+
+class BaseController extends Controller
+{
+	/**
+	 * Instance of the main Request object.
+	 *
+	 * @var IncomingRequest|CLIRequest
+	 */
+	protected $request;
+
+	/**
+	 * An array of helpers to be loaded automatically upon
+	 * class instantiation. These helpers will be available
+	 * to all other controllers that extend BaseController.
+	 *
+	 * @var array
+	 */
+	protected $helpers = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger
+	 */
+	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+	{
+		// Do Not Edit This Line
+		parent::initController($request, $response, $logger);
+
+		//--------------------------------------------------------------------
+		// Preload any models, libraries, etc, here.
+		//--------------------------------------------------------------------
+		// E.g.: $this->session = \Config\Services::session();
+	}
+}
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
new file mode 100644
index 0000000..f059375
--- /dev/null
+++ b/app/Controllers/Home.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class Home extends BaseController
+{
+	public function index()
+	{
+		return view('welcome_message');
+	}
+}
diff --git a/app/Database/Migrations/.gitkeep b/app/Database/Migrations/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Database/Seeds/.gitkeep b/app/Database/Seeds/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Filters/.gitkeep b/app/Filters/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Helpers/.gitkeep b/app/Helpers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Language/.gitkeep b/app/Language/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Language/en/Validation.php b/app/Language/en/Validation.php
new file mode 100644
index 0000000..54d1e7a
--- /dev/null
+++ b/app/Language/en/Validation.php
@@ -0,0 +1,4 @@
+<?php
+
+// override core en language system validation or define your own en language validation message
+return [];
diff --git a/app/Language/es/CLI.php b/app/Language/es/CLI.php
new file mode 100644
index 0000000..a40e5fa
--- /dev/null
+++ b/app/Language/es/CLI.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// CLI language settings
+return [
+    'altCommandPlural'   => 'ĀæTe refieres a uno de estos?', // Did you mean one of these?',
+    'altCommandSingular' => 'ĀæTe refieres a esto?', // 'Did you mean this?',
+    'commandNotFound'    => 'Comando "{0}" no encontrado.', // 'Command "{0}" not found.',
+    'generator'          => [
+        'cancelOperation' => 'La operaciĆ³n ha sido cancelada.', // 'Operation has been cancelled.',
+        'className'       => [
+            'command'    => 'Nombre de la clase Command', // 'Command class name',
+            'config'     => 'Nombre de la clase Config', // 'Config class name',
+            'controller' => 'Nombre de la clase Controller', // 'Controller class name',
+            'default'    => 'Nombre de la clase', // 'Class name',
+            'entity'     => 'Nombre de la clase Entity', // 'Entity class name',
+            'filter'     => 'Nombre de la clase Filter', // 'Filter class name',
+            'migration'  => 'Nombre de la clase Migration', // 'Migration class name',
+            'model'      => 'Nombre de la clase Model', // 'Model class name',
+            'seeder'     => 'Nombre de la clase Seeder', // 'Seeder class name',
+            'validation' => 'Nombre de la clase Validation', // 'Validation class name',
+        ],
+        'commandType'      => 'Tipo de comando', // 'Command type',
+        'databaseGroup'    => 'Grupo de base de datos', // 'Database group',
+        'fileCreate'       => 'Archivo creado: {0}', // 'File created: {0}',
+        'fileError'        => 'Error al crear el archivo: {0}', // 'Error while creating file: {0}',
+        'fileExist'        => 'El archivo existe: {0}', // 'File exists: {0}',
+        'fileOverwrite'    => 'Archivo sobrescrito: {0}', // 'File overwritten: {0}',
+        'parentClass'      => 'Clase padre', // 'Parent class',
+        'returnType'       => 'Tipo de retorno', // 'Return type',
+        'tableName'        => 'Nombre de la tabla', // 'Table name',
+        'usingCINamespace' => 'Advertencia: El uso del espacio de nombres "CodeIgniter" generarĆ” el archivo en el directorio del sistema.', // 'Warning: Using the "CodeIgniter" namespace will generate the file in the system directory.'
+    ],
+    'helpArguments'       => 'Argumentos:', // 'Arguments:',
+    'helpDescription'     => 'DescripciĆ³n:', // 'Description:',
+    'helpOptions'         => 'Opciones:', // 'Options:',
+    'helpUsage'           => 'Uso:', // 'Usage:',
+    'invalidColor'        => 'InvƔlido {0} color: {1}.', // 'Invalid {0} color: {1}.',
+    'namespaceNotDefined' => 'El espacio de nombres "{0}" no estĆ” definido', // 'Namespace "{0}" is not defined.',
+];
diff --git a/app/Language/es/Cache.php b/app/Language/es/Cache.php
new file mode 100644
index 0000000..16c5994
--- /dev/null
+++ b/app/Language/es/Cache.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Cache language settings
+return [
+    'unableToWrite'   => 'Cache no pudo escribir a {0}', // 'Cache unable to write to {0}',
+    'invalidHandlers' => 'La configuraciĆ³n de Cache debe tener un array de $validHandlers.', // 'Cache config must have an array of $validHandlers.',
+    'noBackup'        => 'La configuraciĆ³n de Cache debe tener un manejador y un set de manejador de respaldo.', // 'Cache config must have a handler and backupHandler set.',
+    'handlerNotFound' => 'La configuraciĆ³n de Cache tiene un manejador o un manejador de respaldo invĆ”lidamente especificado', // 'Cache config has an invalid handler or backup handler specified.',
+];
diff --git a/app/Language/es/Cast.php b/app/Language/es/Cast.php
new file mode 100644
index 0000000..d86bbca
--- /dev/null
+++ b/app/Language/es/Cast.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Cast language settings
+return [
+    'baseCastMissing'        => 'La clase "{0}" debe heredar la clase "CodeIgniter\Entity\Cast\BaseCast".', // ' The "{0}" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class.'
+    'invalidCastMethod'      => 'El mĆ©todo de transmisiĆ³n "{0}" es invĆ”lido, los mĆ©todos vĆ”lidos son: ["get", "set"].',
+    'invalidTimestamp'       => 'El tipo de transmisiĆ³n "timestamp" espera un timestamp correcto.', // 'Type casting "timestamp" expects a correct timestamp.'
+    'jsonErrorCtrlChar'      => 'Se ha encontrado un carƔcter de control inesperado', // 'Unexpected control character found.',
+    'jsonErrorDepth'         => 'Se ha excedido el nivel mƔximo de profundidad', // 'Maximum stack depth exceeded',
+    'jsonErrorStateMismatch' => 'Desbordamiento o desajuste de modo', // 'Underflow or the modes mismatch',
+    'jsonErrorSyntax'        => 'Error de sintaxis, JSON mal formado', // 'Syntax error, malformed JSON',
+    'jsonErrorUnknown'       => 'Error desconocido', // 'Unknown error',
+    'jsonErrorUtf8'          => 'CarĆ”cter UTF-8 mal formado, posible codificaciĆ³n incorrecta', // 'Malformed UTF-8 characters, possibly incorrectly encoded',
+];
diff --git a/app/Language/es/Cookie.php b/app/Language/es/Cookie.php
new file mode 100644
index 0000000..d61e8ab
--- /dev/null
+++ b/app/Language/es/Cookie.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Cookie language settings
+return [
+    'invalidExpiresTime'    => 'Tipo "{0}" no vƔlido para el atributo "Caduca". Esperado: cadena, entero, objeto DateTimeInterface.', // 'Invalid "{0}" type for "Expires" attribute. Expected: string, integer, DateTimeInterface object.',
+    'invalidExpiresValue'   => 'El tiempo de caducidad de las cookies no es vƔlido.', // 'The cookie expiration time is not valid.',
+    'invalidCookieName'     => 'El nombre de la cookie "{0}" contiene caracteres no vƔlidos.', // 'The cookie name "{0}" contains invalid characters.',
+    'emptyCookieName'       => 'El nombre de la cookie no puede estar vacĆ­o.', // 'The cookie name cannot be empty.',
+    'invalidSecurePrefix'   => 'El uso del prefijo "__Secure-" requiere establecer el atributo "Seguro".', // 'Using the "__Secure-" prefix requires setting the "Secure" attribute.',
+    'invalidHostPrefix'     => 'El uso del prefijo "__Host-" debe establecerse con el indicador "Seguro", no debe tener un atributo de "Dominio" y la "Ruta" se establece en "/".', // 'Using the "__Host-" prefix must be set with the "Secure" flag, must not have a "Domain" attribute, and the "Path" is set to "/".',
+    'invalidSameSite'       => 'El valor de "SameSite" debe ser None, Lax, Strict o una cadena en blanco, {0} dado.', // 'The SameSite value must be None, Lax, Strict or a blank string, {0} given.',
+    'invalidSameSiteNone'   => 'El uso del atributo "SameSite = None" requiere configurar el atributo "Seguro".', // 'Using the "SameSite=None" attribute requires setting the "Secure" attribute.',
+    'invalidCookieInstance' => 'La clase "{0}" esperaba que la matriz de cookies fueran instancias de "{1}" pero obtuvo "{2}" en el Ć­ndice {3}.', // '"{0}" class expected cookies array to be instances of "{1}" but got "{2}" at index {3}.',
+    'unknownCookieInstance' => 'El objeto Cookie con el nombre "{0}" y el prefijo "{1}" no se encontrĆ³ en la colecciĆ³n.', // 'Cookie object with name "{0}" and prefix "{1}" was not found in the collection.',
+];
diff --git a/app/Language/es/Core.php b/app/Language/es/Core.php
new file mode 100644
index 0000000..88558c1
--- /dev/null
+++ b/app/Language/es/Core.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Core language settings
+return [
+    'copyError'                    => 'Se encontrĆ³ un error al intentar reemplazar el archivo ({0}). AsegĆŗrese de que su directorio de archivos sea editable.', // 'An error was encountered while attempting to replace the file({0}). Please make sure your file directory is writable.',
+    'enabledZlibOutputCompression' => 'Su directiva ini zlib.output_compression estĆ” activada. Esto no funcionarĆ” bien con bĆŗferes de salida.', // 'Your zlib.output_compression ini directive is turned on. This will not work well with output buffers.',
+    'invalidFile'                  => 'Archivo invƔlido: {0}', // 'Invalid file: {0}',
+    'invalidPhpVersion'            => 'Su versiĆ³n de PHP debe ser {0} o superior para ejecutar CodeIgniter. VersiĆ³n actual: {1}', // 'Your PHP version must be {0} or higher to run CodeIgniter. Current version: {1}',
+    'missingExtension'             => 'La extensiĆ³n {0} no estĆ” cargada.', // '{0} extension is not loaded.',
+    'noHandlers'                   => '{0} debe proporcionar al menos un controlador.', // {0} must provide at least one Handler.
+];
diff --git a/app/Language/es/Database.php b/app/Language/es/Database.php
new file mode 100644
index 0000000..f31067a
--- /dev/null
+++ b/app/Language/es/Database.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Database language settings
+return [
+    'invalidEvent'                     => '{0} no es una llamada vƔlida a un Evento de Modelo.', // '{0} is not a valid Model Event callback.',
+    'invalidArgument'                  => 'Debes proporcionar un {0} vƔlido.', // 'You must provide a valid {0}.',
+    'invalidAllowedFields'             => 'Los campos permitidos deben especificarse para el modelo: {0}', // 'Allowed fields must be specified for model: {0}',
+    'emptyDataset'                     => 'No hay datos para {0}', // 'There is no data to {0}.',
+    'emptyPrimaryKey'                  => 'No hay una clave principal definida al intentar hacer {0}', // 'There is no primary key defined when trying to make {0}.',
+    'failGetFieldData'                 => 'No se pudieron obtener datos del campo de la base de datos.', // 'Failed to get field data from database.',
+    'failGetIndexData'                 => 'No se pudieron obtener datos de Ć­ndice de la base de datos.', // 'Failed to get index data from database.',
+    'failGetForeignKeyData'            => 'No se pudieron obtener datos de clave externa de la base de datos.', // 'Failed to get foreign key data from database.',
+    'parseStringFail'                  => 'Se produjo un error al analizar la clave de la cadena.', // 'Parsing key string failed.',
+    'featureUnavailable'               => 'Esta caracterƭstica no estƔ disponible para la base de datos que estƔs utilizando.', // 'This feature is not available for the database you are using.',
+    'tableNotFound'                    => 'No se encontrĆ³ la tabla `{0}` en la base de datos actual.', // 'Table `{0}` was not found in the current database.',
+    'noPrimaryKey'                     => 'La clase de modelo `{0}` no especifica una clave primaria.', // '`{0}` model class does not specify a Primary Key.',
+    'noDateFormat'                     => 'La clase de modelo `{0}` no tiene un dateFormat vƔlido.', // '`{0}` model class does not have a valid dateFormat.',
+    'fieldNotExists'                   => 'No se encontrĆ³ el campo `{0}`.', // 'Field `{0}` not found.',
+    'forEmptyInputGiven'               => 'Se proporciona una declaraciĆ³n vacĆ­a para el campo `{0}`', // 'Empty statement is given for the field `{0}`',
+    'forFindColumnHaveMultipleColumns' => 'Solo se permite una sola columna en el nombre de la columna.', // 'Only single column allowed in Column name.',
+];
diff --git a/app/Language/es/Email.php b/app/Language/es/Email.php
new file mode 100644
index 0000000..30929e9
--- /dev/null
+++ b/app/Language/es/Email.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Email language settings
+return [
+    'mustBeArray'          => 'El mĆ©todo de validaciĆ³n del email debe ser pasado en array.',
+    'invalidAddress'       => 'DirecciĆ³n de email invĆ”lida: {0}',
+    'attachmentMissing'    => 'No se ha podido localizar el adjunto: {0}',
+    'attachmentUnreadable' => 'No se ha podido abrir el adjunto: {0}',
+    'noFrom'               => 'No se pude enviar un email sin cabecera "Para".',
+    'noRecipients'         => 'Debe incluir destinatarios: Para, Cc, or Bcc',
+    'sendFailurePHPMail'   => 'Incapaz de enviar email usando PHP mail(). Su servidor puede no estar configurado para enviar correos usando este mƩtodo.',
+    'sendFailureSendmail'  => 'Incapaz de enviar email usando PHP Sendmail. Su servidor puede no estar configurado para enviar correos usando este mƩtodo.',
+    'sendFailureSmtp'      => 'Incapaz de enviar email usando PHP SMTP. Su servidor puede no estar configurado para enviar correos usando este mƩtodo.',
+    'sent'                 => 'Su mensaje ha sido enviado correctamente utilizando el siguiente protocolo: {0}',
+    'noSocket'             => 'Incapaz de abrir un socket a Sendmail. Compruebe la configuraciĆ³n.',
+    'noHostname'           => 'No ha especificado un nombre de host SMTP.',
+    'SMTPError'            => 'Se han encontrado los siguientes errores SMTP: {0}',
+    'noSMTPAuth'           => 'Error: Debe especificar un usuario y contraseƱa SMTP.',
+    'failedSMTPLogin'      => 'Ha fallado el envĆ­o del comando AUTH LOGIN. Error: {0}',
+    'SMTPAuthUsername'     => 'Ha fallado la autentificaciĆ³n del usuario. Error: {0}',
+    'SMTPAuthPassword'     => 'Ha fallado la autentificaciĆ³n de la contraseƱa. Error: {0}',
+    'SMTPDataFailure'      => 'Incapaz de enviar datos: {0}',
+    'exitStatus'           => 'CĆ³digo de estado de salida: {0}',
+];
diff --git a/app/Language/es/Encryption.php b/app/Language/es/Encryption.php
new file mode 100644
index 0000000..301a570
--- /dev/null
+++ b/app/Language/es/Encryption.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Encryption language settings
+return [
+    'noDriverRequested'    => 'No se solicitĆ³ un driver; Ā”La seƱorita Daisy estarĆ” muy molesta!', // 'No driver requested; Miss Daisy will be so upset!',
+    'noHandlerAvailable'   => 'No se puede encontrar un controlador de cifrado {0} disponible.', // 'Unable to find an available {0} encryption handler.',
+    'unKnownHandler'       => '"{0}" no puede ser configurado.', // '"{0}" cannot be configured.',
+    'starterKeyNeeded'     => 'El encriptador necesita una clave de inicio.', // 'Encrypter needs a starter key.',
+    'authenticationFailed' => 'Descifrado: autenticaciĆ³n fallida.', // 'Decrypting: authentication failed.',
+    'encryptionFailed'     => 'Cifrado fallido.', // 'Encryption failed.',
+];
diff --git a/app/Language/es/Fabricator.php b/app/Language/es/Fabricator.php
new file mode 100644
index 0000000..8f5785f
--- /dev/null
+++ b/app/Language/es/Fabricator.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Fabricator language settings
+return [
+    'invalidModel'      => 'Suministrado Modelo invĆ”lido para fabricaciĆ³n.', // 'Invalid model supplied for fabrication.',
+    'missingFormatters' => 'No se han definido formateadores vƔlidos.', // 'No valid formatters defined.',
+    'createFailed'      => 'El fabricante no pudo insertar en la tabla {0}: {1}', // 'Fabricator failed to insert on table {0}: {1}',
+];
diff --git a/app/Language/es/Files.php b/app/Language/es/Files.php
new file mode 100644
index 0000000..b9e6856
--- /dev/null
+++ b/app/Language/es/Files.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Files language settings
+return [
+    'fileNotFound' => 'Archivo no encontrado: {0}', // 'File not found: {0}',
+    'cannotMove'   => 'No se pudo mover el archivo {0} a {1} ({2})', // 'Could not move file {0} to {1} ({2})',
+];
diff --git a/app/Language/es/Filters.php b/app/Language/es/Filters.php
new file mode 100644
index 0000000..4fbdd57
--- /dev/null
+++ b/app/Language/es/Filters.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Filters language settings
+return [
+    'noFilter'           => 'El filtro {0} debe tener un alias coincidente definido.', // '{0} filter must have a matching alias defined.',
+    'incorrectInterface' => '{0} debe implementar CodeIgniter\Filters\FilterInterface.', // '{0} must implement CodeIgniter\Filters\FilterInterface.',
+];
diff --git a/app/Language/es/Format.php b/app/Language/es/Format.php
new file mode 100644
index 0000000..5e5aa26
--- /dev/null
+++ b/app/Language/es/Format.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Format language settings
+return [
+    'invalidFormatter' => '"{0}" no es una clase de formateador vƔlida', // '"{0}" is not a valid Formatter class.',
+    'invalidJSON'      => 'Fallo al parsear la cadena JSON, error: "{0}".',
+    'invalidMime'      => 'No se ha definido ningĆŗn formateador para el tipo mime: "{0}".', // 'No Formatter defined for mime type: "{0}".',
+    'missingExtension' => 'La extensiĆ³n SimpleXML requiere formato XML.',
+];
diff --git a/app/Language/es/HTTP.php b/app/Language/es/HTTP.php
new file mode 100644
index 0000000..2a7650c
--- /dev/null
+++ b/app/Language/es/HTTP.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// HTTP language settings
+return [
+    // CurlRequest
+    'missingCurl'     => 'CURL debe estar habilitado para usar la clase CURLRequest.', // 'CURL must be enabled to use the CURLRequest class.',
+    'invalidSSLKey'   => 'No se puede establecer la clave SSL. {0} no es un archivo vƔlido.', // 'Cannot set SSL Key. {0} is not a valid file.',
+    'sslCertNotFound' => 'Certificado SSL no encontrado en: {0}', // 'SSL certificate not found at: {0}',
+    'curlError'       => '{0} : {1}', // '{0} : {1}',
+
+    // IncomingRequest
+    'invalidNegotiationType' => '{0} no es un tipo de negociaciĆ³n vĆ”lido. Debe ser uno de: media, charset, encoding, language.', // '{0} is not a valid negotiation type. Must be one of: media, charset, encoding, language.',
+
+    // Message
+    'invalidHTTPProtocol' => 'VersiĆ³n de protocolo HTTP no vĆ”lida. Debe ser una de: {0}', // 'Invalid HTTP Protocol Version. Must be one of: {0}',
+
+    // Negotiate
+    'emptySupportedNegotiations' => 'Debe proporcionar un array de valores compatibles a todas las negociaciones.', // 'You must provide an array of supported values to all Negotiations.',
+
+    // RedirectResponse
+    'invalidRoute' => 'No se puede encontrar la ruta {0} mientras se realiza el enrutamiento inverso.', // '{0} route cannot be found while reverse-routing.',
+
+    // DownloadResponse
+    'cannotSetBinary'        => 'Al establecer la ruta del archivo no se puede establecer binario.', // 'When setting filepath can not set binary.',
+    'cannotSetFilepath'      => 'Cuando se configura binario no se puede establecer ruta de archivo: {0}', // 'When setting binary can not set filepath: {0}',
+    'notFoundDownloadSource' => 'No se encontrĆ³ la fuente del cuerpo de descarga.', // 'Not found download body source.',
+    'cannotSetCache'         => 'No es compatible con el almacenamiento en cachƩ para la descarga.', // 'It does not supported caching for downloading.',
+    'cannotSetStatusCode'    => 'No admite el cĆ³digo de cambio de estado para descargar. cĆ³digo: {0}, razĆ³n: {1}', // 'It does not supported chnage status code for downloading. code: {0}, reason: {1}',
+
+    // Response
+    'missingResponseStatus' => 'Respuesta HTTP sin cĆ³digo de estado', // 'HTTP Response is missing a status code',
+    'invalidStatusCode'     => '{0} no es un cĆ³digo de estado de retorno HTTP vĆ”lido', // '{0} is not a valid HTTP return status code',
+    'unknownStatusCode'     => 'CĆ³digo de estado HTTP desconocido provisto sin mensaje: {0}', // 'Unknown HTTP status code provided with no message: {0}',
+
+    // URI
+    'cannotParseURI'       => 'No se puede analizar el URI: {0}', // 'Unable to parse URI: {0}',
+    'segmentOutOfRange'    => 'El segmento de solicitud de URI estĆ” fuera de rango: {0}', // 'Request URI segment is our of range: {0}',
+    'invalidPort'          => 'Los puertos deben estar entre 0 y 65535. Dado: {0}', // 'Ports must be between 0 and 65535. Given: {0}',
+    'malformedQueryString' => 'Las cadenas de consulta pueden no incluir fragmentos de URI.', // 'Query strings may not include URI fragments.',
+
+    // Page Not Found
+    'pageNotFound'       => 'PƔgina no encontrada', // 'Page Not Found',
+    'emptyController'    => 'NingĆŗn controlador especificado.', // 'No Controller specified.',
+    'controllerNotFound' => 'Controlador o su mƩtodo no encontrado: {0}::{1}', // 'Controller or its method is not found: {0}::{1}',
+    'methodNotFound'     => 'No se encontrĆ³ el mĆ©todo del controlador: {0}', // 'Controller method is not found: {0}',
+
+    // CSRF
+    'disallowedAction' => 'La acciĆ³n que solicitĆ³ no estĆ” permitida.', // 'The action you requested is not allowed.',
+
+    // Uploaded file moving
+    'alreadyMoved' => 'El archivo cargado ya se ha movido.', // 'The uploaded file has already been moved.',
+    'invalidFile'  => 'El archivo original no es un archivo vƔlido.', // 'The original file is not a valid file.',
+    'moveFailed'   => 'No se pudo mover el archivo {0} a {1} ({2})', // 'Could not move file {0} to {1} ({2})',
+
+    'uploadErrOk'        => 'Archivo cargado con Ć©xito.', // 'The file uploaded with success.',
+    'uploadErrIniSize'   => 'El archivo "%s" excede la directiva ini upload_max_filesize.', // 'The file "%s" exceeds your upload_max_filesize ini directive.',
+    'uploadErrFormSize'  => 'El archivo "%s" excede el lĆ­mite de carga definido en su formulario.', // 'The file "%s" exceeds the upload limit defined in your form.',
+    'uploadErrPartial'   => 'El archivo "%s" solo se cargĆ³ parcialmente.', // 'The file "%s" was only partially uploaded.',
+    'uploadErrNoFile'    => 'NingĆŗn archivo fue cargado.', // 'No file was uploaded.',
+    'uploadErrCantWrite' => 'El archivo "%s" no se pudo escribir en el disco.', // 'The file "%s" could not be written on disk.',
+    'uploadErrNoTmpDir'  => 'El archivo no se pudo cargar: falta el directorio temporal.', // 'File could not be uploaded: missing temporary directory.',
+    'uploadErrExtension' => 'La carga de archivos fue detenida por una extensiĆ³n PHP.', // 'File upload was stopped by a PHP extension.',
+    'uploadErrUnknown'   => 'El archivo "%s" no se cargĆ³ debido a un error desconocido.', // 'The file "%s" was not uploaded due to an unknown error.',
+
+    // SameSite setting
+    // @deprecated
+    'invalidSameSiteSetting' => 'La configuraciĆ³n de SameSite debe ser None, Lax, Strict o una cadena en blanco. Dado: {0}', // 'The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/app/Language/es/Images.php b/app/Language/es/Images.php
new file mode 100644
index 0000000..35ac2a4
--- /dev/null
+++ b/app/Language/es/Images.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Images language settings
+return [
+    'sourceImageRequired'    => 'Debe especificar el origen de la imagen en las preferencias.',
+    'gdRequired'             => 'Se requiere la librerƭa de imƔgenes GD para esta funcionalidad.',
+    'gdRequiredForProps'     => 'Su servidor debe soportar la librerƭa de imƔgenes GD para determinar las propiedades de la imagen.',
+    'gifNotSupported'        => 'Las imƔgnes GIF no suelen ser soportadas por restricciones de licencia. Puede utilizar imƔgenes JPG o PNG en su lugar.',
+    'jpgNotSupported'        => 'No se soportan imƔgenes JPG.',
+    'pngNotSupported'        => 'No se soportan imƔgenes PNG.',
+    'webpNotSupported'       => 'No se soportan imƔgenes WEBP.',
+    'fileNotSupported'       => 'El archivo proporcionado no es un tipo de imagen compatible.', // 'The supplied file is not a supported image type.',
+    'unsupportedImageCreate' => 'Su servidor no soporta la funciĆ³n GD necesaria para procesar este tipo de imagen.',
+    'jpgOrPngRequired'       => 'El protocolo de escalado especificado en sus preferencias solo funciona con imƔgenes JPEG o PNG.',
+    'rotateUnsupported'      => 'La rotaciĆ³n de imĆ”genes no parece estar soportada por su servidor.',
+    'libPathInvalid'         => 'La ruta a su librerƭa de imƔgenes no es correcta. Por favor corrija la ruta en sus preferencias de imagen. {0, string)',
+    'imageProcessFailed'     => 'Ha fallado el procesamiento de imagen. Por favor, verifique que su servidor soporta el protocolo seleccionado y que la ruta a su librerƭa de imƔgenes es correcta.',
+    'rotationAngleRequired'  => 'Es necesario un Ć”ngulo de rotaciĆ³n para rotar la imagen.',
+    'invalidPath'            => 'La ruta a la imagen no es correcta.',
+    'copyFailed'             => 'La rutina de copiado de imagen ha fallado.',
+    'missingFont'            => 'Incapaz de encontrar la fuente a utilizar.',
+    'saveFailed'             => 'Incapaz de guardar la imagen. Por favor compruebe que el archivo de la imagen y el directorio tienen permiso de escritura.',
+    'invalidDirection'       => 'La direcciĆ³n de girado puede ser solo `vertical` o `horizontal`. Seleccionado: {0}',
+    'exifNotSupported'       => 'Leer datos EXIF no estĆ” soportado por esta instalaciĆ³n de PHP.',
+];
diff --git a/app/Language/es/Log.php b/app/Language/es/Log.php
new file mode 100644
index 0000000..eeb7d29
--- /dev/null
+++ b/app/Language/es/Log.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Log language settings
+return [
+    'invalidLogLevel'    => '{0} es un nivel de log invƔlido.',
+    'invalidMessageType' => 'El tipo de mensaje especificado "{0}" no es compatible.', // 'The given message type "{0}" is not supported.',
+];
diff --git a/app/Language/es/Migrations.php b/app/Language/es/Migrations.php
new file mode 100644
index 0000000..5765621
--- /dev/null
+++ b/app/Language/es/Migrations.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Migration language settings
+return [
+    // Migration Runner
+    'missingTable'  => 'Debe establecer la tabla de migrado.',
+    'disabled'      => 'Las migraciones se han cargado pero estƔn deshabilitadas o configuradas incorrectamente.',
+    'notFound'      => 'Archivo de migraciĆ³n no encontrado: ',
+    'batchNotFound' => 'Lote objetivo no encontrado: ',
+    'empty'         => 'No se han encontrado archivos de migraciĆ³n',
+    'gap'           => 'Hay un hueco en la secuencia de migraciĆ³n cerca del nĆŗmero de versiĆ³n: ',
+    'classNotFound' => 'La clase de migraciĆ³n "%s" no se ha encontrado.',
+    'missingMethod' => 'La clase de migraciĆ³n no ha encontrado el mĆ©todo "%s".',
+
+    // Migration Command
+    'migHelpLatest'   => "\t\tMigra la base de datos a la Ćŗltima versiĆ³n disponible.",
+    'migHelpCurrent'  => "\t\tMigra la base de datos a la versiĆ³n marcado como 'current' en configuraciĆ³n.",
+    'migHelpVersion'  => "\tMigra la base de datos a la versiĆ³n {v}.",
+    'migHelpRollback' => "\tEjecuta todas las migraciones 'down' a la versiĆ³n 0.",
+    'migHelpRefresh'  => "\t\tDesinstala y reejecuta todas las migraciones para refrescar la base de datos.",
+    'migHelpSeed'     => "\tEjecuta la semilla de nombre [name].",
+    'migCreate'       => "\tCrea una nueva migraciĆ³n llamada [name]",
+    'nameMigration'   => 'Nombre el archivo de migraciĆ³n',
+    'migNumberError'  => 'El nĆŗmero de migraciĆ³n debe tener tres dĆ­gitos y no debe haber espacios en la secuencia.',
+    'rollBackConfirm' => 'ĀæEstĆ”s seguro de que quieres retrotraer?', // 'Are you sure you want to rollback?',
+    'refreshConfirm'  => 'ĀæEstĆ”s seguro de que quieres actualizar?', // 'Are you sure you want to refresh?',
+
+    'latest'            => 'Migrando a la Ćŗltima versiĆ³n...',
+    'generalFault'      => 'Ā”La migraciĆ³n fallĆ³!',
+    'migInvalidVersion' => 'NĆŗmero de versiĆ³n incorrecta.',
+    'toVersionPH'       => 'Migrando a la versiĆ³n %s...',
+    'toVersion'         => 'Migrando a la versiĆ³n actual...',
+    'rollingBack'       => 'Deshaciendo todas las migraciones...',
+    'noneFound'         => 'No se han encontrado migraciones.',
+    'migSeeder'         => 'Nombre de semilla',
+    'migMissingSeeder'  => 'Debe indicar un nombre de semilla.',
+    'nameSeeder'        => 'Nombra el archivo de la sembradora', // 'Name the seeder file',
+    'removed'           => 'Desinstalando: ',
+    'added'             => 'Ejecutando: ',
+
+    // Migrate Status
+    'namespace' => 'Espacio de nombres',
+    'filename'  => 'Nombre de archivo',
+    'version'   => 'VersiĆ³n',
+    'group'     => 'Grupo',
+    'on'        => 'Migrado el: ',
+    'batch'     => 'Lote',
+];
diff --git a/app/Language/es/Number.php b/app/Language/es/Number.php
new file mode 100644
index 0000000..d608ed4
--- /dev/null
+++ b/app/Language/es/Number.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Number language settings
+return [
+    'terabyteAbbr' => 'TB',
+    'gigabyteAbbr' => 'GB',
+    'megabyteAbbr' => 'MB',
+    'kilobyteAbbr' => 'KB',
+    'bytes'        => 'Bytes',
+
+    // don't forget the space in front of these!
+    'thousand'    => ' miles',
+    'million'     => ' millones',
+    'billion'     => ' billones',
+    'trillion'    => ' trillones',
+    'quadrillion' => ' quadrillones',
+];
diff --git a/app/Language/es/Pager.php b/app/Language/es/Pager.php
new file mode 100644
index 0000000..6697edc
--- /dev/null
+++ b/app/Language/es/Pager.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Pager language settings
+return [
+    'pageNavigation'         => 'NavegaciĆ³n de la pĆ”gina',
+    'first'                  => 'Primera',
+    'previous'               => 'Anterior',
+    'next'                   => 'Siguiente',
+    'last'                   => 'ƚltima',
+    'older'                  => 'Antigua',
+    'newer'                  => 'Nueva',
+    'invalidTemplate'        => '{0} no es un modelo vƔlido de paginador.',
+    'invalidPaginationGroup' => '{0} no es un grupo vĆ”lido de paginaciĆ³n.',
+];
diff --git a/app/Language/es/RESTful.php b/app/Language/es/RESTful.php
new file mode 100644
index 0000000..549e18e
--- /dev/null
+++ b/app/Language/es/RESTful.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// RESTful language settings
+return [
+    'notImplemented' => 'AcciĆ³n "{0}" no implementada.', // '"{0}" action not implemented.',
+];
diff --git a/app/Language/es/Router.php b/app/Language/es/Router.php
new file mode 100644
index 0000000..03a79cb
--- /dev/null
+++ b/app/Language/es/Router.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Router language settings
+return [
+    'invalidParameter'    => 'Un parƔmetro no corresponde con el tipo esperado.',
+    'missingDefaultRoute' => 'No se ha podido determinar que debe ser mostrado. No se ha establecido una ruta por defecto en el archivo de enrutado.',
+];
diff --git a/app/Language/es/Security.php b/app/Language/es/Security.php
new file mode 100644
index 0000000..e9fd4fb
--- /dev/null
+++ b/app/Language/es/Security.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Security language settings
+return [
+    'disallowedAction' => 'La acciĆ³n que solicitaste no estĆ” permitida', // 'The action you requested is not allowed.',
+
+    // @deprecated
+    'invalidSameSite' => 'El valor de SameSite debe ser None, Lax, Strict o una cadena en blanco. Dado: {0}', // 'The SameSite value must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/app/Language/es/Session.php b/app/Language/es/Session.php
new file mode 100644
index 0000000..455c3b3
--- /dev/null
+++ b/app/Language/es/Session.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Session language settings
+return [
+    'missingDatabaseTable'   => '`sessionSavePath` debe tener un nombre de tabla para que funcione el manejador de sesiĆ³n de la base de datos.',
+    'invalidSavePath'        => 'SesiĆ³n: La ruta de guardado configurada "{0}" no es un directorio, no existe o no puede ser creada.',
+    'writeProtectedSavePath' => 'SesiĆ³n: La ruta de guardado configurada "{0}" no es escribible por el proceso de PHP.',
+    'emptySavePath'          => 'SesiĆ³n: No se ha configurado una ruta de guardado.',
+    'invalidSavePathFormat'  => 'SesiĆ³n: Formato de ruta de guardado de Redis no vĆ”lido: {0}',
+
+    // @deprecated
+    'invalidSameSiteSetting' => 'SesiĆ³n: La configuraciĆ³n de SameSite debe ser None, Lax, Strict o una cadena en blanco. Dado: {0}', // 'Session: The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/app/Language/es/Time.php b/app/Language/es/Time.php
new file mode 100644
index 0000000..73a5026
--- /dev/null
+++ b/app/Language/es/Time.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Time language settings
+return [
+    'invalidFormat'  => '"{0}" no es un formato de fecha y hora vƔlido', // '"{0}" is not a valid datetime format',
+    'invalidMonth'   => 'Los meses deben estar entre 1 y 12. Establecido: {0}',
+    'invalidDay'     => 'Los dĆ­as deben estar entre 1 y 31. Establecido: {0}',
+    'invalidOverDay' => 'Los dĆ­as deben estar entre 1 y {0}. Establecido: {1}',
+    'invalidHours'   => 'Las horas deben estar entre 0 y 23. Establecido: {0}',
+    'invalidMinutes' => 'Los minutos deben estar entre 0 y 59. Establecido: {0}',
+    'invalidSeconds' => 'Los segundos deben estar entre 0 y 59. Establecido: {0}',
+    'years'          => '{0, plural, =1{# aƱo} other{# aƱo}}',
+    'months'         => '{0, plural, =1{# mes} other{# meses}}',
+    'weeks'          => '{0, plural, =1{# semana} other{# semanas}}',
+    'days'           => '{0, plural, =1{# dĆ­a} other{# dĆ­as}}',
+    'hours'          => '{0, plural, =1{# hora} other{# horas}}',
+    'minutes'        => '{0, plural, =1{# minuto} other{# minutos}}',
+    'seconds'        => '{0, plural, =1{# segundo} other{# segundos}}',
+    'ago'            => '{0} atrƔs',
+    'inFuture'       => 'en {0}',
+    'yesterday'      => 'Ayer',
+    'tomorrow'       => 'MaƱana',
+    'now'            => 'Ahora',
+];
diff --git a/app/Language/es/Validation.php b/app/Language/es/Validation.php
new file mode 100644
index 0000000..cf0c075
--- /dev/null
+++ b/app/Language/es/Validation.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// Validation language settings
+return [
+    // Core Messages
+    'noRuleSets'      => 'No se han establecido reglas en la configuraciĆ³n de validaciĆ³n.',
+    'ruleNotFound'    => '{0} no es una regla de validaciĆ³n vĆ”lida.',
+    'groupNotFound'   => '{0} no es un grupo de reglas de validaciĆ³n.',
+    'groupNotArray'   => '{0} el grupo de validaciĆ³n debe ser un array.',
+    'invalidTemplate' => '{0} no es un modelo de validaciĆ³n vĆ”lido.',
+
+    // Rule Messages
+    'alpha'                 => 'El campo {field} solo puede contener caracteres alfabƩticos.',
+    'alpha_dash'            => 'El campo {field} solo puede contener caracteres alfanumƩricos, subrayados, y guiones.',
+    'alpha_numeric'         => 'El campo {field} solo puede contener caracteres alfanumƩricos.',
+    'alpha_numeric_punct'   => 'El campo {field} solo puede contener caracteres alfanumƩricos, espacios, y los caracteres ~ ! # $ % & * - _ + = | : . .',
+    'alpha_numeric_space'   => 'El campo {field} solo puede contener caracteres alfanumƩricos y espacios.',
+    'alpha_space'           => 'El campo {field} solo puede contener caracteres alfabƩticos y espacios.',
+    'decimal'               => 'El campo {field} debe contener un nĆŗmero decimal.',
+    'differs'               => 'El campo {field} debe diferir del campo {param}.',
+    'equals'                => 'El campo {field} debe ser exactamente: {param}.',
+    'exact_length'          => 'El campo {field} debe tener exactamente {param} caractƩres de longitud.',
+    'greater_than'          => 'El campo {field} debe contener un nĆŗmero mayor que {param}.',
+    'greater_than_equal_to' => 'El campo {field} debe contener un nĆŗmero mayor o igual a {param}.',
+    'hex'                   => 'El campo {field} solo puede contener caracteres hexadecimales.',
+    'in_list'               => 'El campo {field} debe ser uno de: {param}.',
+    'integer'               => 'El campo {field} debe contener un entero.',
+    'is_natural'            => 'El campo {field} debe contener solo dĆ­gitos.',
+    'is_natural_no_zero'    => 'El campo {field} debe solo contener dĆ­gitos y ser mayor que cero.',
+    'is_not_unique'         => 'El campo {field} debe contener un valor previamente existente en la base de datos.',
+    'is_unique'             => 'El campo {field} debe contener un valor Ćŗnico.',
+    'less_than'             => 'El campo {field} debe contener un nĆŗmero menor que {param}.',
+    'less_than_equal_to'    => 'El campo {field} debe contener un nĆŗmero menor o igual a {param}.',
+    'matches'               => 'El campo {field} no coincide con el campo {param}.',
+    'max_length'            => 'El campo {field} no pude exceder los {param} caracteres de longitud.',
+    'min_length'            => 'El campo {field} debe tener al menos {param} caracteres de longitud.',
+    'not_equals'            => 'El campo {field} no puede ser: {param}.',
+    'not_in_list'           => 'El campo {field} no debe ser uno de: {param}.',
+    'numeric'               => 'El campo {field} debe contener solo nĆŗmeros.',
+    'regex_match'           => 'El campo {field} no estĆ” en el formato correcto.',
+    'required'              => 'El campo {field} es obligatorio.',
+    'required_with'         => 'El campo {field} es obligatorio cuando {param} estĆ” presente.',
+    'required_without'      => 'El campo {field} es obligatorio cuando {param} no estĆ” presente.',
+    'string'                => 'El campo {field} debe ser una cadena vƔlida.',
+    'timezone'              => 'El campo {field} debe ser una zona horaria vƔlida.',
+    'valid_base64'          => 'El campo {field} debe ser una cadena base64 vƔlida.',
+    'valid_email'           => 'El campo {field} debe contener una direcciĆ³n de email vĆ”lida.',
+    'valid_emails'          => 'El campo {field} debe contener todas las direcciones de email vƔlidas.',
+    'valid_ip'              => 'El campo {field} debe contener una IP vƔlida.',
+    'valid_url'             => 'El campo {field} debe contener una URL vƔlida.',
+    'valid_date'            => 'El campo {field} debe contener una fecha vƔlida.',
+
+    // Credit Cards
+    'valid_cc_num' => '{field} no parece ser un nĆŗmero de tarjeta de crĆ©dito vĆ”lida.',
+
+    // Files
+    'uploaded' => '{field} no es un campo de subida de archivo vƔlido.',
+    'max_size' => '{field} es demasiado grande para un archivo.',
+    'is_image' => '{field} no es vƔlido, subido archivo de imagen.',
+    'mime_in'  => '{field} no tiene un tipo vƔlido de mime.',
+    'ext_in'   => '{field} no tiene una extensiĆ³n de archivo vĆ”lida.',
+    'max_dims' => '{field} no es una imagen o tiene demasiado alto o ancho.',
+];
diff --git a/app/Language/es/View.php b/app/Language/es/View.php
new file mode 100644
index 0000000..9bc6f61
--- /dev/null
+++ b/app/Language/es/View.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+// View language settings
+return [
+    'invalidCellMethod'     => '{class}::{method} no es un mƩtodo vƔlido.',
+    'missingCellParameters' => '{class}::{method} no tiene parƔmetros.',
+    'invalidCellParameter'  => '{0} no es un nombre de parƔmetro vƔlido.',
+    'noCellClass'           => 'No se ha establecido una clase de vista de celda.',
+    'invalidCellClass'      => 'No se ha podido localizar la clase de vista de celda: {0}.',
+    'tagSyntaxError'        => 'Tiene un error de sintaxis en su analizador de etiquetas: {0}',
+];
diff --git a/app/Libraries/.gitkeep b/app/Libraries/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Models/.gitkeep b/app/Models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Models/BoletaModel.php b/app/Models/BoletaModel.php
new file mode 100644
index 0000000..239e136
--- /dev/null
+++ b/app/Models/BoletaModel.php
@@ -0,0 +1,15 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class BoletaModel extends Model{
+    protected $table            = 'boleta';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['evento_id', 'ronda_id', 'mesa_id', 'es_valida', 'fecha_registro'];
+
+    // protected $useTimestamps    = true;
+    // protected $createdField     = 'fecha_registro';
+
+}
\ No newline at end of file
diff --git a/app/Models/BoletaParejaModel.php b/app/Models/BoletaParejaModel.php
new file mode 100644
index 0000000..14bd7d1
--- /dev/null
+++ b/app/Models/BoletaParejaModel.php
@@ -0,0 +1,16 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class BoletaParejaModel extends Model{
+    protected $table            = 'boleta_pareja';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['boleta_id', 'pareja_id', 'salidor', 'tantos', 'resultado', 'ganador'];
+
+    protected $useTimestamps    = true;
+    protected $createdField     = 'inicio';
+    protected $updatedField     = 'duracion';
+
+}
\ No newline at end of file
diff --git a/app/Models/DataModel.php b/app/Models/DataModel.php
new file mode 100644
index 0000000..4ae4066
--- /dev/null
+++ b/app/Models/DataModel.php
@@ -0,0 +1,11 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class DataModel extends Model{
+    protected $table            = 'data';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = [ 'pareja_ganadora', 'puntos'];
+}
\ No newline at end of file
diff --git a/app/Models/EventoModel.php b/app/Models/EventoModel.php
new file mode 100644
index 0000000..7dbaade
--- /dev/null
+++ b/app/Models/EventoModel.php
@@ -0,0 +1,52 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class EventoModel extends Model{
+    protected $table            = 'evento';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['nombre', 'comentario', 'ciudad_id','cerrado', 'fecha_inicio', 'fecha_cierre'];
+
+    protected $useTimestamps    = true;
+    protected $createdField     = 'creado';
+    protected $updatedField     = 'actualizado';
+
+    protected $validationRules  = [
+        'nombre'        => 'required|is_unique[evento.nombre]|min_length[3]|max_length[60]',
+        'comentario'    => 'permit_empty|max_length[255]'
+    ];
+
+    protected $skipValidation   = false;
+
+    public function getRondas($evento_id = null)
+    {
+        $builder = $this->db->table('ronda');
+        $builder->select('ronda.*');
+        $builder->where('evento_id', $evento_id);
+        $query = $builder->get();
+        return $query->getResult ();
+    }
+
+        
+    public function getRondaActiva($evento_id = null)
+    {
+        $builder = $this->db->table('ronda');
+        $builder->select('ronda.*');
+        $builder->where('evento_id', $evento_id);
+        $builder->where('cerrada', false);
+        $query = $builder->get();
+        return $query->getResult ();
+    }
+
+    public function getMesas($evento_id = null)
+    {
+        $builder = $this->db->table('mesa');
+        $builder->select('mesa.*');
+        $builder->where('evento_id', $evento_id);
+        $query = $builder->get();
+        return $query->getResult ();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/JugadorModel.php b/app/Models/JugadorModel.php
new file mode 100644
index 0000000..9f738cd
--- /dev/null
+++ b/app/Models/JugadorModel.php
@@ -0,0 +1,29 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class JugadorModel extends Model{
+    protected $table            = 'jugador';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['nombre', 'telefono', 'sexo', 'correo', 'nro_identidad', 'fecha_nacimiento', 'alias', 
+                                    'ocupacion', 'comentario', 'nivel', 'elo', 'ranking', 'tipo', 'ciudad_id'];
+    protected $validationRules  = [
+        'nombre'        => 'required|min_length[3]|max_length[120]',
+        'telefono'      => 'permit_empty|min_length[8]|max_length[8]',
+        'sexo'          => 'required|min_length[1]|max_length[1]',
+        'correo'        => 'required|valid_email',
+        'comentario'    => 'permit_empty|max_length[255]'
+    ];
+
+    // protected $validationMessages  = [
+    //     'nombre'        => [
+    //         'is_unique'        => 'Ya el evento existe',
+    //         'min_length'    => 'El nombre del evento debe contener al menos 3 caracteres'
+    //     ]
+    // ];
+
+    protected $skipValidation   = false;
+
+}
\ No newline at end of file
diff --git a/app/Models/MesaModel.php b/app/Models/MesaModel.php
new file mode 100644
index 0000000..ff68e02
--- /dev/null
+++ b/app/Models/MesaModel.php
@@ -0,0 +1,22 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class MesaModel extends Model{
+    protected $table            = 'mesa';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['numero','evento_id'];
+
+    // protected $useTimestamps    = true;
+    // protected $createdField     = 'inicio';
+    // protected $updatedField     = 'cierre';
+
+    protected $validationRules  = [
+        'numero'        => 'required|numeric'
+    ];
+
+    protected $skipValidation   = false;
+
+}
\ No newline at end of file
diff --git a/app/Models/ParejaModel.php b/app/Models/ParejaModel.php
new file mode 100644
index 0000000..98acac2
--- /dev/null
+++ b/app/Models/ParejaModel.php
@@ -0,0 +1,19 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class ParejaModel extends Model{
+    protected $table            = 'pareja';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['nombre', 'evento_id','jugador1_id', 'jugador2_id'];
+
+
+    protected $validationRules  = [
+        'nombre'        => 'required|max_length[60]'
+    ];
+
+    protected $skipValidation   = false;
+
+}
\ No newline at end of file
diff --git a/app/Models/RondaModel.php b/app/Models/RondaModel.php
new file mode 100644
index 0000000..f971524
--- /dev/null
+++ b/app/Models/RondaModel.php
@@ -0,0 +1,34 @@
+<?php namespace App\Models;
+
+use CodeIgniter\Model;
+
+class RondaModel extends Model{
+    protected $table            = 'ronda';
+    protected $primaryKey       = 'id';
+
+    protected $returnType       = 'array';
+    protected $allowedFields    = ['numero', 'evento_id','comentario', 'cerrada', 'dia'];
+
+    protected $useTimestamps    = true;
+    protected $createdField     = 'inicio';
+    protected $updatedField     = 'cierre';
+
+    protected $validationRules  = [
+        'numero'        => 'required|numeric',
+        'comentario'    => 'permit_empty|max_length[255]'
+    ];
+
+    protected $skipValidation   = false;
+
+    public function getRondaActivaDelEvento($evento_id = null)
+    {
+        $builder = $this->db->table($this->table);
+        $builder->select('ronda.numero');
+        $builder->join('evento', 'evento.id = ronda.evento_id');
+        $builder->where('evento_id', $evento_id);
+        $builder->where('cerrada', false);
+        $query = $builder->get();
+        return $query->getResult ();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/SQL/domino.sql b/app/Models/SQL/domino.sql
new file mode 100644
index 0000000..28deb37
--- /dev/null
+++ b/app/Models/SQL/domino.sql
@@ -0,0 +1,350 @@
+-- phpMyAdmin SQL Dump
+-- version 5.1.0
+-- https://www.phpmyadmin.net/
+--
+-- Servidor: 127.0.0.1
+-- Tiempo de generaciĆ³n: 29-09-2021 a las 03:37:23
+-- VersiĆ³n del servidor: 10.4.18-MariaDB
+-- VersiĆ³n de PHP: 8.0.3
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Base de datos: `domino`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `boleta`
+--
+
+CREATE TABLE `boleta` (
+  `id` int(11) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `ronda_id` int(11) NOT NULL,
+  `mesa_id` int(11) NOT NULL,
+  `es_valida` bit(1) NOT NULL DEFAULT b'1',
+  `fecha_registro` char(10) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `boleta_pareja`
+--
+
+CREATE TABLE `boleta_pareja` (
+  `id` int(11) NOT NULL,
+  `boleta_id` int(11) NOT NULL,
+  `pareja_id` int(11) NOT NULL,
+  `salidor` bit(1) NOT NULL DEFAULT b'0',
+  `tantos` int(11) NOT NULL,
+  `resultado` int(11) NOT NULL DEFAULT 0,
+  `ganador` bit(1) NOT NULL DEFAULT b'0',
+  `inicio` datetime NOT NULL,
+  `duracion` datetime DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `ciudad`
+--
+
+CREATE TABLE `ciudad` (
+  `id` int(11) NOT NULL,
+  `pais` varchar(120) NOT NULL,
+  `pais_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `data`
+--
+
+CREATE TABLE `data` (
+  `id` int(11) NOT NULL,
+  `numero` smallint(6) NOT NULL,
+  `boleta_id` int(11) NOT NULL,
+  `pareja_ganadora` int(11) NOT NULL,
+  `puntos` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `evento`
+--
+
+CREATE TABLE `evento` (
+  `id` int(11) NOT NULL,
+  `ciudad_id` int(11) NOT NULL,
+  `nombre` varchar(120) NOT NULL,
+  `comentario` varchar(255) DEFAULT NULL,
+  `cerrado` bit(1) NOT NULL DEFAULT b'0',
+  `fecha_inicio` datetime DEFAULT NULL,
+  `fecha_cierre` datetime DEFAULT NULL,
+  `creado` datetime NOT NULL,
+  `actualizado` datetime NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+--
+-- Volcado de datos para la tabla `evento`
+--
+
+INSERT INTO `evento` (`id`, `ciudad_id`, `nombre`, `comentario`, `cerrado`, `fecha_inicio`, `fecha_cierre`, `creado`, `actualizado`) VALUES
+(1, 1, 'ClƔsico 2021', 'ClƔsico 2021 GuantƔnamo', b'0', '2021-09-25 18:46:27', '2021-09-25 18:46:27', '2021-09-25 18:46:27', '2021-09-25 18:46:27'),
+(2, 1, 'ClƔsico 2022', 'ClƔsico 2022 GuantƔnamo', b'0', '2021-09-25 18:46:27', '2021-09-25 18:46:27', '2021-09-25 18:46:27', '2021-09-25 18:46:27'),
+(3, 1, 'ClƔsico 2023 Actualiz', 'ClƔsico 2023 GuantƔnamo Actualizado', b'1', '2021-09-25 18:46:27', '2021-09-25 18:46:27', '2021-09-28 19:51:48', '2021-09-28 19:56:08');
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `jugador`
+--
+
+CREATE TABLE `jugador` (
+  `id` int(11) NOT NULL,
+  `telefono` varchar(15) DEFAULT NULL,
+  `nombre` varchar(120) NOT NULL,
+  `sexo` char(1) NOT NULL DEFAULT 'M',
+  `correo` varchar(120) NOT NULL,
+  `nro_identidad` varchar(30) NOT NULL,
+  `fecha_nacimiento` date NOT NULL,
+  `alias` varchar(30) DEFAULT NULL,
+  `ocupacion` varchar(120) DEFAULT NULL,
+  `comentario` varchar(255) DEFAULT NULL,
+  `nivel` varchar(30) NOT NULL,
+  `elo` int(11) NOT NULL DEFAULT 0,
+  `ranking` char(2) DEFAULT NULL,
+  `tipo` char(1) DEFAULT NULL,
+  `ciudad_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `mesa`
+--
+
+CREATE TABLE `mesa` (
+  `id` int(11) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `numero` smallint(6) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `pais`
+--
+
+CREATE TABLE `pais` (
+  `id` int(11) NOT NULL,
+  `nombre` varchar(120) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `pareja`
+--
+
+CREATE TABLE `pareja` (
+  `id` int(11) NOT NULL,
+  `nombre` varchar(60) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `jugador1_id` int(11) NOT NULL,
+  `jugador2_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `ronda`
+--
+
+CREATE TABLE `ronda` (
+  `id` int(11) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `numero` smallint(6) NOT NULL,
+  `inicio` datetime DEFAULT NULL,
+  `cierre` datetime DEFAULT NULL,
+  `dia` smallint(6) NOT NULL,
+  `cerrada` bit(1) NOT NULL DEFAULT b'0',
+  `comentario` varchar(255) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+--
+-- Volcado de datos para la tabla `ronda`
+--
+
+INSERT INTO `ronda` (`id`, `evento_id`, `numero`, `inicio`, `cierre`, `dia`, `cerrada`, `comentario`) VALUES
+(1, 1, 1, '2021-09-28 16:49:35', '2021-09-28 16:49:35', 1, b'0', NULL),
+(2, 1, 2, '2021-09-28 16:49:35', '2021-09-28 16:49:35', 1, b'0', NULL),
+(3, 1, 3, '2021-09-28 16:49:35', '2021-09-28 16:49:35', 1, b'0', NULL),
+(4, 1, 4, '2021-09-28 16:49:35', '2021-09-28 16:49:35', 1, b'0', NULL),
+(5, 2, 1, '2021-09-28 16:49:35', '2021-09-28 16:49:35', 1, b'0', NULL),
+(6, 2, 2, '2021-09-28 16:49:35', '2021-09-28 16:49:35', 1, b'0', NULL);
+
+--
+-- ƍndices para tablas volcadas
+--
+
+--
+-- Indices de la tabla `boleta`
+--
+ALTER TABLE `boleta`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `PK_ALT13` (`evento_id`,`mesa_id`,`ronda_id`),
+  ADD KEY `Ref157` (`evento_id`),
+  ADD KEY `Ref1158` (`ronda_id`),
+  ADD KEY `Ref1059` (`mesa_id`);
+
+--
+-- Indices de la tabla `boleta_pareja`
+--
+ALTER TABLE `boleta_pareja`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref1360` (`boleta_id`),
+  ADD KEY `Ref1761` (`pareja_id`);
+
+--
+-- Indices de la tabla `ciudad`
+--
+ALTER TABLE `ciudad`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref24` (`pais_id`);
+
+--
+-- Indices de la tabla `data`
+--
+ALTER TABLE `data`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `PK_ALT14` (`boleta_id`,`numero`),
+  ADD KEY `Ref1362` (`boleta_id`),
+  ADD KEY `Ref1763` (`pareja_ganadora`);
+
+--
+-- Indices de la tabla `evento`
+--
+ALTER TABLE `evento`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref35` (`ciudad_id`);
+
+--
+-- Indices de la tabla `jugador`
+--
+ALTER TABLE `jugador`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref312` (`ciudad_id`);
+
+--
+-- Indices de la tabla `mesa`
+--
+ALTER TABLE `mesa`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `K_ALT10` (`evento_id`,`numero`),
+  ADD KEY `Ref153` (`evento_id`);
+
+--
+-- Indices de la tabla `pais`
+--
+ALTER TABLE `pais`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Indices de la tabla `pareja`
+--
+ALTER TABLE `pareja`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref167` (`evento_id`),
+  ADD KEY `Ref1270` (`jugador1_id`),
+  ADD KEY `Ref1271` (`jugador2_id`);
+
+--
+-- Indices de la tabla `ronda`
+--
+ALTER TABLE `ronda`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `PK_ALT11` (`evento_id`,`numero`),
+  ADD KEY `Ref151` (`evento_id`);
+
+--
+-- AUTO_INCREMENT de las tablas volcadas
+--
+
+--
+-- AUTO_INCREMENT de la tabla `boleta`
+--
+ALTER TABLE `boleta`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `boleta_pareja`
+--
+ALTER TABLE `boleta_pareja`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `ciudad`
+--
+ALTER TABLE `ciudad`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `data`
+--
+ALTER TABLE `data`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `evento`
+--
+ALTER TABLE `evento`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+
+--
+-- AUTO_INCREMENT de la tabla `jugador`
+--
+ALTER TABLE `jugador`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `mesa`
+--
+ALTER TABLE `mesa`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `pais`
+--
+ALTER TABLE `pais`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `pareja`
+--
+ALTER TABLE `pareja`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `ronda`
+--
+ALTER TABLE `ronda`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/app/Models/SQL/dominoAPI CI4.DM1 b/app/Models/SQL/dominoAPI CI4.DM1
new file mode 100644
index 0000000..2243231
--- /dev/null
+++ b/app/Models/SQL/dominoAPI CI4.DM1	
@@ -0,0 +1,4817 @@
+Repository_Object_Role
+Repository_Object_Role_ID,Repository_Role_ID,Object_Type,Object_GUID,Object_ID,Save_Date
+
+Repository_Role_Privilege
+Repository_Role_Privilege_ID,Repository_Role_ID,Privilege_Name
+
+Repository_Role
+Repository_Role_ID,Role_Name
+
+Repository_User_Info
+Repository_User_Info_ID,User_Name,Machine_Name,User_ID,Machine_ID,Flags
+
+Project_Link
+Project_Link_ID,Parent_Project_ID,Child_Project_ID,Ultimate_Parent_Project_ID,RootNode
+
+Defaults
+DefaultId,Dictionary_Object_ID,DefaultNameId,DefaultTextId,NSTFlag,Global_User_ID,Row_Time_Stamp
+
+Rules
+RuleId,Dictionary_Object_ID,RuleNameId,RuleTextId,Global_User_ID,NSTFlag,Row_Time_Stamp
+
+UserDatatype
+UserDatatypeId,Dictionary_Object_ID,Length,Scale,Nullable,CheckConstraintId,DeclaredDefaultId,UserDatatype,DatatypeId,DefaultId,RuleId,Global_User_ID,Row_Time_Stamp
+
+Domain
+DomainId,Dictionary_Object_ID,Length,Scale,Nullable,IdentityColumn,IdentitySeed,IdentityIncrement,DeclaredDefaultId,CheckConstraintId,DomainNameId,ColumnNameId,DatatypeId,UserDatatype,DefaultId,RuleId,UserDatatypeId,Reference_Value_ID,Naming_Standards_Template_ID,AttributeName_ID,Description_ID,Notes_ID,NSTFlag,IsCategory,Global_User_ID,Row_Time_Stamp
+
+Version
+VersionId,Version_ID,Copyright,Global_User_ID,Row_Time_Stamp
+800,1,"Copyright (c) Embarcadero Technologies, Inc. 1995-2003",0,0
+
+Diagram
+DiagramId,Version_ID,VersionId,LastUpdate,CreateDate,ActiveModel,ActiveSubmodel,VSplitterPosition,X,Y,Width,Height,DiagramNameId,AuthorId,CompanyId,VersionNoId,CopyrightStringId,DefinitionId,UnificationOptionId,FileNameId,CopyrightYearStringId,DiagramName,CodePage,SignatureGUID,ReleaseName,Flags,Global_User_ID,Row_Time_Stamp
+1,1,800,09/11/2021 18:18:35G,09/10/2021 18:07:01G,3,1,180,0,0,0,0,169,77,78,79,78,0,80,169,0,dominoAPI CI4.DM1,1252,NULL,"",0,1,0
+
+Model
+DiagramId,ModelId,Model_ID,ModelType,PlatformId,NamePrefix,SpaceHandling,CaseHandling,GenPrimaryKey,GenAlternateKey,GenInversionEntry,GenForeignKey,Notation,ModelNameId,RowOverhead,TableOverhead,IndexOverhead,BlobOverhead,BlobBlockSize,Global_User_ID,Row_Time_Stamp
+1,1,1,1,0,NULL,P,P,0,0,0,0,DASHED_IE,3,0,NULL,0,NULL,0,3,0
+1,3,7,2,73,"",P,P,1,1,0,1,DASHED_IE,208,0,1.000000,0,1.000000,2048,2836,0
+
+ModelOption
+DiagramId,ModelId,OptionType,ModelOption_ID,Model_ID,OptionValue,Global_User_ID,Row_Time_Stamp
+1,1,Display,8,1,0,11,0
+1,3,Scale,71,7,0,2842,0
+1,1,RoleNmPref,10,1,"",13,0
+1,1,Edit LogNames,14,1,0,18,0
+1,1,Width,5,1,10,8,0
+1,3,NotNull,72,7,0,2843,0
+1,1,Datatype,4,1,CH,7,0
+1,3,Datatype,69,7,CH,2840,0
+1,3,Edit LogNames,79,7,0,2851,0
+1,1,NameMax,1,1,65,4,0
+1,1,Scale,6,1,0,9,0
+1,1,Logical View Parser Platform,17,1,1,20,0
+1,1,NameSync,2,1,1,5,0
+1,3,NameSync,67,7,2,2838,0
+1,3,Ignore Physical Model Name Length,81,7,0,2852,0
+1,3,ColmOrd,78,7,1,2849,0
+1,1,NotNull,7,1,0,10,0
+1,1,BkgColor,11,1,16777215,14,0
+1,3,BkgColor,76,7,16777215,2847,0
+1,1,Attr/Column NameSync,3,1,2,6,0
+1,1,CaseShift,12,1,0,15,0
+1,3,Display,73,7,0,2844,0
+1,3,CaseShift,77,7,0,2848,0
+1,3,Zoom,74,7,0,2845,0
+1,3,RoleNmPref,75,7,"",2846,0
+1,1,ColmOrd,13,1,0,16,0
+1,3,Width,70,7,10,2841,0
+1,1,PK Indexes Sequencing,16,1,1,17,0
+1,1,Zoom,9,1,0,12,0
+1,3,FK Definition Note Synchronization,80,7,1,2854,0
+1,1,FK Definition Note Synchronization,15,1,1,21,0
+1,3,Attr/Column NameSync,68,7,2,2839,0
+1,3,NameMax,66,7,0,2837,0
+
+Submodel
+DiagramId,ModelId,SubmodelId,Submodel_ID,Model_ID,SubmodelName,DescendantUpdateFlags,DefinitionId,NoteId,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,Main Model,0,0,0,22,0
+1,3,1,7,7,Main Model,0,0,0,2855,0
+
+SubmodelLink
+SubmodelLink_ID,Model_ID,Parent_ID,Child_ID,UltimateParent_ID,NodeLevel,IsBottomLevel,Global_User_ID
+
+DiagramDisplay
+DiagramId,ModelId,SubmodelId,DiagramDisplay_ID,Submodel_ID,PlatformId,Animate,ZoomFactor,HviewSize,VviewSize,HorizontalScrollPosition,VerticalScrollPosition,PageOrientation,PageSize,DisplayFormat,EntityDisplayInfo,ViewDisplayFormat,ViewDisplayInfo,Shadow,CompleteRoleName,ShowVerbs,ShowCardinality,MethodologyId,StraightRelLine,PageBoundary,ShowViewRelationship,ShowView,HideTrigger,Global_User_ID,Row_Time_Stamp,ShowSchemaObjEdge,ShowSchemaObj,SchemaObjDisplayFormat,ShowRelationshipName,ShowLogicalRelationshipName,ShowTriggerLabel,ShowShape,ShowShapeEdge,ShowShapeName,ShowShapeEdgeName,ShowShapeEdgeVerbs,TransformationDisplayFormat
+1,1,1,1,1,0,0,8351,0,0,-336,1126,1,1,8,3264,1,0,1,0,1,1,0,0,0,0,0,1,23,0,1,6,7,0,0,0,0,0,1,0,1,10
+1,3,1,7,7,0,0,8350,0,0,-335,1201,1,1,9,3264,1,0,1,0,1,1,0,0,0,0,0,1,2856,0,1,6,7,0,0,0,0,0,1,0,1,10
+
+GridDisplay
+DiagramId,ModelId,SubmodelId,GridDisplay_ID,Submodel_ID,Show,Snap,HorizontalSpacing,VerticalSpacing,HorizontalGridsPerLine,VericalGridsPerLine,Units,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,0,0,2500,2500,1,1,0,24,0
+1,3,1,7,7,0,0,2500,2500,1,1,0,2857,0
+
+Graph_Geometry
+Graph_Geometry_ID,Submodel_ID,Undirected,ProportionalLeftSpacing,ProportionalRightSpacing,ProportionalBottomSpacing,ProportionalTopSpacing,ConstantLeftSpacing,ConstantRightSpacing,ConstantBottomSpacing,ConstantTopSpacing,LayoutStyle,HasCircularLayout,HasHierarchicalLayout,HasOrthogonalLayout,HasSymmetricLayout,HasTreeLayout,Global_User_ID
+1,1,0,0,0,0,0,20,20,20,20,1,0,0,0,0,0,296
+5,7,0,0,0,0,0,20,20,20,20,1,0,0,0,0,0,3212
+
+Disconnected_Nodes_Layout
+Disconnected_Nodes_Layout_ID,Submodel_ID,Detect,ProportionalRowSpacing,ProportionalColumnSpacing,ConstantRowSpacing,ConstantColumnSpacing,LayoutStyle,PackingStyle,TilingStyle,TileByName,Stagger,StaggerBy,Global_User_ID
+1,1,1,70,70,20,20,1,0,0,1,0,12,297
+5,7,1,70,70,20,20,1,0,0,1,0,12,3213
+
+Components_Layout
+Components_Layout_ID,Submodel_ID,Detect,ProportionalRowSpacing,ProportionalColumnSpacing,ConstantRowSpacing,ConstantColumnSpacing,LayoutStyle,PackingStyle,TilingStyle,Stagger,StaggerBy,Global_User_ID
+1,1,1,70,70,20,20,0,0,1,0,12,298
+5,7,1,70,70,20,20,0,0,1,0,12,3214
+
+Circular_Layout
+Circular_Layout_ID,Submodel_ID,Degree,ClusterByGroupID,ClusterByIPAddress,ClusterByBiConnectivity,AutomateGroupIDs,MinNumberOfNodesInCluster,MaxNumberOfNodesInCluster,DisableMinNumberOfNodesInCluster,DisableMaxNumberOfNodesInCluster,ProportionalNodeSpacing,ConstantNodeSpacing,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,AccumulatedInternalGroupID,ProportionalRadialSpacing,ProportionalTangentialSpacing,ConstantRadialSpacing,ConstantTangentialSpacing,RadialAlignment,Global_User_ID
+1,1,5,1,1,1,0,4,20,0,0,500,0,0,0,0,0,600,600,0,0,0,299
+5,7,5,1,1,1,0,4,20,0,0,500,0,0,0,0,0,600,600,0,0,0,3215
+
+Hierarchical_Layout
+Hierarchical_Layout_ID,Submodel_ID,DiscardLevels,DisableMinSlopePerMil,MinSlopePerMil,KeepLevelPositionInIncrementalLayout,RespectFlowInIncrementalLayout,OrthogonalRouting,VariableLevelSpacing,HorizontalEdgeSpacing,VerticalEdgeSpacing,LevelOrientation,LevelAlignment,Quality,ConstantLevelSpacing,ProportionalLevelSpacing,ConstantNodeSpacing,ProportionalNodeSpacing,UsePorts,MergeEdgeChannels,CalculatedSize,PortSharingMaximization,ReduceCrossingsInIncrementalLayout,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,1,0,200,0,0,1,1,12,12,3,0,1,50,0,20,100,1,0,1,1,0,0,0,0,300
+5,7,1,0,200,0,0,1,1,12,12,3,0,1,50,0,20,100,1,0,1,1,0,0,0,0,3216
+
+Orthogonal_Layout
+Orthogonal_Layout_ID,Submodel_ID,UpwardDrawing,NumberOfCompactions,HorizontalNodeSpacing,VerticalNodeSpacing,HorizontalEdgeSpacing,VerticalEdgeSpacing,UsePorts,SideOffsetPerMil,KeepNodeSizes,RespectNodePositionsInIncrementalLayout,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,0,1,20,20,60,60,0,250,0,1,0,0,0,301
+5,7,0,1,20,20,60,60,0,250,0,1,0,0,0,3217
+
+Symmetric_Layout
+Symmetric_Layout_ID,Submodel_ID,NodeSpacing,RandomSeed,RouteEdges,DegreeSpacing,PreventNodeOverlaping,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,75,1,0,1,0,0,0,0,302
+5,7,75,1,0,1,0,0,0,0,3218
+
+Tree_Layout
+Tree_Layout_ID,Submodel_ID,RouteNonTreeEdgesWithinLevels,RouteNonTreeEdgesBetweenLevels,ConstantSiblingSpacing,ProportionalSiblingSpacing,ConstantBranchSpacing,ProportionalBranchSpacing,ConstantLevelSpacing,ProportionalLevelSpacing,HorizontalEdgeSpacing,LevelAlignment,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,1,0,40,0,0,0,40,0,12,0,0,0,0,303
+5,7,1,0,40,0,0,0,40,0,12,0,0,0,0,3219
+
+FontProperty
+PropertyId,FontProperty_ID,Description,Global_User_ID,Row_Time_Stamp
+0,0,"",0,0
+1750,5,Foreign Keys,0,0
+32801,56,Primary Key Index,0,0
+1751,6,Foreign Non-Keys,0,0
+4303,0,Relationship Name,0,0
+32803,57,Unique Indexes,0,0
+4305,0,Relationship Business Name,0,0
+35757,63,Transformation Name,0,0
+5359,1,Individual Attribute Font,0,0
+35759,69,Transformation Inputs,0,0
+5360,8,Individual View Field Font,0,0
+35761,70,Transformation Outputs,0,0
+32762,33,Indexes,0,0
+32764,37,Attachments,0,0
+1765,7,View Name,0,0
+1665,2,Entity Name,0,0
+35116,59,Data Security,0,0
+32766,35,Triggers,0,0
+1666,3,Primary Keys,0,0
+1667,4,Attributes,0,0
+1668,0,Verbs,0,0
+32768,38,Dimensional Type Label,0,0
+1669,0,Text Blocks,0,0
+1670,0,Page Number,0,0
+35771,75,Transformation Definition,0,0
+35772,76,Transformation Code,0,0
+5374,0,Schema Object,0,0
+1778,0,Title Block Font,0,0
+5432,0,Shape,0,0
+32833,58,Non-unique Indexes,0,0
+5435,50,Shape Text,0,0
+1787,9,View Fields,0,0
+
+FontDefault
+DiagramId,ModelId,SubmodelId,PropertyId,FontDefault_ID,FontProperty_ID,Submodel_ID,Face,Size,Bold,Italic,Underline,Strikeout,Escapement,Orientation,CharacterSet,OutputPrecision,ClipPrecision,Quality,Pitch,Family,Global_User_ID,Row_Time_Stamp
+1,1,1,1778,20,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,46,0
+1,1,1,32803,10,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,34,0
+1,1,1,5432,21,0,1,Arial,-12.000000,700,0,0,0,0.000000,0.000000,0,3,2,1,2,32,96,0
+1,3,1,5374,240,0,7,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2898,0
+1,1,1,5435,22,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,97,0
+1,1,1,1787,17,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,41,0
+1,3,1,32833,221,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2868,0
+1,1,1,5374,66,0,1,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,65,0
+1,3,1,32762,218,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2865,0
+1,3,1,1665,212,0,7,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2859,0
+1,3,1,35757,233,0,7,Arial,-12.000000,700,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2939,0
+1,3,1,32764,222,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2871,0
+1,3,1,1666,215,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2862,0
+1,3,1,1667,216,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2863,0
+1,3,1,35759,234,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2940,0
+1,3,1,1668,228,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2875,0
+1,3,1,32766,224,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2869,0
+1,3,1,1669,229,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2878,0
+1,3,1,35761,235,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2941,0
+1,3,1,32768,217,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2870,0
+1,3,1,1670,211,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2858,0
+1,1,1,32833,11,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,35,0
+1,3,1,4303,238,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2876,0
+1,1,1,32762,8,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,32,0
+1,3,1,4305,239,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2877,0
+1,3,1,1750,213,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2860,0
+1,1,1,1665,2,0,1,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,26,0
+1,3,1,1751,214,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2861,0
+1,1,1,35757,23,0,1,Arial,-12.000000,700,0,0,0,0.000000,0.000000,0,3,2,1,2,32,106,0
+1,1,1,32764,12,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,38,0
+1,1,1,1666,5,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,29,0
+1,1,1,1667,6,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,30,0
+1,3,1,35771,236,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2942,0
+1,1,1,35759,24,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,107,0
+1,1,1,1668,18,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,42,0
+1,1,1,32766,14,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,36,0
+1,3,1,35772,237,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2943,0
+1,1,1,1669,19,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,45,0
+1,3,1,35116,223,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2872,0
+1,1,1,35761,25,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,108,0
+1,1,1,32768,7,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,37,0
+1,1,1,1670,1,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,25,0
+1,1,1,4303,64,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,43,0
+1,1,1,4305,65,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,44,0
+1,1,1,1750,3,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,27,0
+1,1,1,1751,4,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,28,0
+1,3,1,1765,226,0,7,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2873,0
+1,1,1,35771,26,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,109,0
+1,1,1,35772,27,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,110,0
+1,1,1,35116,13,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,39,0
+1,3,1,32801,219,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2866,0
+1,1,1,1765,16,0,1,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,40,0
+1,3,1,1778,230,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2879,0
+1,3,1,32803,220,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2867,0
+1,3,1,5432,231,0,7,Arial,-12.000000,700,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2929,0
+1,3,1,5435,232,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2930,0
+1,3,1,1787,227,0,7,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,2874,0
+1,1,1,32801,9,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,33,0
+
+ColorProperty
+PropertyId,ColorProperty_ID,Description,Global_User_ID,Row_Time_Stamp
+5372,30,Schema Object Background,0,0
+0,0,"",0,0
+5373,0,Schema Object Title,0,0
+5375,31,Schema Object Relationship,0,0
+35773,74,Transformation Code,0,0
+35774,73,Transformation Definition,0,0
+1775,0,Title Block Background,0,0
+1776,0,Title Block Border,0,0
+5449,46,Shape Foreground,0,0
+1777,0,Title Block Text Color,0,0
+5450,47,Shape Background,0,0
+1786,22,View Field Text,0,0
+35724,65,Data Stream,0,0
+32802,53,Primary Key Index,0,0
+35115,60,Data Security,0,0
+5335,12,Entity Foreground,0,0
+5336,13,Entity Background,0,0
+5337,11,Entity Title,0,0
+5338,17,Inherited Primary Keys,0,0
+5339,15,Non-Inherited Primary Keys,0,0
+5340,18,Inherited Non-Keys,0,0
+5341,16,Non-Inherited Non-Keys,0,0
+5342,24,Relationships,0,0
+5343,19,View Foreground,0,0
+5344,20,View Background,0,0
+5345,23,View Title,0,0
+1741,0,Page Foreground,0,0
+1742,0,Page Number,0,0
+5347,26,View Relationships,0,0
+1743,0,Off Page Foreground,0,0
+1744,0,Off Page Background,0,0
+1676,0,Diagram Background,0,0
+1748,0,Verb Text,0,0
+1749,0,Text Block Border,0,0
+1682,0,Shadow,0,0
+1683,0,Text Background,0,0
+32759,45,Dimensional Type Label,0,0
+1684,0,Text Foreground,0,0
+32763,40,Indexes,0,0
+32832,54,Unique Indexes,0,0
+5361,25,Supertypes,0,0
+32765,44,Attachments,0,0
+5362,10,Individual Attribute Color,0,0
+35758,68,Transformation Name,0,0
+32834,55,Non-unique Indexes,0,0
+5363,21,Individual View Field Color,0,0
+5431,0,Shape Title,0,0
+35760,71,Transformation Inputs,0,0
+35762,72,Transformation Outputs,0,0
+5434,52,Line,0,0
+35763,66,Transformation Background,0,0
+35764,67,Transformation Foreground,0,0
+5436,51,Shape Text,0,0
+5371,29,Schema Object Foreground,0,0
+
+ColorDefault
+DiagramId,ModelId,SubmodelId,PropertyId,ColorDefault_ID,ColorProperty_ID,Submodel_ID,Red,Green,Blue,Global_User_ID,Row_Time_Stamp
+1,1,1,1749,38,0,1,0,0,0,89,0
+1,3,1,5371,446,0,7,0,0,0,2899,0
+1,1,1,35773,51,0,1,0,0,0,104,0
+1,3,1,5372,445,0,7,255,255,255,2900,0
+1,1,1,35774,50,0,1,0,0,0,103,0
+1,3,1,5373,447,0,7,0,0,0,2901,0
+1,3,1,5375,448,0,7,0,0,0,2910,0
+1,3,1,35115,405,0,7,0,0,0,2893,0
+1,1,1,32759,12,0,1,0,0,0,61,0
+1,1,1,32763,8,0,1,0,0,0,54,0
+1,1,1,32765,13,0,1,0,0,0,59,0
+1,3,1,35758,438,0,7,0,0,0,2933,0
+1,1,1,1775,25,0,1,255,255,255,75,0
+1,3,1,35760,439,0,7,0,0,0,2934,0
+1,1,1,1776,26,0,1,0,0,0,76,0
+1,3,1,1741,424,0,7,0,0,0,2917,0
+1,1,1,5431,42,0,1,0,0,0,93,0
+1,1,1,1777,21,0,1,0,0,0,71,0
+1,3,1,35762,440,0,7,0,0,0,2935,0
+1,3,1,1742,393,0,7,0,0,0,2881,0
+1,3,1,35763,437,0,7,255,255,255,2932,0
+1,3,1,1743,419,0,7,0,0,0,2912,0
+1,3,1,35764,436,0,7,0,0,0,2931,0
+1,3,1,1744,420,0,7,128,128,128,2913,0
+1,1,1,5434,44,0,1,0,0,0,95,0
+1,1,1,5436,43,0,1,0,0,0,94,0
+1,3,1,1748,410,0,7,0,0,0,2902,0
+1,3,1,1749,429,0,7,0,0,0,2922,0
+1,1,1,1786,18,0,1,0,0,0,64,0
+1,3,1,35773,442,0,7,0,0,0,2937,0
+1,3,1,35774,441,0,7,0,0,0,2936,0
+1,1,1,5449,40,0,1,0,0,0,91,0
+1,1,1,5450,41,0,1,255,255,255,92,0
+1,3,1,32759,403,0,7,0,0,0,2894,0
+1,1,1,1676,30,0,1,128,255,255,81,0
+1,3,1,32763,399,0,7,0,0,0,2887,0
+1,3,1,32765,404,0,7,0,0,0,2892,0
+1,1,1,32802,9,0,1,0,0,0,55,0
+1,1,1,5335,34,0,1,0,0,0,85,0
+1,1,1,1682,36,0,1,64,127,127,87,0
+1,1,1,5336,35,0,1,255,255,255,86,0
+1,1,1,1683,39,0,1,255,255,255,90,0
+1,1,1,5337,3,0,1,0,0,0,49,0
+1,1,1,1684,20,0,1,0,0,0,70,0
+1,1,1,5338,4,0,1,255,0,0,50,0
+1,3,1,1775,416,0,7,255,255,255,2908,0
+1,1,1,5339,6,0,1,0,0,0,52,0
+1,3,1,1776,417,0,7,0,0,0,2909,0
+1,1,1,5340,5,0,1,0,0,255,51,0
+1,3,1,5431,433,0,7,0,0,0,2926,0
+1,3,1,1777,412,0,7,0,0,0,2904,0
+1,1,1,5341,7,0,1,0,0,0,53,0
+1,1,1,5342,22,0,1,0,0,0,72,0
+1,1,1,5343,23,0,1,0,0,0,73,0
+1,3,1,5434,435,0,7,0,0,0,2928,0
+1,1,1,5344,24,0,1,192,192,192,74,0
+1,1,1,5345,17,0,1,0,0,0,63,0
+1,3,1,5436,434,0,7,0,0,0,2927,0
+1,1,1,5347,27,0,1,0,0,0,78,0
+1,3,1,1786,409,0,7,0,0,0,2897,0
+1,1,1,35724,52,0,1,0,0,0,105,0
+1,3,1,5449,431,0,7,0,0,0,2924,0
+1,3,1,5450,432,0,7,255,255,255,2925,0
+1,1,1,32832,10,0,1,0,0,0,56,0
+1,3,1,1676,421,0,7,255,255,255,2914,0
+1,1,1,32834,11,0,1,0,0,0,57,0
+1,3,1,32802,400,0,7,0,0,0,2888,0
+1,3,1,5335,425,0,7,0,0,0,2918,0
+1,1,1,5371,102,0,1,0,0,0,66,0
+1,3,1,1682,427,0,7,127,127,127,2920,0
+1,3,1,5336,426,0,7,255,255,255,2919,0
+1,1,1,5372,101,0,1,255,255,255,67,0
+1,3,1,1683,430,0,7,255,255,255,2923,0
+1,3,1,5337,394,0,7,0,0,0,2882,0
+1,1,1,5373,103,0,1,0,0,0,68,0
+1,3,1,1684,411,0,7,0,0,0,2903,0
+1,3,1,5338,395,0,7,255,0,0,2883,0
+1,3,1,5339,397,0,7,0,0,0,2885,0
+1,1,1,5375,104,0,1,0,0,0,77,0
+1,3,1,5340,396,0,7,0,0,255,2884,0
+1,3,1,5341,398,0,7,0,0,0,2886,0
+1,3,1,5342,413,0,7,0,0,0,2905,0
+1,3,1,5343,414,0,7,0,0,0,2906,0
+1,1,1,35115,14,0,1,0,0,0,60,0
+1,3,1,5344,415,0,7,192,192,192,2907,0
+1,3,1,5345,408,0,7,0,0,0,2896,0
+1,3,1,5347,418,0,7,0,0,0,2911,0
+1,1,1,35758,47,0,1,0,0,0,100,0
+1,3,1,35724,443,0,7,0,0,0,2938,0
+1,1,1,35760,48,0,1,0,0,0,101,0
+1,1,1,1741,33,0,1,0,0,0,84,0
+1,1,1,35762,49,0,1,0,0,0,102,0
+1,1,1,1742,2,0,1,0,0,0,48,0
+1,1,1,35763,46,0,1,255,255,255,99,0
+1,1,1,1743,28,0,1,0,0,0,79,0
+1,1,1,35764,45,0,1,0,0,0,98,0
+1,1,1,1744,29,0,1,128,128,128,80,0
+1,3,1,32832,401,0,7,0,0,0,2889,0
+1,3,1,32834,402,0,7,0,0,0,2890,0
+1,1,1,1748,19,0,1,0,0,0,69,0
+
+Entity
+DiagramId,ModelId,EntityId,Entity_ID,Model_ID,EntityNameId,TableNameId,DefinitionId,NoteId,OwnerId,EntityTypeId,Flags,DataWhseSettings,NSTFlag,CompareFlags,PhysicalCompareFlags,Global_User_ID,Row_Time_Stamp
+1,3,12,121,7,36,36,0,0,0,0,0,0,0,0,0,3028,0
+1,3,13,122,7,38,38,0,0,0,0,0,0,0,0,0,3052,0
+1,3,14,123,7,40,40,0,0,0,0,0,0,0,0,0,3072,0
+1,3,17,124,7,178,178,0,0,0,0,0,0,0,0,0,3090,0
+1,3,24,125,7,179,179,0,0,0,0,0,0,0,0,0,3104,0
+1,1,1,1,1,8,8,0,0,0,0,0,0,0,0,0,116,0
+1,1,2,2,1,20,20,0,0,0,0,0,0,0,0,0,132,0
+1,1,3,3,1,22,22,0,0,0,0,0,0,0,0,0,142,0
+1,1,10,10,1,33,33,0,0,0,0,0,0,0,0,0,194,0
+1,1,11,11,1,31,31,0,0,0,0,0,0,0,0,0,199,0
+1,1,12,12,1,36,36,0,0,0,0,0,0,0,0,0,206,0
+1,1,13,13,1,38,38,0,0,0,0,0,0,0,0,0,211,0
+1,1,14,14,1,40,40,0,0,0,0,0,0,0,0,0,216,0
+1,3,1,116,7,8,8,0,0,0,0,0,0,0,0,0,2949,0
+1,1,17,17,1,178,178,0,0,0,0,0,0,0,0,0,304,0
+1,3,2,117,7,20,20,0,0,0,0,0,0,0,0,0,2968,0
+1,3,3,118,7,22,22,0,0,0,0,0,0,0,0,0,2979,0
+1,1,24,24,1,179,179,0,0,0,0,0,0,0,0,0,590,0
+1,3,10,119,7,33,33,0,0,0,0,0,0,0,0,0,2991,0
+1,3,11,120,7,31,31,0,0,0,0,0,0,0,0,0,3007,0
+
+TableStorage
+DiagramId,ModelId,EntityId,TableStorage_ID,Entity_ID,Location,FillfactorPercent,MaximumRowsPerPage,PercentFree,PercentUsed,MinimumExtents,MaximumExtents,InitialExtentSize,NextExtentSize,ExtentGrowthFactor,MinimumTransactions,MaximumTransactions,LockModeSetting,RowCount,DataGrowth,GrowthRate,GrowthType,GrowthPeriod,MaximumSize,Global_User_ID,Row_Time_Stamp
+1,3,12,121,121,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,3029,0
+1,3,13,122,122,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,3053,0
+1,3,14,123,123,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,3073,0
+1,3,17,124,124,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,3091,0
+1,3,24,125,125,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,3105,0
+1,1,1,1,1,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,117,0
+1,1,2,2,2,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,133,0
+1,1,3,3,3,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,143,0
+1,1,10,10,10,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,195,0
+1,1,11,11,11,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,200,0
+1,1,12,12,12,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,207,0
+1,1,13,13,13,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,212,0
+1,1,14,14,14,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,217,0
+1,3,1,116,116,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,2950,0
+1,1,17,17,17,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,305,0
+1,3,2,117,117,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,2969,0
+1,3,3,118,118,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,2980,0
+1,1,24,24,24,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,591,0
+1,3,10,119,119,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,2992,0
+1,3,11,120,120,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,3008,0
+
+Attribute
+DiagramId,ModelId,EntityId,AttributeId,Attribute_ID,Entity_ID,UserDatatypeId,RuleId,DomainId,DefaultId,AttributeNameId,ColumnNameId,DefinitionId,NoteId,RoleNameId,LogicalRoleNameId,DatatypeId,Nullable,Length,Scale,IdentityColumn,IdentitySeed,IdentityIncrement,SequenceNo,CheckConstraintId,DefaultTextId,ColumnNameSet,RoleNameSet,LogicalRoleNameSet,GlobalId,UserDatatype,OverrideDataBits,DefaultNameId,AverageWidth,PercentNull,Flags,UnifiedToId,NSTFlag,CompareFlags,PhysicalCompareFlags,Global_User_ID,Row_Time_Stamp
+1,3,24,10,725,125,0,0,0,0,154,154,0,0,0,0,49,0,-2,-1,N,1,1,6,0,71,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3110,0
+1,3,24,11,726,125,0,0,0,0,155,155,0,0,0,0,63,0,1,0,N,1,1,7,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3111,0
+1,3,14,9,711,123,0,0,0,0,147,147,0,0,0,0,49,0,-2,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3074,0
+1,3,24,12,721,125,0,0,0,0,156,156,0,0,0,0,103,0,-2,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3106,0
+1,3,14,10,712,123,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3075,0
+1,3,24,13,722,125,0,0,0,0,158,158,0,0,0,0,157,1,-2,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3107,0
+1,3,14,14,713,123,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3076,0
+1,1,10,1,62,10,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,336,0
+1,3,24,17,727,125,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3112,0
+1,3,14,15,714,123,0,0,0,0,10,180,0,0,180,180,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3077,0
+1,3,24,18,728,125,0,0,0,0,10,180,0,0,180,180,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3113,0
+1,3,14,16,715,123,0,0,0,0,10,182,0,0,182,182,49,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3078,0
+1,3,24,19,729,125,0,0,0,0,10,181,0,0,181,181,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3114,0
+1,1,10,6,565,10,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2320,0
+1,1,10,7,569,10,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2332,0
+1,3,10,1,679,119,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2993,0
+1,3,10,6,680,119,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2994,0
+1,3,10,7,681,119,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2995,0
+1,1,11,3,65,11,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,346,0
+1,1,1,1,1,1,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,121,0
+1,1,1,2,2,1,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,123,0
+1,1,1,3,3,1,0,0,0,0,10,12,0,0,0,0,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,124,0
+1,1,11,7,70,11,0,0,0,0,156,156,0,0,0,0,103,1,-2,-1,N,1,1,4,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,367,0
+1,1,11,8,71,11,0,0,0,0,189,189,0,0,0,0,103,1,-2,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,368,0
+1,1,11,9,72,11,0,0,0,0,109,109,0,0,0,0,63,0,-2,-1,N,1,1,7,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,369,0
+1,1,11,10,73,11,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,370,0
+1,1,11,12,559,11,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2296,0
+1,1,11,13,563,11,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2309,0
+1,1,11,14,590,11,0,0,0,0,190,190,0,0,0,0,64,0,-2,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2437,0
+1,1,1,14,31,1,0,0,0,0,10,12,0,0,12,12,49,0,-2,-1,N,0,0,7,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,239,0
+1,1,1,15,58,1,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,332,0
+1,1,1,16,59,1,0,0,0,0,102,102,0,0,0,0,63,0,-2,-1,N,1,1,4,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,333,0
+1,1,1,17,60,1,0,0,0,0,104,104,0,0,0,0,103,1,-2,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,334,0
+1,1,1,18,61,1,0,0,0,0,105,105,0,0,0,0,103,1,-2,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0
+1,3,11,3,682,120,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3009,0
+1,1,1,21,449,1,0,0,0,0,166,166,0,0,0,0,103,0,-2,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2176,0
+1,3,1,1,664,116,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2951,0
+1,1,1,22,450,1,0,0,0,0,167,167,0,0,0,0,103,0,-2,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2177,0
+1,3,1,2,665,116,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,121,0,0,0,0,0,0,2952,0
+1,3,1,3,666,116,0,0,0,0,10,12,0,0,0,0,49,0,-2,-1,N,0,0,2,0,0,1,0,1,0,0,0,0,0,0,0,14,0,0,0,2953,0
+1,3,11,7,683,120,0,0,0,0,156,156,0,0,0,0,103,1,-2,-1,N,1,1,4,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3010,0
+1,3,11,8,684,120,0,0,0,0,189,189,0,0,0,0,103,1,-2,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3011,0
+1,3,11,9,685,120,0,0,0,0,109,109,0,0,0,0,63,0,1,0,N,1,1,7,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3012,0
+1,3,11,10,686,120,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,256,0,0,0,0,0,0,3013,0
+1,3,11,12,687,120,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3014,0
+1,3,11,13,689,120,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3016,0
+1,1,17,1,53,17,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,309,0
+1,3,11,14,688,120,0,0,0,0,190,190,0,0,0,0,64,0,-2,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3015,0
+1,1,17,2,54,17,0,0,0,0,11,11,0,0,0,0,50,0,60,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,311,0
+1,1,12,1,41,12,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,280,0
+1,1,17,3,587,17,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2427,0
+1,1,12,2,42,12,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,281,0
+1,1,2,1,11,2,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,137,0
+1,3,1,14,673,116,0,0,0,0,10,12,0,0,12,12,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2960,0
+1,1,12,3,43,12,0,0,0,0,65,65,0,0,0,0,50,0,30,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,282,0
+1,3,1,15,667,116,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,4,0,0,1,0,0,0,0,0,0,256,0,0,0,0,0,0,2954,0
+1,1,2,3,13,2,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,141,0
+1,3,1,16,668,116,0,0,0,0,102,102,0,0,0,0,63,0,1,0,N,1,1,5,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2955,0
+1,1,17,6,596,17,0,0,0,0,10,186,0,0,186,186,49,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2445,0
+1,1,12,5,45,12,0,0,0,0,68,68,0,0,0,0,67,0,-2,-1,N,1,1,7,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,284,0
+1,3,1,17,669,116,0,0,0,0,104,104,0,0,0,0,103,1,-2,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2956,0
+1,1,17,7,597,17,0,0,0,0,10,187,0,0,187,187,49,0,-2,-1,N,0,0,5,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2449,0
+1,1,12,6,46,12,0,0,0,0,69,69,0,0,0,0,50,1,30,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,285,0
+1,3,1,18,670,116,0,0,0,0,105,105,0,0,0,0,103,1,-2,-1,N,1,1,7,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2957,0
+1,3,1,21,671,116,0,0,0,0,166,166,0,0,0,0,103,0,-2,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2958,0
+1,3,1,22,672,116,0,0,0,0,167,167,0,0,0,0,103,0,-2,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2959,0
+1,1,12,11,51,12,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,10,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,290,0
+1,1,12,12,52,12,0,0,0,0,10,12,0,0,12,12,49,0,-2,-1,N,0,0,15,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,294,0
+1,1,12,13,111,12,0,0,0,0,138,138,0,0,0,0,50,0,120,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,512,0
+1,1,12,14,115,12,0,0,0,0,142,142,0,0,0,0,9,0,1,-1,N,1,1,4,0,165,1,0,0,0,0,0,0,0,0,0,0,0,0,0,531,0
+1,1,12,15,116,12,0,0,0,0,143,143,0,0,0,0,50,1,15,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,532,0
+1,1,12,16,591,12,0,0,0,0,70,70,0,0,0,0,50,0,30,-1,N,1,1,11,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2438,0
+1,1,12,17,592,12,0,0,0,0,72,72,0,0,0,0,49,0,-2,-1,N,1,1,12,0,71,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2439,0
+1,1,12,18,593,12,0,0,0,0,117,117,0,0,0,0,9,1,2,-1,N,1,1,13,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2440,0
+1,1,12,19,594,12,0,0,0,0,13,13,0,0,0,0,9,1,1,-1,N,1,1,14,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2441,0
+1,3,17,1,716,124,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3092,0
+1,1,12,20,595,12,0,0,0,0,191,191,0,0,0,0,50,1,120,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2442,0
+1,3,17,2,717,124,0,0,0,0,11,11,0,0,0,0,50,0,60,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,61,0,0,0,0,0,0,3093,0
+1,3,12,1,690,121,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3030,0
+1,3,17,3,718,124,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3094,0
+1,3,12,2,691,121,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,121,0,0,0,0,0,0,3031,0
+1,3,2,1,674,117,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2970,0
+1,3,12,3,692,121,0,0,0,0,65,65,0,0,0,0,50,0,30,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,31,0,0,0,0,0,0,3032,0
+1,3,2,3,675,117,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,121,0,0,0,0,0,0,2971,0
+1,3,17,6,719,124,0,0,0,0,10,186,0,0,186,186,49,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3095,0
+1,3,12,5,693,121,0,0,0,0,68,68,0,0,0,0,67,0,-2,-1,N,1,1,7,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3033,0
+1,3,17,7,720,124,0,0,0,0,10,187,0,0,187,187,49,0,-2,-1,N,0,0,5,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3096,0
+1,3,12,6,694,121,0,0,0,0,69,69,0,0,0,0,50,1,30,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,31,0,0,0,0,0,0,3034,0
+1,3,12,11,695,121,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,10,0,0,1,0,0,0,0,0,0,256,0,0,0,0,0,0,3035,0
+1,3,12,12,704,121,0,0,0,0,10,12,0,0,12,12,49,0,-2,-1,N,0,0,15,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3044,0
+1,3,12,13,696,121,0,0,0,0,138,138,0,0,0,0,50,0,120,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,121,0,0,0,0,0,0,3036,0
+1,3,12,14,697,121,0,0,0,0,142,142,0,0,0,0,9,0,1,-1,N,1,1,4,0,165,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3037,0
+1,3,12,15,698,121,0,0,0,0,143,143,0,0,0,0,50,1,15,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,16,0,0,0,0,0,0,3038,0
+1,1,3,1,14,3,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0
+1,3,12,16,699,121,0,0,0,0,70,70,0,0,0,0,50,0,30,-1,N,1,1,11,0,0,1,0,0,0,0,0,0,31,0,0,0,0,0,0,3039,0
+1,3,12,17,700,121,0,0,0,0,72,72,0,0,0,0,49,0,-2,-1,N,1,1,12,0,71,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3040,0
+1,1,3,3,16,3,0,0,0,0,11,20,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,151,0
+1,3,12,18,701,121,0,0,0,0,117,117,0,0,0,0,9,1,2,-1,N,1,1,13,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3041,0
+1,1,3,4,30,3,0,0,0,0,10,48,0,0,48,48,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,235,0
+1,3,12,19,702,121,0,0,0,0,13,13,0,0,0,0,9,1,1,-1,N,1,1,14,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3042,0
+1,1,13,7,81,13,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,400,0
+1,3,12,20,703,121,0,0,0,0,191,191,0,0,0,0,50,1,120,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,121,0,0,0,0,0,0,3043,0
+1,1,13,14,88,13,0,0,0,0,112,112,0,0,0,0,9,1,10,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,426,0
+1,1,13,15,89,13,0,0,0,0,114,114,0,0,0,0,63,0,-2,-1,N,1,1,5,0,113,1,0,0,0,0,0,0,0,0,0,0,0,0,0,427,0
+1,1,13,19,574,13,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2366,0
+1,1,13,20,575,13,0,0,0,0,10,176,0,0,176,176,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2370,0
+1,1,13,21,576,13,0,0,0,0,10,177,0,0,177,177,49,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2374,0
+1,3,3,1,676,118,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2981,0
+1,3,3,3,677,118,0,0,0,0,11,20,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,1,0,0,0,0,121,0,0,0,0,0,0,2982,0
+1,3,3,4,678,118,0,0,0,0,10,48,0,0,48,48,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2983,0
+1,3,13,7,705,122,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3054,0
+1,3,13,14,706,122,0,0,0,0,112,112,0,0,0,0,103,0,-2,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3055,0
+1,3,13,15,707,122,0,0,0,0,114,114,0,0,0,0,63,0,1,0,N,1,1,5,0,113,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3056,0
+1,1,24,8,138,24,0,0,0,0,152,152,0,0,0,0,63,0,-2,-1,N,1,1,4,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,618,0
+1,3,13,19,708,122,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3057,0
+1,1,24,9,139,24,0,0,0,0,147,153,0,0,0,0,49,0,-2,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,619,0
+1,3,13,20,709,122,0,0,0,0,10,176,0,0,176,176,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3058,0
+1,1,24,10,140,24,0,0,0,0,154,154,0,0,0,0,49,0,-2,-1,N,1,1,6,0,71,1,0,0,0,0,0,0,0,0,0,0,0,0,0,620,0
+1,3,13,21,710,122,0,0,0,0,10,177,0,0,177,177,49,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,3059,0
+1,1,24,11,141,24,0,0,0,0,155,155,0,0,0,0,63,0,-2,-1,N,1,1,7,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,621,0
+1,1,14,9,126,14,0,0,0,0,147,147,0,0,0,0,49,0,-2,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,562,0
+1,1,24,12,142,24,0,0,0,0,156,156,0,0,0,0,103,0,-2,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,622,0
+1,1,14,10,125,14,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,561,0
+1,1,24,13,143,24,0,0,0,0,158,158,0,0,0,0,157,1,-2,0,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,623,0
+1,1,14,14,580,14,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2386,0
+1,1,24,17,577,24,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2376,0
+1,1,14,15,581,14,0,0,0,0,10,180,0,0,180,180,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2389,0
+1,1,24,18,578,24,0,0,0,0,10,180,0,0,180,180,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2380,0
+1,1,14,16,582,14,0,0,0,0,10,182,0,0,182,182,49,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2393,0
+1,1,24,19,579,24,0,0,0,0,10,181,0,0,181,181,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2384,0
+1,3,24,8,723,125,0,0,0,0,152,152,0,0,0,0,63,0,1,0,N,1,1,4,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,3108,0
+1,3,24,9,724,125,0,0,0,0,147,153,0,0,0,0,49,0,-2,-1,N,1,1,5,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,3109,0
+
+PrimaryKey
+DiagramId,ModelId,EntityId,AttributeId,PrimaryKey_ID,Attribute_ID,SequenceNo,Global_User_ID,Row_Time_Stamp
+1,1,11,12,181,559,1,0,0
+1,3,12,1,192,690,1,0,0
+1,3,3,1,189,676,1,0,0
+1,1,1,1,1,1,1,0,0
+1,1,10,6,185,565,1,0,0
+1,1,13,7,22,81,1,0,0
+1,3,24,17,196,727,1,0,0
+1,3,17,1,195,716,1,0,0
+1,3,2,1,188,674,1,0,0
+1,1,12,1,9,41,1,0,0
+1,1,3,1,3,14,1,0,0
+1,3,14,10,194,712,1,0,0
+1,3,11,12,191,687,1,0,0
+1,1,24,17,186,577,1,0,0
+1,3,1,1,187,664,1,0,0
+1,1,17,1,14,53,1,0,0
+1,3,10,6,190,680,1,0,0
+1,3,13,7,193,705,1,0,0
+1,1,2,1,2,11,1,0,0
+1,1,14,10,39,125,1,0,0
+
+Indexes
+DiagramId,ModelId,EntityId,IndexId,Indexes_ID,Entity_ID,IsUniqueId,IndexTypeId,KeyType,HashSize,HashSizeTypeId,IgnoreDupKeyId,DupRowId,NoSortId,SortOrderingId,IndexNameId,Flags,NSTFlag,CompareFlags,Global_User_ID,Row_Time_Stamp
+1,1,3,1,3,3,7,0,P,0,0,0,0,0,0,83,0,0,0,144,0
+1,3,2,1,142,117,7,0,P,0,0,0,0,0,0,82,0,0,0,2972,0
+1,3,17,1,153,124,7,0,P,0,0,0,0,0,0,100,0,0,0,3097,0
+1,1,13,1,13,13,7,0,P,0,0,0,0,0,0,92,0,0,0,213,0
+1,3,12,1,148,121,7,0,P,0,0,0,0,0,0,91,0,0,0,3045,0
+1,1,13,2,110,13,7,0,A,0,0,0,0,0,0,184,0,0,0,2400,0
+1,3,12,3,159,121,0,0,I,0,0,0,0,0,0,197,0,0,0,3179,0
+1,3,17,5,165,124,0,0,I,0,0,0,0,0,0,203,0,0,0,3197,0
+1,3,17,6,166,124,0,0,I,0,0,0,0,0,0,204,0,0,0,3200,0
+1,3,17,7,167,124,0,0,I,0,0,0,0,0,0,205,0,0,0,3203,0
+1,1,10,1,10,10,7,0,P,0,0,0,0,0,0,89,0,0,0,196,0
+1,3,24,1,154,125,7,0,P,0,0,0,0,0,0,159,0,0,0,3115,0
+1,3,14,1,151,123,7,0,P,0,0,0,0,0,0,93,0,0,0,3079,0
+1,1,10,2,107,10,7,0,A,0,0,0,0,0,0,175,0,0,0,2338,0
+1,3,14,2,152,123,7,0,A,0,0,0,0,0,0,185,0,0,0,3082,0
+1,3,24,5,168,125,0,0,I,0,0,0,0,0,0,206,0,0,0,3206,0
+1,3,14,5,163,123,0,0,I,0,0,0,0,0,0,201,0,0,0,3191,0
+1,3,24,6,169,125,0,0,I,0,0,0,0,0,0,207,0,0,0,3209,0
+1,3,14,6,164,123,0,0,I,0,0,0,0,0,0,202,0,0,0,3194,0
+1,3,11,1,146,120,7,0,P,0,0,0,0,0,0,90,0,0,0,3017,0
+1,1,2,1,2,2,7,0,P,0,0,0,0,0,0,82,0,0,0,134,0
+1,3,1,1,141,116,7,0,P,0,0,0,0,0,0,81,0,0,0,2961,0
+1,1,17,1,17,17,7,0,P,0,0,0,0,0,0,100,0,0,0,306,0
+1,1,12,1,12,12,7,0,P,0,0,0,0,0,0,91,0,0,0,208,0
+1,3,11,2,147,120,7,0,A,0,0,0,0,0,0,174,0,0,0,3020,0
+1,3,1,3,155,116,0,0,I,0,0,0,0,0,0,193,0,0,0,3167,0
+1,3,11,4,158,120,0,0,I,0,0,0,0,0,0,196,0,0,0,3176,0
+1,3,3,1,143,118,7,0,P,0,0,0,0,0,0,83,0,0,0,2984,0
+1,1,24,1,24,24,7,0,P,0,0,0,0,0,0,159,0,0,0,592,0
+1,1,14,1,14,14,7,0,P,0,0,0,0,0,0,93,0,0,0,218,0
+1,3,13,1,149,122,7,0,P,0,0,0,0,0,0,92,0,0,0,3060,0
+1,1,14,2,111,14,7,0,A,0,0,0,0,0,0,185,0,0,0,2406,0
+1,3,13,2,150,122,7,0,A,0,0,0,0,0,0,184,0,0,0,3063,0
+1,3,3,3,156,118,0,0,I,0,0,0,0,0,0,194,0,0,0,3170,0
+1,3,13,6,160,122,0,0,I,0,0,0,0,0,0,198,0,0,0,3182,0
+1,3,13,7,161,122,0,0,I,0,0,0,0,0,0,199,0,0,0,3185,0
+1,3,13,8,162,122,0,0,I,0,0,0,0,0,0,200,0,0,0,3188,0
+1,1,11,1,11,11,7,0,P,0,0,0,0,0,0,90,0,0,0,201,0
+1,3,10,1,144,119,7,0,P,0,0,0,0,0,0,89,0,0,0,2996,0
+1,1,1,1,1,1,7,0,P,0,0,0,0,0,0,81,0,0,0,118,0
+1,1,11,2,106,11,7,0,A,0,0,0,0,0,0,174,0,0,0,2311,0
+1,3,10,2,145,119,7,0,A,0,0,0,0,0,0,175,0,0,0,2999,0
+1,3,10,4,157,119,0,0,I,0,0,0,0,0,0,195,0,0,0,3173,0
+
+IndexStorage
+DiagramId,ModelId,EntityId,IndexId,IndexStorage_ID,Indexes_ID,Location,FillfactorPercent,MaximumRowsPerPage,PercentFree,PercentUsed,MinimumExtents,MaximumExtents,InitialExtentSize,NextExtentSize,ExtentGrowthFactor,MinimumTransactions,MaximumTransactions,LockModeSetting,Global_User_ID,Row_Time_Stamp
+1,1,3,1,3,3,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",145,0
+1,3,2,1,142,142,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",2973,0
+1,3,17,1,153,153,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3098,0
+1,1,13,1,13,13,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",214,0
+1,3,12,1,148,148,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3046,0
+1,1,13,2,110,110,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,P,2401,0
+1,3,12,3,159,159,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3180,0
+1,3,17,5,165,165,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3198,0
+1,3,17,6,166,166,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3201,0
+1,3,17,7,167,167,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3204,0
+1,1,10,1,10,10,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",197,0
+1,3,24,1,154,154,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3116,0
+1,3,14,1,151,151,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3080,0
+1,1,10,2,107,107,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,P,2339,0
+1,3,14,2,152,152,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3083,0
+1,3,24,5,168,168,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3207,0
+1,3,14,5,163,163,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3192,0
+1,3,24,6,169,169,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3210,0
+1,3,14,6,164,164,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3195,0
+1,3,11,1,146,146,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3018,0
+1,1,2,1,2,2,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",135,0
+1,3,1,1,141,141,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",2962,0
+1,1,17,1,17,17,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",307,0
+1,1,12,1,12,12,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",209,0
+1,3,11,2,147,147,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3021,0
+1,3,1,3,155,155,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3168,0
+1,3,11,4,158,158,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3177,0
+1,3,3,1,143,143,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",2985,0
+1,1,24,1,24,24,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",593,0
+1,1,14,1,14,14,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",219,0
+1,3,13,1,149,149,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3061,0
+1,1,14,2,111,111,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,P,2407,0
+1,3,13,2,150,150,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3064,0
+1,3,3,3,156,156,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3171,0
+1,3,13,6,160,160,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3183,0
+1,3,13,7,161,161,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3186,0
+1,3,13,8,162,162,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3189,0
+1,1,11,1,11,11,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",202,0
+1,3,10,1,144,144,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",2997,0
+1,1,1,1,1,1,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",119,0
+1,1,11,2,106,106,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,P,2312,0
+1,3,10,2,145,145,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3000,0
+1,3,10,4,157,157,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",3174,0
+
+IndexColumn
+DiagramId,ModelId,EntityId,IndexId,AttributeId,IndexColumn_ID,Attribute_ID,Indexes_ID,SequenceNo,SortOrdering,Global_User_ID,Row_Time_Stamp
+1,3,13,2,19,308,708,150,1,A,3065,0
+1,3,13,2,20,310,709,150,3,A,3067,0
+1,3,13,2,21,309,710,150,2,A,3066,0
+1,3,10,4,7,318,681,157,1,A,3175,0
+1,3,10,2,7,301,681,145,1,A,3001,0
+1,3,12,3,12,320,704,159,1,A,3181,0
+1,1,11,1,12,296,559,11,1,A,2835,0
+1,3,14,6,16,325,715,164,1,A,3196,0
+1,3,14,2,14,313,713,152,2,A,3085,0
+1,3,1,1,1,297,664,141,1,A,2963,0
+1,3,14,2,15,312,714,152,1,A,3084,0
+1,1,10,2,1,234,62,107,2,A,2341,0
+1,1,12,1,1,14,41,12,1,A,291,0
+1,3,11,2,3,305,682,147,2,A,3023,0
+1,3,24,5,18,329,728,168,1,A,3208,0
+1,3,17,5,3,326,718,165,1,A,3199,0
+1,3,17,1,1,314,716,153,1,A,3099,0
+1,1,13,2,19,250,574,110,1,A,2402,0
+1,3,24,1,17,315,727,154,1,A,3117,0
+1,1,13,2,20,252,575,110,3,A,2404,0
+1,1,13,2,21,251,576,110,2,A,2403,0
+1,3,17,7,7,328,720,167,1,A,3205,0
+1,1,10,2,7,233,569,107,1,A,2340,0
+1,3,13,1,7,307,705,149,1,A,3062,0
+1,3,1,3,14,316,673,155,1,A,3169,0
+1,3,11,4,13,319,689,158,1,A,3178,0
+1,3,11,2,13,304,689,147,1,A,3022,0
+1,1,14,2,14,255,580,111,2,A,2458,0
+1,3,2,1,1,298,674,142,1,A,2974,0
+1,1,1,1,1,1,1,1,1,A,122,0
+1,1,14,2,15,254,581,111,1,A,2457,0
+1,3,13,7,20,322,709,161,1,A,3187,0
+1,1,11,2,3,228,65,106,2,A,2314,0
+1,1,17,1,1,259,53,17,1,A,2454,0
+1,1,24,1,17,261,577,24,1,A,2456,0
+1,3,10,1,6,300,680,144,1,A,2998,0
+1,1,13,1,7,253,81,13,1,A,2405,0
+1,3,14,1,10,311,712,151,1,A,3081,0
+1,1,11,2,13,227,563,106,1,A,2313,0
+1,3,14,5,15,324,714,163,1,A,3193,0
+1,3,3,1,1,299,676,143,1,A,2986,0
+1,1,2,1,1,2,11,2,1,A,138,0
+1,3,3,3,4,317,678,156,1,A,3172,0
+1,3,24,6,19,330,729,169,1,A,3211,0
+1,3,17,6,6,327,719,166,1,A,3202,0
+1,1,10,1,6,241,565,10,1,A,2359,0
+1,1,14,1,10,256,125,14,1,A,2410,0
+1,3,11,1,12,303,687,146,1,A,3019,0
+1,1,3,1,1,4,14,3,1,A,148,0
+1,3,10,2,1,302,679,145,2,A,3002,0
+1,3,13,6,19,321,708,160,1,A,3184,0
+1,3,13,8,21,323,710,162,1,A,3190,0
+1,3,12,1,1,306,690,148,1,A,3047,0
+
+CheckConstraints
+DiagramId,ModelId,EntityId,CheckId,CheckConstraints_ID,Entity_ID,Attribute_ID,AttributeId,ConstraintNameId,CheckTextId,NSTFlag,Global_User_ID,Row_Time_Stamp
+
+ForeignKey
+DiagramId,ModelId,RelationshipId,ForeignKey_ID,New_Child_Entity_ID,New_Parent_Entity_ID,ParentEntityId,ChildEntityId,Parent_Index_ID,RelationshipTypeId,ParentConstraintTypeId,ParentCardinalityId,ParentCardinalityNo,ChildCardinalityId,ChildCardinalityNo,ParentOptionalityId,ChildOptionalityId,ParentInsertId,ParentUpdateId,ParentDeleteId,ChildInsertId,ChildUpdateId,ChildDeleteId,DefinitionId,InversePhraseId,VerbPhraseId,NoteId,RelationshipNameId,Flags,LogicalRelationshipNameId,NSTFlag,CompareFlags,Global_User_ID,Row_Time_Stamp
+1,3,62,203,123,122,13,14,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3152,0
+1,3,12,195,121,118,3,12,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3128,0
+1,3,63,204,123,124,17,14,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3155,0
+1,3,67,205,124,116,1,17,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3158,0
+1,3,70,206,124,121,12,17,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3161,0
+1,3,71,207,124,121,12,17,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3164,0
+1,1,51,157,11,1,1,11,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2307,0
+1,1,53,159,10,1,1,10,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2330,0
+1,1,4,4,3,2,2,3,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,233,0
+1,1,5,5,1,3,3,1,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,237,0
+1,1,57,163,13,1,1,13,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2364,0
+1,1,58,164,13,11,11,13,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2368,0
+1,1,59,165,13,10,10,13,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2372,0
+1,1,60,166,24,13,13,24,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2378,0
+1,1,61,167,24,17,17,24,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2382,0
+1,1,62,168,14,13,13,14,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2387,0
+1,1,12,12,12,3,3,12,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,292,0
+1,1,63,169,14,17,17,14,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2391,0
+1,3,51,196,120,116,1,11,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3131,0
+1,1,67,173,17,1,1,17,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2425,0
+1,3,53,197,119,116,1,10,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3134,0
+1,3,4,193,118,117,2,3,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3122,0
+1,1,70,176,17,12,12,17,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2443,0
+1,3,5,194,116,118,3,1,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3125,0
+1,1,71,177,17,12,12,17,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,2447,0
+1,3,57,198,122,116,1,13,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3137,0
+1,3,58,199,122,120,11,13,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3140,0
+1,3,59,200,122,119,10,13,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3143,0
+1,3,60,201,125,122,13,24,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3146,0
+1,3,61,202,125,124,17,24,0,41,42,0,0,44,0,43,43,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,3149,0
+
+ForeignKeyColumn
+ForeignKeyColumn_Id,DiagramId,ModelId,RelationshipId,ForeignKey_ID,SequenceNo,ParentEntityId,ParentAttributeId,ChildEntityId,ChildAttributeId,OriginalParentId,OriginalAttributeId,Global_User_ID,Row_Time_Stamp
+265,1,3,59,200,4,10,6,13,21,10,6,3144,0
+229,1,1,58,164,3,11,12,13,20,11,12,2371,0
+269,1,3,63,204,4,17,1,14,16,17,1,3156,0
+10,1,1,12,12,15,3,1,12,12,3,1,295,0
+233,1,1,62,168,3,13,7,14,15,13,7,2390,0
+241,1,1,70,176,4,12,1,17,6,12,1,2446,0
+5,1,1,5,5,7,3,1,1,14,3,1,240,0
+224,1,1,53,159,2,1,1,10,7,1,1,2333,0
+264,1,3,58,199,3,11,12,13,20,11,12,3141,0
+228,1,1,57,163,2,1,1,13,19,1,1,2367,0
+268,1,3,62,203,3,13,7,14,15,13,7,3153,0
+232,1,1,61,167,3,17,1,24,19,17,1,2385,0
+260,1,3,12,195,15,3,1,12,12,3,1,3129,0
+272,1,3,71,207,5,12,1,17,7,12,1,3165,0
+4,1,1,4,4,3,2,1,3,4,2,1,236,0
+263,1,3,57,198,2,1,1,13,19,1,1,3138,0
+259,1,3,5,194,2,3,1,1,14,3,1,3126,0
+219,1,1,51,157,2,1,1,11,13,1,1,2310,0
+267,1,3,61,202,3,17,1,24,19,17,1,3150,0
+231,1,1,60,166,2,13,7,24,18,13,7,2381,0
+262,1,3,53,197,2,1,1,10,7,1,1,3135,0
+271,1,3,70,206,4,12,1,17,6,12,1,3162,0
+258,1,3,4,193,3,2,1,3,4,2,1,3123,0
+266,1,3,60,201,2,13,7,24,18,13,7,3147,0
+230,1,1,59,165,4,10,6,13,21,10,6,2375,0
+234,1,1,63,169,4,17,1,14,16,17,1,2394,0
+270,1,3,67,205,3,1,1,17,3,1,1,3159,0
+238,1,1,67,173,3,1,1,17,3,1,1,2428,0
+261,1,3,51,196,2,1,1,11,13,1,1,3132,0
+242,1,1,71,177,5,12,1,17,7,12,1,2450,0
+
+Supertype
+DiagramId,ModelId,SupertypeId,Supertype_ID,Entity_ID,EntityId,Type,Discriminator,CompareFlags,Global_User_ID,Row_Time_Stamp
+
+Subtype
+DiagramId,ModelId,SupertypeId,SubtypeId,Subtype_ID,Supertype_ID,ForeignKey_ID,EntityId,RelationshipId,Global_User_ID,Row_Time_Stamp
+
+DbView
+DbView_ID,Model_ID,Inter_Model_View_ID,NameId,Is_User_Defined,DefinitionId,NotesId,OwnerId,NSTFlag,CompareFlags,Global_User_ID,Row_Time_Stamp
+
+View_Field
+View_Field_ID,DbView_ID,Alias,Inter_Model_View_Field_ID,Column_Expression,SequenceNo,Global_User_ID,Row_Time_Stamp
+
+View_Component
+View_Component_ID,DbView_ID,Component_Type,bIsCurrent,SQL,Global_User_ID,Row_Time_Stamp
+
+View_Table
+View_Table_ID,DbView_ID,Entity_ID,Parent_View_ID,Alias,Inter_Model_View_Table_ID,Type,SequenceNo,Global_User_ID,Row_Time_Stamp
+
+Field_Column
+Field_Column_ID,View_Column_ID,View_Field_ID,Global_User_ID,Row_Time_Stamp
+
+View_Column
+View_Column_ID,View_Table_ID,Attribute_ID,Parent_View_Field_ID,Inter_Model_View_Column_ID,Global_User_ID,Row_Time_Stamp
+
+Column_Usage
+Column_Usage_ID,View_Column_ID,Usage_Type,SequenceNo,Global_User_ID,Row_Time_Stamp
+
+EntityDisplay
+DiagramId,ModelId,SubmodelId,EntityId,EntityDisplay_ID,Submodel_ID,Entity_ID,HorizontalPosition,VerticalPosition,cxEntity,cyEntity,cxEntityNode,cyEntityNode,xEntityNode,yEntityNode,DisplayBkgColor,BackgroundColor,Global_User_ID,Row_Time_Stamp
+1,3,1,13,122,7,122,128,418,132,121,0,0,0,0,0,0,3071,0
+1,3,1,14,123,7,123,467,169,133,156,0,0,0,0,0,0,3089,0
+1,3,1,17,124,7,124,468,690,119,120,0,0,0,0,0,0,3103,0
+1,1,1,1,1,1,1,135,1088,119,177,0,0,0,0,0,0,120,0
+1,3,1,24,125,7,125,280,181,111,180,0,0,0,0,0,0,3121,0
+1,1,1,2,2,1,2,346,1524,64,67,0,0,0,0,0,0,136,0
+1,1,1,3,3,1,3,336,1341,84,69,0,0,0,0,0,0,146,0
+1,1,1,10,10,1,10,253,674,139,87,0,0,0,0,0,0,198,0
+1,1,1,11,11,1,11,1,727,134,193,0,0,0,0,0,0,203,0
+1,1,1,12,12,1,12,497,1156,130,313,0,0,0,0,0,0,210,0
+1,1,1,13,13,1,13,128,418,132,121,0,0,0,0,0,0,215,0
+1,1,1,14,14,1,14,467,169,133,156,0,0,0,0,0,0,220,0
+1,1,1,17,17,1,17,468,690,119,120,0,0,0,0,0,0,308,0
+1,1,1,24,24,1,24,280,181,111,180,0,0,0,0,0,0,594,0
+1,3,1,1,116,7,116,135,1088,119,177,0,0,0,0,0,0,2967,0
+1,3,1,2,117,7,117,346,1524,64,67,0,0,0,0,0,0,2978,0
+1,3,1,3,118,7,118,336,1341,84,69,0,0,0,0,0,0,2990,0
+1,3,1,10,119,7,119,253,674,139,87,0,0,0,0,0,0,3006,0
+1,3,1,11,120,7,120,1,727,134,193,0,0,0,0,0,0,3027,0
+1,3,1,12,121,7,121,497,1156,130,313,0,0,0,0,0,0,3051,0
+
+AttributeDisplayOverride
+AttributeDisplayOverride_ID,Attribute_ID,Submodel_ID,Flags,Global_User_ID
+
+View_Display
+View_Display_ID,Submodel_ID,DbView_ID,DisplayBkgColor,View_Background_Color,Default_Horz_Position,Default_Vert_Position,cxView,cyView,cxViewNode,cyViewNode,xViewNode,yViewNode,Global_User_ID,Row_Time_Stamp
+
+Submodel_SchemaObj_Link
+Submodel_SchemaObj_Link_ID,Submodel_ID,MetaTable_ID,Table_Row_ID,cxNode,cyNode,xNode,yNode,cxNodeBackup,cyNodeBackup,xNodeBackup,yNodeBackup,Flags,Global_User_ID
+
+RelationshipDisplay
+DiagramId,ModelId,SubmodelId,RelationshipId,RelationshipDisplay_ID,ForeignKey_ID,Submodel_ID,ElbowPosition,DisplayVerbs,DisplayCardinality,PhysicalEntityId,VerbOffsetX,VerbOffsetY,InverseVerbOffsetX,InverseVerbOffsetY,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,cxName,cyName,cxLogicalName,cyLogicalName,cxVerbPhrase,cyVerbPhrase,cxInverseVerbPhrase,cyInverseVerbPhrase,NameOffsetX,NameOffsetY,LogicalNameOffsetX,LogicalNameOffsetY,NameOrientation,LogicalNameOrientation,VerbPhraseOrientation,InverseVerbPhraseOrientation,Global_User_ID,Row_Time_Stamp
+1,3,1,63,204,204,7,5000,N,N,0,0,0,0,0,3,0,32,-68,0,0,35,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3157,0
+1,3,1,67,205,205,7,5000,N,N,0,0,0,0,0,3,0,48,-96,0,0,-43,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3160,0
+1,3,1,70,206,206,7,5000,N,N,0,0,0,0,0,3,0,35,-164,0,0,43,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3163,0
+1,3,1,71,207,207,7,5000,N,N,0,0,0,0,0,3,0,-35,-164,0,0,0,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3166,0
+1,1,1,51,157,157,1,5000,N,N,0,0,0,0,0,0,0,-48,-96,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2308,0
+1,1,1,53,159,159,1,5000,N,N,0,0,0,0,0,0,0,16,-96,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2331,0
+1,1,1,4,4,4,1,5000,N,N,0,0,0,0,0,0,0,0,-41,0,0,0,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,234,0
+1,1,1,5,5,5,1,5000,N,N,0,0,0,0,0,0,0,-23,-42,0,0,0,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,0
+1,1,1,57,163,163,1,5000,N,N,0,0,0,0,0,0,0,-16,-96,0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2365,0
+1,1,1,58,164,164,1,5000,N,N,0,0,0,0,0,0,0,0,-104,0,0,-47,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2369,0
+1,1,1,59,165,165,1,5000,N,N,0,0,0,0,0,0,0,0,-51,0,0,47,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0
+1,1,1,60,166,166,1,5000,N,N,0,0,0,0,0,0,0,-35,-68,0,0,-30,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2379,0
+1,1,1,61,167,167,1,5000,N,N,0,0,0,0,0,0,0,-32,-68,0,0,30,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2383,0
+1,1,1,62,168,168,1,5000,N,N,0,0,0,0,0,0,0,35,-68,0,0,-35,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2388,0
+1,1,1,12,12,12,1,5000,N,N,0,0,0,0,0,0,0,23,-42,0,0,0,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,0
+1,1,1,63,169,169,1,5000,N,N,0,0,0,0,0,0,0,32,-68,0,0,35,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2392,0
+1,1,1,67,173,173,1,5000,N,N,0,0,0,0,0,0,0,48,-96,0,0,-43,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2426,0
+1,1,1,70,176,176,1,5000,N,N,0,0,0,0,0,0,0,35,-164,0,0,43,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2444,0
+1,1,1,71,177,177,1,5000,N,N,0,0,0,0,0,0,0,-35,-164,0,0,0,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2448,0
+1,3,1,51,196,196,7,5000,N,N,0,0,0,0,0,3,0,-48,-96,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3133,0
+1,3,1,53,197,197,7,5000,N,N,0,0,0,0,0,3,0,16,-96,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3136,0
+1,3,1,4,193,193,7,5000,N,N,0,0,0,0,0,3,0,0,-41,0,0,0,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3124,0
+1,3,1,5,194,194,7,5000,N,N,0,0,0,0,0,3,0,-23,-42,0,0,0,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3127,0
+1,3,1,57,198,198,7,5000,N,N,0,0,0,0,0,3,0,-16,-96,0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3139,0
+1,3,1,58,199,199,7,5000,N,N,0,0,0,0,0,3,0,0,-104,0,0,-47,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3142,0
+1,3,1,59,200,200,7,5000,N,N,0,0,0,0,0,3,0,0,-51,0,0,47,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3145,0
+1,3,1,60,201,201,7,5000,N,N,0,0,0,0,0,3,0,-35,-68,0,0,-30,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3148,0
+1,3,1,61,202,202,7,5000,N,N,0,0,0,0,0,3,0,-32,-68,0,0,30,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3151,0
+1,3,1,62,203,203,7,5000,N,N,0,0,0,0,0,3,0,35,-68,0,0,-35,86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3154,0
+1,3,1,12,195,195,7,5000,N,N,0,0,0,0,0,3,0,23,-42,0,0,0,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3130,0
+
+Docking_Position
+Docking_Position_ID,View_Relationship_Display_ID,Child_View_Display_ID,Parent_View_Display_ID,RelationshipDisplay_ID,Parent_Entity_Display,Child_Entity_Display,Parent_Supertype_Display,Child_Supertype_Display,Supertype_Display_ID,Docking_Type,Global_User_ID,Row_Time_Stamp
+
+Dock_Pos_Disp_Level
+Dock_Pos_Disp_Level_ID,Docking_Position_ID,Display_Level,Parent_Side,Child_Side,Parent_Relative_Position,Child_Relative_Position,Global_User_ID,Row_Time_Stamp
+
+Path_Node
+Path_Node_ID,RelationshipDisplay_ID,View_Relationship_Display_ID,SupertypeDisplay_ID,SchemaObj_Edge_ID,Shape_Edge_Display_ID,Lineage_Stream_Display_ID,X,Y,SequenceNo
+1,157,0,0,0,0,0,151,831,1
+2,157,0,0,0,0,0,73,831,2
+3,159,0,0,0,0,0,215,819,1
+4,159,0,0,0,0,0,327,819,2
+5,5,0,0,0,0,0,360,1260,1
+6,5,0,0,0,0,0,199,1260,2
+7,163,0,0,0,0,0,183,522,1
+8,163,0,0,0,0,0,199,522,2
+9,164,0,0,0,0,0,73,522,1
+10,164,0,0,0,0,0,152,522,2
+11,165,0,0,0,0,0,327,522,1
+12,165,0,0,0,0,0,246,522,2
+13,166,0,0,0,0,0,164,273,1
+14,166,0,0,0,0,0,310,273,2
+15,167,0,0,0,0,0,500,522,1
+16,167,0,0,0,0,0,526,522,2
+17,167,0,0,0,0,0,526,273,3
+18,167,0,0,0,0,0,370,273,4
+19,12,0,0,0,0,0,406,1260,1
+20,12,0,0,0,0,0,567,1260,2
+21,168,0,0,0,0,0,234,285,1
+22,168,0,0,0,0,0,503,285,2
+23,169,0,0,0,0,0,564,522,1
+24,169,0,0,0,0,0,573,522,2
+25,173,0,0,0,0,0,247,831,1
+26,173,0,0,0,0,0,489,831,2
+27,176,0,0,0,0,0,602,831,1
+28,176,0,0,0,0,0,575,831,2
+29,204,0,0,0,0,0,564,522,1
+30,204,0,0,0,0,0,573,522,2
+31,205,0,0,0,0,0,247,831,1
+32,205,0,0,0,0,0,489,831,2
+33,206,0,0,0,0,0,602,831,1
+34,206,0,0,0,0,0,575,831,2
+35,196,0,0,0,0,0,151,831,1
+36,196,0,0,0,0,0,73,831,2
+37,197,0,0,0,0,0,215,819,1
+38,197,0,0,0,0,0,327,819,2
+39,194,0,0,0,0,0,360,1260,1
+40,194,0,0,0,0,0,199,1260,2
+41,198,0,0,0,0,0,183,522,1
+42,198,0,0,0,0,0,199,522,2
+43,199,0,0,0,0,0,73,522,1
+44,199,0,0,0,0,0,152,522,2
+45,200,0,0,0,0,0,327,522,1
+46,200,0,0,0,0,0,246,522,2
+47,201,0,0,0,0,0,164,273,1
+48,201,0,0,0,0,0,310,273,2
+49,202,0,0,0,0,0,500,522,1
+50,202,0,0,0,0,0,526,522,2
+51,202,0,0,0,0,0,526,273,3
+52,202,0,0,0,0,0,370,273,4
+53,195,0,0,0,0,0,406,1260,1
+54,195,0,0,0,0,0,567,1260,2
+55,203,0,0,0,0,0,234,285,1
+56,203,0,0,0,0,0,503,285,2
+
+View_Relationship_Display
+View_Relationship_Display_ID,Entity_ID,Parent_View_ID,Submodel_ID,Child_View_ID,ElbowPosition,Inter_Model_View_Rel_Disp_ID,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,cxName,cyName,NameOffsetX,NameOffsetY,NameOrientation,Global_User_ID,Row_Time_Stamp
+
+SchemaObj_Edge
+SchemaObj_Edge_ID,Parent_Entity_Disp_ID,Parent_View_Disp_ID,Parent_SchemaObj_Link_ID,Child_SchemaObj_Link_ID,Submodel_ID,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,DockingType,Global_User_ID
+
+SupertypeDisplay
+DiagramId,ModelId,SubmodelId,SupertypeId,SupertypeDisplay_ID,Supertype_ID,Submodel_ID,EntityId,HorizontalPosition,VerticalPosition,ElbowPosition,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,xSupertypeSymbolNode,ySupertypeSymbolNode,cxSupertypeSymbolNode,cySupertypeSymbolNode,Global_User_ID,Row_Time_Stamp
+
+GraphicObject
+DiagramId,ModelId,SubmodelId,ObjectId,GraphicObject_ID,Submodel_ID,GraphicsType,LeftPosition,TopPosition,RightPosition,BottomPosition,RawData,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,Global_User_ID,Row_Time_Stamp
+
+Shape_Display
+Shape_Display_ID,Submodel_ID,Shape_ID,xNode,yNode,cxNode,cyNode,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,zOrder,IsContainer,HorizontalTextJustification,VerticalTextJustification,WrapText,FitShape,Global_User_ID
+
+Shape_Edge_Display
+Shape_Edge_Display_ID,Shape_Edge_ID,Submodel_ID,LineWidth,PenStyle,CurvatureStyle,SourceArrowHeadStyle,TargetArrowHeadStyle,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,DockingType,cxName,cyName,cxVerbPhrase,cyVerbPhrase,cxInverseVerbPhrase,cyInverseVerbPhrase,NameOffsetX,NameOffsetY,VerbOffsetX,VerbOffsetY,InverseVerbOffsetX,InverseVerbOffsetY,NameOrientation,VerbPhraseOrientation,InverseVerbPhraseOrientation,Global_User_ID
+
+Lineage_Component_Display
+Lineage_Component_Display_ID,Lineage_Component_ID,Submodel_ID,xNode,yNode,cxNode,cyNode,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,Global_User_ID
+
+Transformation_Display
+Transformation_Display_ID,Transformation_ID,Submodel_ID,xNode,yNode,cxNode,cyNode,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,Global_User_ID
+
+Lineage_Stream_Display
+Lineage_Stream_Display_ID,Lineage_Stream_ID,Submodel_ID,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,DockingType,cxName,cyName,NameOffsetX,NameOffsetY,NameOrientation,cxDescription,cyDescription,DescriptionOffsetX,DescriptionOffsetY,DescriptionOrientation,Global_User_ID
+
+SmallString
+String_Id,Data,Overflow,ConstantString,Row_Time_Stamp
+164,pk16,0,0,0
+1,Main,0,0,0
+2,Diagram specific data dictionary.,0,0,0
+165,'M',0,0,0
+3,Logical,0,0,0
+166,creado,0,0,0
+4,Main Model,0,0,0
+167,actualizado,0,0,0
+5,Data Movement Rules,0,0,0
+168,dominoAPI CI4_DD,0,0,0
+169,dominoAPI CI4.DM1,0,0,0
+7,Y,0,0,0
+8,evento,0,0,0
+171,K_ALT,0,0,0
+9,CH,0,0,0
+10,id,0,0,0
+11,nombre,0,0,0
+174,PK_ALT11,0,0,0
+12,ciudad_id,0,0,0
+175,K_ALT10,0,0,0
+13,tipo,0,0,0
+176,ronda_id,0,0,0
+177,mesa_id,0,0,0
+178,pareja,0,0,0
+179,boleta_pareja,0,0,0
+180,boleta_id,0,0,0
+181,pareja_id,0,0,0
+182,pareja_ganadora,0,0,0
+20,pais,0,0,0
+184,PK_ALT13,0,0,0
+22,ciudad,0,0,0
+185,PK_ALT14,0,0,0
+186,jugador1_id,0,0,0
+187,jugador2_id,0,0,0
+189,cierre,0,0,0
+190,dia,0,0,0
+191,ocupacion,0,0,0
+193,Ref35,0,0,0
+31,ronda,0,0,0
+194,Ref24,0,0,0
+195,Ref153,0,0,0
+33,mesa,0,0,0
+196,Ref151,0,0,0
+197,Ref312,0,0,0
+198,Ref157,0,0,0
+36,jugador,0,0,0
+199,Ref1158,0,0,0
+200,Ref1059,0,0,0
+38,boleta,0,0,0
+201,Ref1362,0,0,0
+202,Ref1763,0,0,0
+40,data,0,0,0
+203,Ref167,0,0,0
+41,N,0,0,0
+204,Ref1270,0,0,0
+42,P,0,0,0
+205,Ref1271,0,0,0
+43,M,0,0,0
+206,Ref1360,0,0,0
+44,O,0,0,0
+207,Ref1761,0,0,0
+208,DominoAPI,0,0,0
+48,pais_id,0,0,0
+49,INT,0,0,0
+50,VAR,0,0,0
+51,S,0,0,0
+54,I,0,0,0
+62,FALSE,0,0,0
+63,BIT,0,0,0
+64,SI,0,0,0
+65,nro_identidad,0,0,0
+67,D,0,0,0
+68,fecha_nacimiento,0,0,0
+69,alias,0,0,0
+70,nivel,0,0,0
+71,0,0,0,0
+72,elo,0,0,0
+74,comentario,0,0,0
+77,Dayron,0,0,0
+78,CASA,0,0,0
+79,1.0,0,0,0
+80,NameOnly,0,0,0
+81,PK1,0,0,0
+82,PK2,0,0,0
+83,PK3,0,0,0
+84,PK4,0,0,0
+85,PK5,0,0,0
+86,PK6,0,0,0
+87,PK7,0,0,0
+88,PK8,0,0,0
+89,PK10,0,0,0
+90,PK11,0,0,0
+91,PK12,0,0,0
+92,PK13,0,0,0
+93,PK14,0,0,0
+94,PK15,0,0,0
+95,PK16,0,0,0
+100,PK17,0,0,0
+101,PK18,0,0,0
+102,cerrado,0,0,0
+103,DT,0,0,0
+104,fecha_inicio,0,0,0
+105,fecha_cierre,0,0,0
+106,numero,0,0,0
+107,evento_id,0,0,0
+109,cerrada,0,0,0
+112,fecha_registro,0,0,0
+113,TRUE,0,0,0
+114,es_valida,0,0,0
+117,ranking,0,0,0
+118,28,0,0,0
+119,SDT,0,0,0
+129,cargo,0,0,0
+133,PK20,0,0,0
+134,PK21,0,0,0
+135,PK22,0,0,0
+137,medio,0,0,0
+138,correo,0,0,0
+142,sexo,0,0,0
+143,telefono,0,0,0
+147,puntos,0,0,0
+148,PK23,0,0,0
+152,salidor,0,0,0
+153,tantos,0,0,0
+154,resultado,0,0,0
+155,ganador,0,0,0
+156,inicio,0,0,0
+157,DTO,0,0,0
+158,duracion,0,0,0
+159,PK24,0,0,0
+162,Z,0,0,0
+
+LargeString
+String_Id,Data,Row_Time_Stamp
+
+StringUsage
+StringUsage_Id,UniqueObject_Id,StringUsageType_Id,String_Id,Row_Time_Stamp
+1659,2437,14,190,0
+1660,2437,15,190,0
+1,2,99,168,0
+1661,2438,14,70,0
+2,2,100,2,0
+1662,2438,15,70,0
+3,3,37,3,0
+1663,2438,62,50,0
+4,22,38,4,0
+1664,2439,14,72,0
+5,111,112,5,0
+6,111,113,5,0
+1665,2439,15,72,0
+7,116,1,8,0
+1666,2439,62,49,0
+8,116,2,8,0
+1667,2439,63,71,0
+9,121,14,10,0
+1668,2440,14,117,0
+10,123,14,11,0
+1669,2440,15,117,0
+11,124,14,10,0
+1670,2440,62,9,0
+1671,2441,14,13,0
+1672,2441,15,13,0
+1673,2441,62,9,0
+1674,2442,14,191,0
+1675,2442,15,191,0
+1676,2445,15,186,0
+18,132,1,20,0
+1677,2445,14,10,0
+19,132,2,20,0
+1678,2445,11,186,0
+20,137,14,10,0
+1679,2445,95,186,0
+21,141,14,11,0
+1680,2449,15,187,0
+22,142,1,22,0
+1681,2449,14,10,0
+23,142,2,22,0
+1682,2449,11,187,0
+24,147,14,10,0
+1683,2449,95,187,0
+25,151,14,11,0
+47,194,1,33,0
+48,194,2,33,0
+49,199,1,31,0
+50,199,2,31,0
+51,206,1,36,0
+52,206,2,36,0
+53,211,1,38,0
+54,211,2,38,0
+55,216,1,40,0
+56,216,2,40,0
+69,235,15,48,0
+70,235,14,10,0
+71,235,11,48,0
+72,235,95,48,0
+73,121,15,10,0
+74,123,15,11,0
+75,239,15,12,0
+76,239,14,10,0
+77,239,11,12,0
+78,239,95,12,0
+111,137,15,10,0
+112,141,15,11,0
+113,147,15,10,0
+114,151,15,20,0
+124,280,14,10,0
+125,280,15,10,0
+126,281,14,11,0
+127,281,15,11,0
+128,282,14,65,0
+129,282,15,65,0
+132,284,14,68,0
+133,284,15,68,0
+134,285,14,69,0
+135,285,15,69,0
+145,290,14,74,0
+146,290,15,74,0
+147,294,15,12,0
+148,294,14,10,0
+149,294,11,12,0
+150,294,95,12,0
+151,1,58,169,0
+152,1,51,169,0
+153,1,52,77,0
+154,1,53,78,0
+155,1,54,79,0
+156,1,55,78,0
+157,1,57,80,0
+158,118,39,81,0
+159,134,39,82,0
+160,144,39,83,0
+166,196,39,89,0
+167,201,39,90,0
+168,208,39,91,0
+169,213,39,92,0
+170,218,39,93,0
+173,304,1,178,0
+174,304,2,178,0
+175,309,14,10,0
+176,311,14,11,0
+187,309,15,10,0
+188,311,15,11,0
+193,306,39,100,0
+195,124,15,12,0
+196,332,14,74,0
+197,332,15,74,0
+198,333,63,62,0
+199,333,14,102,0
+200,333,15,102,0
+201,334,14,104,0
+202,334,15,104,0
+203,335,14,105,0
+204,335,15,105,0
+205,336,14,106,0
+206,336,15,106,0
+215,346,14,106,0
+216,346,15,106,0
+231,367,14,156,0
+232,367,15,156,0
+233,368,14,189,0
+234,368,15,189,0
+235,369,63,62,0
+236,369,14,109,0
+1895,2836,37,208,0
+237,369,15,109,0
+1896,2855,38,4,0
+238,370,14,74,0
+1897,2949,1,8,0
+239,370,15,74,0
+1898,2949,2,8,0
+1899,2951,15,10,0
+1900,2951,14,10,0
+1901,2952,15,11,0
+1902,2952,14,11,0
+1903,2953,15,12,0
+1904,2953,14,10,0
+1905,2954,15,74,0
+1906,2954,14,74,0
+1907,2955,63,62,0
+1908,2955,15,102,0
+1909,2955,14,102,0
+1910,2956,15,104,0
+1911,2956,14,104,0
+1912,2957,15,105,0
+1913,2957,14,105,0
+1914,2958,15,166,0
+1915,2958,14,166,0
+1916,2959,15,167,0
+1917,2959,14,167,0
+1918,2960,15,12,0
+1919,2960,14,10,0
+1920,2960,11,12,0
+1921,2960,95,12,0
+1922,2968,1,20,0
+1923,2968,2,20,0
+1924,2970,15,10,0
+1925,2970,14,10,0
+1926,2971,15,11,0
+268,400,14,10,0
+1927,2971,14,11,0
+269,400,15,10,0
+1928,2979,1,22,0
+1929,2979,2,22,0
+1930,2981,15,10,0
+1931,2981,14,10,0
+1932,2982,15,20,0
+1933,2982,14,11,0
+1934,2983,15,48,0
+1935,2983,14,10,0
+1936,2983,11,48,0
+1937,2983,95,48,0
+1938,2991,1,33,0
+833,1145,11,107,0
+1939,2991,2,33,0
+1940,2993,15,106,0
+1941,2993,14,106,0
+1942,2994,15,10,0
+1943,2994,14,10,0
+1944,2995,15,107,0
+1945,2995,14,10,0
+1946,2995,11,107,0
+1947,2995,95,107,0
+1948,2999,39,175,0
+1949,3007,1,31,0
+1950,3007,2,31,0
+1951,3009,15,106,0
+1952,3009,14,106,0
+1953,3010,15,156,0
+1954,3010,14,156,0
+296,426,14,112,0
+1955,3011,15,189,0
+297,426,15,112,0
+1956,3011,14,189,0
+298,427,63,113,0
+1957,3012,63,62,0
+299,427,14,114,0
+1958,3012,15,109,0
+300,427,15,114,0
+1959,3012,14,109,0
+1960,3013,15,74,0
+1961,3013,14,74,0
+1962,3014,15,10,0
+1963,3014,14,10,0
+1964,3015,15,190,0
+1965,3015,14,190,0
+1966,3016,15,107,0
+1967,3016,14,10,0
+1968,3016,11,107,0
+1969,3016,95,107,0
+1970,3020,39,174,0
+1971,3028,1,36,0
+1972,3028,2,36,0
+1973,3030,15,10,0
+1974,3030,14,10,0
+1975,3031,15,11,0
+1976,3031,14,11,0
+1977,3032,15,65,0
+1978,3032,14,65,0
+1979,3033,15,68,0
+1980,3033,14,68,0
+1981,3034,15,69,0
+1982,3034,14,69,0
+1983,3035,15,74,0
+1984,3035,14,74,0
+1985,3036,15,138,0
+1986,3036,14,138,0
+1987,3037,63,165,0
+1988,3037,15,142,0
+1989,3037,14,142,0
+1990,3038,15,143,0
+1991,3038,14,143,0
+1992,3039,15,70,0
+1993,3039,14,70,0
+1994,3040,63,71,0
+1995,3040,15,72,0
+1996,3040,14,72,0
+1997,3041,15,117,0
+1998,3041,14,117,0
+1999,3042,15,13,0
+2000,3042,14,13,0
+2001,3043,15,191,0
+2002,3043,14,191,0
+2003,3044,15,12,0
+2004,3044,14,10,0
+2005,3044,11,12,0
+2006,3044,95,12,0
+2007,3052,1,38,0
+2008,3052,2,38,0
+2009,3054,15,10,0
+2010,3054,14,10,0
+2011,3055,15,112,0
+2012,3055,14,112,0
+2013,3056,63,113,0
+2014,3056,15,114,0
+2015,3056,14,114,0
+2016,3057,15,107,0
+2017,3057,14,10,0
+2018,3057,11,107,0
+2019,3057,95,107,0
+2020,3058,15,176,0
+2021,3058,14,10,0
+2022,3058,11,176,0
+2023,3058,95,176,0
+2024,3059,15,177,0
+2025,3059,14,10,0
+2026,3059,11,177,0
+2027,3059,95,177,0
+2028,3063,39,184,0
+2029,3072,1,40,0
+2030,3072,2,40,0
+2031,3074,15,147,0
+2032,3074,14,147,0
+2033,3075,15,10,0
+2034,3075,14,10,0
+2035,3076,15,106,0
+2036,3076,14,106,0
+2037,3077,15,180,0
+379,512,14,138,0
+2038,3077,14,10,0
+380,512,15,138,0
+2039,3077,11,180,0
+2040,3077,95,180,0
+2041,3078,15,182,0
+2042,3078,14,10,0
+2043,3078,11,182,0
+2044,3078,95,182,0
+2045,3082,39,185,0
+2046,3090,1,178,0
+2047,3090,2,178,0
+2048,3092,15,10,0
+2049,3092,14,10,0
+2050,3093,15,11,0
+2051,3093,14,11,0
+2052,3094,15,107,0
+2053,3094,14,10,0
+395,531,63,165,0
+2054,3094,11,107,0
+396,531,14,142,0
+2055,3094,95,107,0
+397,531,15,142,0
+2056,3095,15,186,0
+398,532,14,143,0
+2057,3095,14,10,0
+399,532,15,143,0
+2058,3095,11,186,0
+2059,3095,95,186,0
+2060,3096,15,187,0
+2061,3096,14,10,0
+2062,3096,11,187,0
+2063,3096,95,187,0
+2064,3104,1,179,0
+2065,3104,2,179,0
+2066,3106,15,156,0
+2067,3106,14,156,0
+2068,3107,15,158,0
+2069,3107,14,158,0
+2070,3108,63,62,0
+2071,3108,15,152,0
+2072,3108,14,152,0
+2073,3109,15,153,0
+2074,3109,14,147,0
+1522,2176,14,166,0
+2075,3110,63,71,0
+1523,2176,15,166,0
+2076,3110,15,154,0
+1524,2177,14,167,0
+2077,3110,14,154,0
+1525,2177,15,167,0
+2078,3111,63,62,0
+2079,3111,15,155,0
+2080,3111,14,155,0
+2081,3112,15,10,0
+2082,3112,14,10,0
+2083,3113,15,180,0
+2084,3113,14,10,0
+2085,3113,11,180,0
+2086,3113,95,180,0
+2087,3114,15,181,0
+2088,3114,14,10,0
+2089,3114,11,181,0
+2090,3114,95,181,0
+432,561,14,10,0
+2091,3167,39,193,0
+433,561,15,10,0
+2092,3170,39,194,0
+434,562,14,147,0
+2093,3173,39,195,0
+435,562,15,147,0
+1541,2296,14,10,0
+2094,3176,39,196,0
+1542,2296,15,10,0
+2095,3179,39,197,0
+2096,3182,39,198,0
+2097,3185,39,199,0
+2098,3188,39,200,0
+2099,3191,39,201,0
+2100,3194,39,202,0
+2101,3197,39,203,0
+2102,3200,39,204,0
+2103,3203,39,205,0
+2104,3206,39,206,0
+2105,3209,39,207,0
+2106,2961,39,81,0
+2107,2972,39,82,0
+1555,2309,15,107,0
+2108,2984,39,83,0
+1556,2309,14,10,0
+2109,2996,39,89,0
+1557,2309,11,107,0
+2110,3017,39,90,0
+1558,2309,95,107,0
+2111,3045,39,91,0
+453,590,1,179,0
+1559,2311,39,174,0
+2112,3060,39,92,0
+454,590,2,179,0
+2113,3079,39,93,0
+2114,3097,39,100,0
+2115,3115,39,159,0
+1564,2320,14,10,0
+1565,2320,15,10,0
+1578,2332,15,107,0
+1579,2332,14,10,0
+1580,2332,11,107,0
+1581,2332,95,107,0
+1586,2338,39,175,0
+483,618,63,62,0
+484,618,14,152,0
+485,618,15,152,0
+486,619,14,147,0
+487,619,15,153,0
+488,620,63,71,0
+489,620,14,154,0
+490,620,15,154,0
+491,621,63,62,0
+492,621,14,155,0
+1598,2366,15,107,0
+493,621,15,155,0
+1599,2366,14,10,0
+494,622,14,156,0
+1600,2366,11,107,0
+495,622,15,156,0
+1601,2366,95,107,0
+496,623,14,158,0
+1602,2370,15,176,0
+497,623,15,158,0
+1603,2370,14,10,0
+498,592,39,159,0
+1604,2370,11,176,0
+1605,2370,95,176,0
+1606,2374,15,177,0
+1607,2374,14,10,0
+1608,2374,11,177,0
+1609,2374,95,177,0
+1610,2376,14,10,0
+1611,2376,15,10,0
+1612,2380,15,180,0
+1613,2380,14,10,0
+1614,2380,11,180,0
+1615,2380,95,180,0
+1616,2384,15,181,0
+1617,2384,14,10,0
+1618,2384,11,181,0
+1619,2384,95,181,0
+1620,2386,14,106,0
+1621,2386,15,106,0
+1622,2389,15,180,0
+1623,2389,14,10,0
+1624,2389,11,180,0
+1625,2389,95,180,0
+1626,2393,15,182,0
+1627,2393,14,10,0
+1628,2393,11,182,0
+1629,2393,95,182,0
+1631,2400,39,184,0
+1632,2406,39,185,0
+1647,2427,15,107,0
+1648,2427,14,10,0
+1649,2427,11,107,0
+1650,2427,95,107,0
+
+StringUsageType
+StringUsageType_Id,UsageName,Description,Global_User_ID,Row_Time_Stamp
+1,Entity Name,"",0,0
+2,Table Name,"",0,0
+3,Entity Definition,"",0,0
+4,Entity Note,"",0,0
+5,Entity Owner,"",0,0
+6,Display Label Singular,"",0,0
+7,Display Label Plural,"",0,0
+8,Row Value Expression,"",0,0
+9,Entity Type,"",0,0
+10,Unique Rolename,"",0,0
+11,Rolename,"",0,0
+12,Attribute Note,"",0,0
+13,Attribute Definition,"",0,0
+14,Attribute Name,"",0,0
+15,Column Name,"",0,0
+16,Full Rolename,"",0,0
+17,Unique Column Name,"",0,0
+18,Relationship Name,"",0,0
+19,Verb Phrase,"",0,0
+20,Inverse Phrase,"",0,0
+21,Relationship Definition,"",0,0
+22,Relationship Note,"",0,0
+23,Relationship Type,"",0,0
+24,Parent Constraint Type,"",0,0
+25,Parent Cardinality,"",0,0
+26,Child Cardinality,"",0,0
+27,Parent Optionality,"",0,0
+28,Child Optionality,"",0,0
+29,Parent Insert,"",0,0
+30,Parent Update,"",0,0
+31,Parent Delete,"",0,0
+32,Child Insert,"",0,0
+33,Child Update,"",0,0
+34,Child Delete,"",0,0
+35,Insert Child Form Type,"",0,0
+36,Update Child Form Type,"",0,0
+37,Model Name,"",0,0
+38,View Model Name,"",0,0
+39,Index Name,"",0,0
+40,Index Default Name,"",0,0
+41,Is Unique,"",0,0
+42,Index Type,"",0,0
+43,Key Type,"",0,0
+44,Hash Size Type,"",0,0
+45,Ignore Duplicate Key,"",0,0
+46,Duplicate Row,"",0,0
+47,No Sort,"",0,0
+48,Sort Ordering,"",0,0
+49,Domain Name,"",0,0
+50,Domain Column Name,"",0,0
+51,Diagram Name,"",0,0
+52,Author,"",0,0
+53,Company,"",0,0
+54,Version No,"",0,0
+55,Copyright,"",0,0
+56,Diagram Definition,"",0,0
+57,Unification Option,"",0,0
+58,File Name,"",0,0
+59,Check Constraint Name,"",0,0
+60,Check Constraint Text,"",0,0
+61,User Data Type,"",0,0
+62,Data Type Id,"",0,0
+63,Default,"",0,0
+64,Rule,"",0,0
+65,Default Name,"",0,0
+66,Rule Name,"",0,0
+67,Default Base Name,"",0,0
+68,Default Base Text,"",0,0
+69,Rule Base Name,"",0,0
+70,Rule Base Text,"",0,0
+71,Copyright Year,"",0,0
+72,View Definition,"",0,0
+73,View Name,"",0,0
+74,View Note,"",0,0
+75,View Owner,"",0,0
+76,DbTrigger Name,"",0,0
+77,DbTrigger Owner,"",0,0
+78,DbTrigger Description,"",0,0
+79,DbTrigger Value,"",0,0
+80,Proc Name,"",0,0
+81,Proc Owner,"",0,0
+82,Proc Description,"",0,0
+83,Proc Value,"",0,0
+84,DbPackage Name,"",0,0
+85,DbPackage Owner,"",0,0
+86,DbPackage Description,"",0,0
+87,DbPackage Header Value,"",0,0
+88,DbPackage Body Value,"",0,0
+89,Dictionary Trigger Name,"",0,0
+90,Dictionary Trigger Description,"",0,0
+91,Dictionary Trigger Value,"",0,0
+92,Dictionary Library Name,"",0,0
+93,Dictionary Library Description,"",0,0
+94,Dictionary Library Value,"",0,0
+95,Logical Rolename,"",0,0
+96,Reusable Procedure Name,"",0,0
+97,Reusable Procedure Description,"",0,0
+98,Reusable Procedure Value,"",0,0
+99,Data Dictionary Name,"",0,0
+100,Data Dictionary Description,"",0,0
+101,Storage Object Name,"",0,0
+102,Storage Object Owner,"",0,0
+103,Storage Object Description,"",0,0
+104,Storage Object Value,"",0,0
+105,Domain Description,"",0,0
+106,Reference Value Name,"",0,0
+107,Reference Value Description,"",0,0
+108,Reference Value Value,"",0,0
+109,Reference Value Value Description,"",0,0
+110,Reference Value Min Value,"",0,0
+111,Reference Value Max Value,"",0,0
+112,Attachment Type Name,"",0,0
+113,Attachment Type Description,"",0,0
+114,Attachment Name,"",0,0
+115,Attachment Description,"",0,0
+116,Attachment Value Default,"",0,0
+117,Bound Dictionary Object Value Override,"",0,0
+118,Domain Note,"",0,0
+119,Domain Attribute Name,"",0,0
+120,Dictionary Object Link Node Name,"",0,0
+121,Default Constraint Name,"",0,0
+122,Object Transform Name,"",0,0
+123,Object Transform Description,"",0,0
+124,Logical Relationship Name,"",0,0
+125,Shape Name,"",0,0
+126,Shape Value,"",0,0
+127,Shape Edge Name,"",0,0
+128,DatabaseRole Name,"",0,0
+129,DatabaseRole Description,"",0,0
+130,DatabaseUser Name,"",0,0
+131,DatabaseUser Description,"",0,0
+132,DatabaseUser External Name,"",0,0
+133,Naming Standards Template Name,"",0,0
+134,Naming Standards Template Description,"",0,0
+135,Naming Standards Template Data,"",0,0
+136,Shape Verb Phrase,"",0,0
+137,Shape Inverse Verb Phrase,"",0,0
+138,Attribute Attachment Override,"",0,0
+139,Domain Attachment Override,"",0,0
+140,Index Attachment Override,"",0,0
+141,Model Attachment Override,"",0,0
+142,Relationship Attachment Override,"",0,0
+143,Entity Attachment Override,"",0,0
+144,View Attachment Override,"",0,0
+145,User Data Type Attachment Override,"",0,0
+146,Rule Base Attachment Override,"",0,0
+147,Default Base Attachment Override,"",0,0
+148,Proc Attachment Override,"",0,0
+149,DbTrigger Attachment Override,"",0,0
+150,DbPackage Attachment Override,"",0,0
+151,Reference Value Attachment Override,"",0,0
+152,Shape Attachment Override,"",0,0
+153,SubModel Definition,"",0,0
+154,SubModel Note,"",0,0
+155,UDM Definition Override,"",0,0
+156,Data Lineage Transformation Name,"",0,0
+157,Data Lineage Transformation Definition,"",0,0
+158,Data Lineage Transformation Code,"",0,0
+159,Created By ID,"",0,0
+160,Last Updated By ID,"",0,0
+161,Create Timestamp ID,"",0,0
+162,Last Update Timestamp ID,"",0,0
+163,Lineage Stream Name,"",0,0
+164,Lineage Stream Description,"",0,0
+165,User Object Match Definition,"",0,0
+166,Attribute Security Override,"",0,0
+167,Model Security Override,"",0,0
+168,Entity Security Override,"",0,0
+169,View Security Override,"",0,0
+170,Data Lineage Transformation Attachment Override,"",0,0
+171,SubModel Attachment Override,"",0,0
+172,SubModel Security Override,"",0,0
+
+Object_Color_Override
+Object_Color_Override_ID,ColorProperty_ID,MetaTable_ID,Table_Row_ID,Red,Green,Blue,Global_User_ID
+
+Object_Font_Override
+Object_Font_Override_ID,FontProperty_ID,MetaTable_ID,Table_Row_ID,Face,Size,Bold,Italic,Underline,Strikeout,Escapement,Orientation,CharacterSet,OutputPrecision,ClipPrecision,Quality,Pitch,Family,Global_User_ID
+
+Layout_Algorithm
+Layout_Algorithm_ID,Name,Description,Global_User_ID,Row_Time_Stamp
+1,Force,Force-Directed Layout Algorithm,0,0
+2,Layered,Layered Layout Algorithm,0,0
+3,Circle,Circle Layout Algorithm,0,0
+4,Random,Random Layout Algorithm,0,0
+
+Data_Type
+Data_Type_ID,Name,Description,Row_Time_Stamp
+1,Integer,Integer Data Type,0
+2,Float,Floating-Point Data Type,0
+
+Layout_Property_Name
+Layout_Property_Name_ID,Name,Description,Row_Time_Stamp
+1,FORCE_ALGORITHM,Force-Directed Layout Parameter,0
+2,FORCE_FLAGS,Force-Directed Layout Parameter,0
+3,FORCE_START_V_MIN,Force-Directed Layout Parameter,0
+4,FORCE_START_V_MAX,Force-Directed Layout Parameter,0
+5,FORCE_START_V,Force-Directed Layout Parameter,0
+6,FORCE_START_H_MIN,Force-Directed Layout Parameter,0
+7,FORCE_START_H_MAX,Force-Directed Layout Parameter,0
+8,FORCE_START_H,Force-Directed Layout Parameter,0
+9,FORCE_GRAPH_H_SEP_MIN,Force-Directed Layout Parameter,0
+10,FORCE_GRAPH_H_SEP_MAX,Force-Directed Layout Parameter,0
+11,FORCE_GRAPH_H_SEP,Force-Directed Layout Parameter,0
+12,FORCE_NODE_DIST_MIN,Force-Directed Layout Parameter,0
+13,FORCE_NODE_DIST_MAX,Force-Directed Layout Parameter,0
+14,FORCE_NODE_DIST,Force-Directed Layout Parameter,0
+15,FORCE_ARG1,Force-Directed Layout Parameter,0
+16,FORCE_ARG2,Force-Directed Layout Parameter,0
+17,LAYERED_ALGORITHM,Layered Layout Parameter,0
+18,LAYERED_TECHNIQUE,Layered Layout Parameter,0
+19,LAYERED_FLAGS,Layered Layout Parameter,0
+20,LAYERED_START_V_MIN,Layered Layout Parameter,0
+21,LAYERED_START_V_MAX,Layered Layout Parameter,0
+22,LAYERED_START_V,Layered Layout Parameter,0
+23,LAYERED_STEP_V_MIN,Layered Layout Parameter,0
+24,LAYERED_STEP_V_MAX,Layered Layout Parameter,0
+25,LAYERED_STEP_V,Layered Layout Parameter,0
+26,LAYERED_START_H_MIN,Layered Layout Parameter,0
+27,LAYERED_START_H_MAX,Layered Layout Parameter,0
+28,LAYERED_START_H,Layered Layout Parameter,0
+29,LAYERED_STEP_H_MIN,Layered Layout Parameter,0
+30,LAYERED_STEP_H_MAX,Layered Layout Parameter,0
+31,LAYERED_STEP_H,Layered Layout Parameter,0
+32,LAYERED_GRAPH_H_SEP_MIN,Layered Layout Parameter,0
+33,LAYERED_GRAPH_H_SEP_MAX,Layered Layout Parameter,0
+34,LAYERED_GRAPH_H_SEP,Layered Layout Parameter,0
+35,LAYERED_ARG1_MIN,Layered Layout Parameter,0
+36,LAYERED_ARG1_MAX,Layered Layout Parameter,0
+37,LAYERED_ARG1,Layered Layout Parameter,0
+38,LAYERED_ARG2,Layered Layout Parameter,0
+39,CIRCLE_FLAGS,Circle Layout Parameter,0
+40,CIRCLE_DENSITY_MIN,Circle Layout Parameter,0
+41,CIRCLE_DENSITY_MAX,Circle Layout Parameter,0
+42,CIRCLE_DENSITY,Circle Layout Parameter,0
+43,CIRCLE_GRAPH_H_SEP_MIN,Circle Layout Parameter,0
+44,CIRCLE_GRAPH_H_SEP_MAX,Circle Layout Parameter,0
+45,CIRCLE_GRAPH_H_SEP,Circle Layout Parameter,0
+46,RANDOM_FLAGS,Random Layout Parameter,0
+47,RANDOM_MAX_H_MIN,Random Layout Parameter,0
+48,RANDOM_MAX_H_MAX,Random Layout Parameter,0
+49,RANDOM_MAX_H,Random Layout Parameter,0
+50,RANDOM_MAX_V_MIN,Random Layout Parameter,0
+51,RANDOM_MAX_V_MAX,Random Layout Parameter,0
+52,RANDOM_MAX_V,Random Layout Parameter,0
+53,RANDOM_GRAPH_H_SEP_MIN,Random Layout Parameter,0
+54,RANDOM_GRAPH_H_SEP_MAX,Random Layout Parameter,0
+55,RANDOM_GRAPH_H_SEP,Random Layout Parameter,0
+
+Submodel_Algorithm
+Submodel_Algorithm_ID,Layout_Algorithm_ID,Submodel_ID,Global_User_ID,Row_Time_Stamp
+
+Algorithm_Property
+Algorithm_Property_ID,Layout_Property_Name_ID,Data_Type_ID,Submodel_Algorithm_ID,Value,Global_User_ID,Row_Time_Stamp
+
+Identity_Value
+Identity_Value_ID,Table_Name,Column_Name,Next_Valid_Value,Global_User_ID,Row_Time_Stamp
+1,Algorithm_Property,Algorithm_Property_ID,1,0,0
+2,AppGenAttribute,AppGenAttribute_ID,1,0,0
+3,AppGenEntity,AppGenEntity_ID,1,0,0
+4,AppGenField,AppGenField_ID,1,0,0
+5,AppGenFormField,AppGenFormField_ID,1,0,0
+6,AppGenFormLink,AppGenFormLink_ID,1,0,0
+7,AppGenModel,AppGenModel_ID,1,0,0
+8,AppGenRelationship,AppGenRelationship_ID,1,0,0
+9,AppGenSearchColumn,AppGenSearchColumn_ID,1,0,0
+10,Attachment,Attachment_ID,1,0,0
+11,Attachment_Type,Attachment_Type_ID,2,0,0
+12,Attribute,Attribute_ID,730,0,0
+13,AttributeDisplayOverride,AttributeDisplayOverride_ID,1,0,0
+14,Bound_Dictionary_Object,Bound_Dictionary_Object_ID,1,0,0
+15,CheckConstraints,CheckConstraints_ID,1,0,0
+16,Circular_Layout,Circular_Layout_ID,6,0,0
+17,ColorDefault,ColorDefault_ID,451,0,0
+18,Column_Usage,Column_Usage_ID,1,0,0
+19,Components_Layout,Components_Layout_ID,6,0,0
+20,Configuration_Option,Configuration_Option_ID,1,0,0
+21,Data_Dictionary,Data_Dictionary_ID,2,0,0
+22,Data_Flow,Data_Flow_ID,1,0,0
+23,Data_Flow_Property,Data_Flow_Property_ID,1,0,0
+24,Data_Type,Data_Type_ID,1,0,0
+25,DbTrigger,DbTrigger_ID,1,0,0
+26,DbPackage,DbPackage_ID,1,0,0
+27,DbView,DbView_ID,1,0,0
+28,Delayed_Checkout,Delayed_Checkout_ID,2,0,0
+29,DF_Component,DF_Component_ID,1,0,0
+30,DF_Component_Type,DF_Component_Type_ID,1,0,0
+31,DF_IO_Record_Set,DF_IO_Record_Set_ID,1,0,0
+32,DF_IO_Property,DF_IO_Property_ID,1,0,0
+33,DF_IO_Property_Data,DF_IO_Property_Data_ID,1,0,0
+34,DF_Property,DF_Property_ID,1,0,0
+35,DF_Property_Data,DF_Property_Data_ID,1,0,0
+36,DiagramDisplay,DiagramDisplay_ID,8,0,0
+37,Dictionary_Library,Dictionary_Library_ID,1,0,0
+38,Dictionary_Object,Dictionary_Object_ID,6,0,0
+39,Dictionary_Object_Link,Dictionary_Object_Link_ID,1,0,0
+40,Dictionary_Object_Type,Dictionary_Object_Type_ID,14,0,0
+41,Dictionary_Trigger,Dictionary_Trigger_ID,1,0,0
+42,Disconnected_Nodes_Layout,Disconnected_Nodes_Layout_ID,6,0,0
+43,Dock_Pos_Disp_Level,Dock_Pos_Disp_Level_ID,1,0,0
+44,Docking_Position,Docking_Position_ID,1,0,0
+45,Entity,Entity_ID,126,0,0
+46,Entity_Size_and_Position,Entity_Size_and_Position_ID,1,0,0
+47,EntityDisplay,EntityDisplay_ID,126,0,0
+48,Field,Field_ID,1,0,0
+49,Field_Column,Field_Column_ID,1,0,0
+50,Field_Data_Type,Field_Data_Type_ID,1,0,0
+51,FontDefault,FontDefault_ID,241,0,0
+52,ForeignKey,ForeignKey_ID,208,0,0
+53,ForeignKeyColumn,ForeignKeyColumn_Id,273,0,0
+54,Graph_Geometry,Graph_Geometry_ID,6,0,0
+55,GraphicObject,GraphicObject_ID,1,0,0
+56,GridDisplay,GridDisplay_ID,8,0,0
+57,Group,Group_ID,1,0,0
+58,Group_Member,Group_Member_ID,1,0,0
+59,Group_Meta_Table,Group_Meta_Table_ID,1,0,0
+60,Group_Type,Group_Type_ID,1,0,0
+61,Hierarchical_Layout,Hierarchical_Layout_ID,6,0,0
+62,IndexColumn,IndexColumn_ID,331,0,0
+63,Indexes,Indexes_ID,170,0,0
+64,IndexStorage,IndexStorage_ID,170,0,0
+65,InterModelObjectLink,InterModelObjectLink_ID,1,0,0
+66,InterModelRelationship,InterModelRelationship_ID,1,0,0
+67,Layout_Algorithm,Layout_Algorithm_ID,1,0,0
+68,Layout_Property_Name,Layout_Property_Name_ID,1,0,0
+69,Lineage_Component,Lineage_Component_ID,1,0,0
+70,Lineage_Component_Display,Lineage_Component_Display_ID,1,0,0
+71,Lineage_Stream,Lineage_Stream_ID,1,0,0
+72,Lineage_Stream_Display,Lineage_Stream_Display_ID,1,0,0
+73,Lineage_Stream_Member,Lineage_Stream_Member_ID,1,0,0
+74,Log_File,Log_File_ID,1,0,0
+75,Machine,Machine_ID,1,0,0
+76,MetaClass,MetaClass_ID,4,0,0
+77,MetaClass_Member,MetaClass_Member_ID,109,0,0
+78,MetaTable,MetaTable_ID,63,0,0
+79,MetaTableConfiguration,MetaTableConfiguration_ID,1,0,0
+80,Model,Model_ID,8,0,0
+81,ModelOption,ModelOption_ID,82,0,0
+82,Naming_Standards_Template,Naming_Standards_Template_ID,1,0,0
+83,Object_Color_Override,Object_Color_Override_ID,1,0,0
+84,Object_Domain,Object_Domain_ID,3,0,0
+85,Object_Font_Override,Object_Font_Override_ID,1,0,0
+86,Object_Tracking,Object_Tracking_ID,1,0,0
+87,Object_Transform,Object_Transform_ID,1,0,0
+88,ObjectModification,ObjectModification_ID,1,0,0
+89,Orthogonal_Layout,Orthogonal_Layout_ID,6,0,0
+90,PasteInfo,PasteInfo_ID,1,0,0
+91,Path_Node,Path_Node_ID,57,0,0
+92,Pipeline,Pipeline_ID,1,0,0
+93,Pipeline_Member,Pipeline_Member_ID,1,0,0
+94,Pipeline_Member_Property,Pipeline_Member_Property_ID,1,0,0
+95,PrimaryKey,PrimaryKey_ID,197,0,0
+96,Proc,Proc_ID,1,0,0
+97,Project,Project_ID,1,0,0
+98,Project_Link,Project_Link_ID,1,0,0
+99,Project_Member,Project_Member_ID,1,0,0
+100,Project_Property,Project_Property_ID,1,0,0
+101,Property,Property_ID,267,0,0
+102,Property_Type,Property_Type_ID,12,0,0
+103,Property_Usage,Property_Usage_ID,116,0,0
+104,Property_Value,Property_Value_ID,303,0,0
+105,Property_Value_Usage,Property_Value_Usage_ID,116,0,0
+106,Record_Set_Type,Record_Set_Type_ID,1,0,0
+107,Rejected_Record_File,Rejected_Record_File_ID,1,0,0
+108,Referenced_Object,Referenced_Object_ID,1,0,0
+109,Reference_Value,Reference_Value_ID,1,0,0
+110,RelationshipDisplay,RelationshipDisplay_ID,208,0,0
+111,Repository_User_Info,Repository_User_Info_ID,1,0,0
+112,Reusable_Procedure,Reusable_Procedure_ID,1,0,0
+113,SchemaObj_Edge,SchemaObj_Edge_ID,1,0,0
+114,Shape,Shape_ID,1,0,0
+115,Shape_Display,Shape_Display_ID,1,0,0
+116,Shape_Edge,Shape_Edge_ID,1,0,0
+117,Shape_Edge_Display,Shape_Edge_Display_ID,1,0,0
+118,Storage_Object,Storage_Object_ID,1,0,0
+119,Submodel,Submodel_ID,8,0,0
+120,Submodel_SchemaObj_Link,Submodel_SchemaObj_Link_ID,1,0,0
+121,SubmodelLink,SubmodelLink_ID,1,0,0
+122,Submodel_Algorithm,Submodel_Algorithm_ID,1,0,0
+123,Subproject,Subproject_ID,1,0,0
+124,Subtype,Subtype_ID,16,0,0
+125,Supertype,Supertype_ID,6,0,0
+126,SupertypeDisplay,SupertypeDisplay_ID,6,0,0
+127,Symmetric_Layout,Symmetric_Layout_ID,6,0,0
+128,TableStorage,TableStorage_ID,126,0,0
+129,TaskChain,TaskChain_ID,1,0,0
+130,TaskChainComponent,TaskChainComponent_ID,1,0,0
+131,TaskChainComponentDisplay,TaskChainComponentDisplay_ID,1,0,0
+132,TaskChainDisplay,TaskChainDisplay_ID,1,0,0
+133,TaskFlow,TASkFlow_ID,1,0,0
+134,Templated_Proc,Templated_Proc_ID,1,0,0
+135,Transformation,Transformation_ID,1,0,0
+136,Transformation_Display,Transformation_Display_ID,1,0,0
+137,Transform_Member,Transform_Member_ID,1,0,0
+138,Tree_Layout,Tree_Layout_ID,6,0,0
+139,User_Object_Match,User_Object_Match_ID,1,0,0
+140,Valid_Attachment_Type,Valid_Attachment_Type_ID,5,0,0
+141,Valid_Group,Valid_Group_ID,1,0,0
+142,Valid_MetaClass,Valid_MetaClass_ID,13,0,0
+143,Valid_Property,Valid_Property_ID,316,0,0
+144,Valid_Property_Value,Valid_Property_Value_ID,377,0,0
+145,View_Column,View_Column_ID,1,0,0
+146,View_Component,View_Component_ID,1,0,0
+147,View_Display,View_Display_ID,1,0,0
+148,View_Field,View_Field_ID,1,0,0
+149,View_Relationship_Display,View_Relationship_Display_ID,1,0,0
+150,View_Table,View_Table_ID,1,0,0
+151,Database_Role,Database_Role_ID,1,0,0
+152,Database_User,Database_User_ID,1,0,0
+153,Object_Permission,Object_Permission_ID,1,0,0
+154,User_Role_Member,User_Role_Member_ID,1,0,0
+
+MetaTable
+MetaTable_ID,Owner,Name,Description,Global_User_ID,Row_Time_Stamp
+1,NULL,Entity,NULL,0,0
+2,NULL,Indexes,NULL,0,0
+3,NULL,Attribute,NULL,0,0
+4,NULL,View,NULL,0,0
+5,NULL,Procedure,NULL,0,0
+6,NULL,Trigger,NULL,0,0
+7,NULL,Package,NULL,0,0
+8,NULL,Dictionary Trigger,NULL,0,0
+9,NULL,Storage Object,NULL,0,0
+10,NULL,Model,NULL,0,0
+11,NULL,Foreign Key,NULL,0,0
+12,NULL,Diagram,NULL,0,0
+13,NULL,Submodel,NULL,0,0
+14,NULL,Supertype,NULL,0,0
+15,NULL,Templated Procedure,NULL,0,0
+16,NULL,Default,NULL,0,0
+17,NULL,Rule,NULL,0,0
+18,NULL,User Datatype,NULL,0,0
+19,NULL,Domain,NULL,0,0
+20,NULL,Reference Value,NULL,0,0
+21,NULL,Data Dictionary,NULL,0,0
+22,NULL,Entity Display,NULL,0,0
+23,NULL,View Display,NULL,0,0
+24,NULL,View Field,NULL,0,0
+25,NULL,Relationship Display,NULL,0,0
+26,NULL,View Relationship Display,NULL,0,0
+27,NULL,Supertype Display,NULL,0,0
+28,NULL,Graphic Object,NULL,0,0
+29,NULL,Sto Group,NULL,0,0
+30,NULL,Node Group,NULL,0,0
+31,NULL,Materialized View,NULL,0,0
+32,NULL,Table Space,NULL,0,0
+33,NULL,Buffer Pool,NULL,0,0
+34,NULL,Database,NULL,0,0
+35,NULL,Auxiliary Table,NULL,0,0
+36,NULL,Synonym,NULL,0,0
+37,NULL,Sequence,NULL,0,0
+38,NULL,Rollback Segment,NULL,0,0
+39,NULL,Function,NULL,0,0
+40,NULL,SchemaObj Display,NULL,0,0
+41,NULL,SchemaObj Edge,NULL,0,0
+42,NULL,Object Type,NULL,0,0
+43,NULL,Alias,NULL,0,0
+44,NULL,Summary Table,NULL,0,0
+45,NULL,Bound Dictionary Object,NULL,0,0
+46,NULL,Shape,NULL,0,0
+47,NULL,Shape Edge,NULL,0,0
+48,NULL,Shape Display,NULL,0,0
+49,NULL,Shape Edge Display,NULL,0,0
+50,NULL,View Table,NULL,0,0
+51,NULL,Referenced Object,NULL,0,0
+52,NULL,Database User,NULL,0,0
+53,NULL,Database Role,NULL,0,0
+54,NULL,Naming Standards Template,NULL,0,0
+55,NULL,User Object Match,NULL,0,0
+56,NULL,User Defined Mapping,NULL,0,0
+57,NULL,Transformers,NULL,0,0
+58,NULL,Transformation Display,NULL,0,0
+59,NULL,Object Tracking,NULL,0,0
+60,NULL,Lineage Stream Display,NULL,0,0
+61,NULL,Lineage Component Display,NULL,0,0
+62,NULL,Attribute Display Override,NULL,0,0
+
+MetaClass
+MetaClass_ID,MetaClass_Name,Description,Global_User_ID,Row_Time_Stamp
+1,Property,NULL,0,0
+2,Partition,NULL,0,0
+3,DBConnection,NULL,0,0
+
+Property
+Property_ID,Name,Description,IsSystemRequired,Global_User_ID,Row_Time_Stamp
+1,Index Scope,NULL,0,0,0
+2,Index Type,NULL,0,0,0
+3,Byte Order,NULL,0,0,0
+4,Logged,NULL,0,0,0
+5,Parallel,NULL,0,0,0
+6,Degree,NULL,0,0,0
+7,Instances,NULL,0,0,0
+8,Partition Column Name,NULL,0,0,0
+9,Column Literal,NULL,0,0,0
+10,TableSpace Name,NULL,0,0,0
+11,Percent Free,NULL,0,0,0
+12,Percent Used,NULL,0,0,0
+13,Initial Extent,NULL,0,0,0
+14,Next Extent,NULL,0,0,0
+15,Percent Increase,NULL,0,0,0
+16,Min Extents,NULL,0,0,0
+17,Max Extents,NULL,0,0,0
+18,Organization,NULL,0,0,0
+19,Pct Threshold,NULL,0,0,0
+20,Include Column Name,NULL,0,0,0
+21,Initial Trans,NULL,0,0,0
+22,Max Trans,NULL,0,0,0
+23,FreeLists,NULL,0,0,0
+24,FreeList Groups,NULL,0,0,0
+25,Buffer Pool,NULL,0,0,0
+26,Cache,NULL,0,0,0
+27,Connect String,NULL,0,0,0
+28,Linked Table,NULL,0,0,0
+29,Use Hashing,NULL,0,0,0
+30,Data Capture,NULL,0,0,0
+31,Index TableSpace,NULL,0,0,0
+32,LONG TableSpace,NULL,0,0,0
+33,View Encrypted,NULL,0,0,0
+34,View Check Option,NULL,0,0,0
+35,For Bit Data,NULL,0,0,0
+36,System Default,NULL,0,0,0
+37,Compacted,NULL,0,0,0
+38,Pre SQL,NULL,0,0,0
+39,Post SQL,NULL,0,0,0
+40,Disable Pre SQL,NULL,0,0,0
+41,Disable Post SQL,NULL,0,0,0
+42,Row GUID Column,NULL,0,0,0
+43,ERX Logical-Physical,NULL,0,0,0
+44,Group BufPool Cache,NULL,0,0,0
+45,Erase DataSet,NULL,0,0,0
+46,No Close DataSet,NULL,0,0,0
+47,Allow Concurrent Copy,NULL,0,0,0
+48,ERX Physical Definition,NULL,0,0,0
+49,Generate Column,NULL,0,0,0
+50,Identity Cache Size,NULL,0,0,0
+51,Index Storage Type,NULL,0,0,0
+52,Table Storage Type,NULL,0,0,0
+53,PCTFREE String,NULL,0,0,0
+54,Unbalanced Split,NULL,0,0,0
+55,Empty Index,NULL,0,0,0
+56,Fix Table,NULL,0,0,0
+57,Auditing,NULL,0,0,0
+58,Encoding Scheme,NULL,0,0,0
+59,Drop Restriction,NULL,0,0,0
+60,Unique Qualifier,NULL,0,0,0
+61,Index Defer,NULL,0,0,0
+62,Object ID,NULL,0,0,0
+63,Collate,NULL,0,0,0
+64,Column Label,NULL,0,0,0
+65,Column Text,NULL,0,0,0
+66,System Name,NULL,0,0,0
+67,Hide Attribute,NULL,0,0,0
+68,Show Object Owner,NULL,0,0,0
+69,HiRDB Table Storage,NULL,0,0,0
+70,HiRDB Lob Storage,NULL,0,0,0
+71,Oracle 9i char used,NULL,0,0,0
+72,Oracle 9i timezone,NULL,0,0,0
+73,Oracle 9i interval,NULL,0,0,0
+74,DDLWizard_Settings,NULL,0,0,0
+75,Pad Index,NULL,0,0,0
+76,Sort In TempDb,NULL,0,0,0
+77,MSSQL IsComputed string,NULL,0,0,0
+78,Sybase Locking Scheme,NULL,0,0,0
+79,Sybase Reserve Page Gap,NULL,0,0,0
+80,Sybase Replacement Strategy,NULL,0,0,0
+81,Sybase Prefetch Strategy,NULL,0,0,0
+82,Sybase Identity Gap,NULL,0,0,0
+83,Teradata Journal Before,NULL,0,0,0
+84,Teradata Journal After,NULL,0,0,0
+85,Teradata Journal Name,NULL,0,0,0
+86,Teradata Fallback Protection,NULL,0,0,0
+87,Oracle Index Column Function,NULL,0,0,0
+88,Oracle Partition Type,NULL,0,0,0
+89,Teradata Datablock Size,NULL,0,0,0
+90,Teradata Compression,NULL,0,0,0
+91,Teradata Format,NULL,0,0,0
+92,Teradata Title,NULL,0,0,0
+93,Oracle Object Type,NULL,0,0,0
+94,Teradata Duplicate Row Control,NULL,0,0,0
+95,Cycle,NULL,0,0,0
+96,Minvalue,NULL,0,0,0
+97,Maxvalue,NULL,0,0,0
+98,Index Owner,NULL,0,0,0
+99,Include,NULL,0,0,0
+100,Reverse Scans,NULL,0,0,0
+101,PK Constraint Name,NULL,0,0,0
+102,MySQL Table Type,NULL,0,0,0
+103,LOB Unit,NULL,0,0,0
+104,Subparition Column Name,NULL,0,0,0
+105,Default Hash Subpartition Count,NULL,0,0,0
+106,Default Hash Subpartition Tablespaces,NULL,0,0,0
+107,Subpartition Template,NULL,0,0,0
+108,Parition Hash Subpartition Count,NULL,0,0,0
+109,Parition Hash Subpartition Tablespaces,NULL,0,0,0
+110,Generate Physical Model Table Suffix,NULL,0,0,0
+111,Generate Physical Model View Prefix,NULL,0,0,0
+112,Generate Physical Model View Suffix,NULL,0,0,0
+113,Generate Physical Model Table Owner,NULL,0,0,0
+114,Generate Physical Model View Owner,NULL,0,0,0
+115,Generate Physical Model Index Owner,NULL,0,0,0
+116,Gennerate Physical Wizard Settings,NULL,0,0,0
+117,Report Wizard Settings,NULL,0,0,0
+118,Compare Merge Wizard Settings,NULL,0,0,0
+119,LOB Segment,NULL,0,0,0
+120,Unsigned,NULL,0,0,0
+121,Sort View Columns Alphabetically,NULL,0,0,0
+122,Oracle Temporary Table,NULL,0,0,0
+123,Oracle Temporary Table Type,NULL,0,0,0
+124,Teradata Index Partitioning Expression,NULL,0,0,0
+125,Model Property Tech Key Conversion,NULL,0,0,0
+126,DB Name,NULL,0,0,0
+127,DB User ID,NULL,0,0,0
+128,DB User Password,NULL,0,0,0
+129,DB Owner Name,NULL,0,0,0
+130,DB Server Name,NULL,0,0,0
+131,DB Connection String,NULL,0,0,0
+132,Table Connection Info ID,NULL,0,0,0
+133,Connection Info Count,NULL,0,0,0
+134,FFTable file name,NULL,0,0,0
+135,FFTable Encode Type,NULL,0,0,0
+136,FFTable File Format Type,NULL,0,0,0
+137,FFTable Is Single Delimited,NULL,0,0,0
+138,FFTable Escape charactor,NULL,0,0,0
+139,FFTable Column Delimiter,NULL,0,0,0
+140,FFTable Null Value,NULL,0,0,0
+141,FFTable Is Using Null Value,NULL,0,0,0
+142,FFTable Text Delimiter Type,NULL,0,0,0
+143,FFTable Row Delimiter Type,NULL,0,0,0
+144,FFTable Is First Row Column Name,NULL,0,0,0
+145,FFColumn ID,NULL,0,0,0
+146,FFColumn Is Nullable,NULL,0,0,0
+147,FFColumn Is Skip Import,NULL,0,0,0
+148,FFColumn Is Using Default Value,NULL,0,0,0
+149,FFColumn Is Using Null Replace,NULL,0,0,0
+150,FFColumn Null Value,NULL,0,0,0
+151,FFColumn Null Replace String,NULL,0,0,0
+152,FFTable Domain Name,NULL,0,0,0
+153,FFTable Machine Name,NULL,0,0,0
+154,FFTable Edited,NULL,0,0,0
+155,FFTable TruncateData,NULL,0,0,0
+156,Oracle service name,NULL,0,0,0
+157,DBMS Port Number,NULL,0,0,0
+158,FFColumn DateFormat,NULL,0,0,0
+159,JMSTable Source Name,NULL,0,0,0
+160,JMSTable Destination name,NULL,0,0,0
+161,JMSTable Destination Type,NULL,0,0,0
+162,JMSTable Selector,NULL,0,0,0
+163,JMSTable Timeout,NULL,0,0,0
+164,JMSTable Msg Ack Mode,NULL,0,0,0
+165,JMSTable Target Destination name,NULL,0,0,0
+166,JMSTable Target Destination Type,NULL,0,0,0
+167,JMSTable Target Priority,NULL,0,0,0
+168,JMSTable Target Expiretime,NULL,0,0,0
+169,JMSTable Target Persistence,NULL,0,0,0
+170,JMSTable Target Generate ID,NULL,0,0,0
+171,JMSTable Target Generate Timestamp,NULL,0,0,0
+172,JMSColumn Msg Field Name,NULL,0,0,0
+173,JMSColumn Msg Field Type,NULL,0,0,0
+174,Table Type,NULL,0,0,0
+175,JMSColumn Column Format,NULL,0,0,0
+176,JMSTable Msg Type,NULL,0,0,0
+177,JMSTable Target Msg Type,NULL,0,0,0
+178,JMSTable Target Source name,NULL,0,0,0
+179,JMSTable XMLFORMAT,NULL,0,0,0
+180,JMSTable XML WITHDTD,NULL,0,0,0
+181,Attach Local File,NULL,0,0,0
+182,XML Column Recursive,NULL,0,0,0
+183,SAP BAPI Name,NULL,0,0,0
+184,SAP User Name,NULL,0,0,0
+185,SAP Password,NULL,0,0,0
+186,SAP Server,NULL,0,0,0
+187,SAP Sysname,NULL,0,0,0
+188,SAP Client,NULL,0,0,0
+189,SAP Language,NULL,0,0,0
+190,SAP RecordBase,NULL,0,0,0
+191,SAP XML Schema,NULL,0,0,0
+192,SAP Request Schema,NULL,0,0,0
+193,SAP Response Schema,NULL,0,0,0
+194,SAP Conditions,NULL,0,0,0
+195,SAP Catalog Name List,NULL,0,0,0
+196,SAP Category Name List,NULL,0,0,0
+197,SAP Category Name,NULL,0,0,0
+198,XML Schema Type,NULL,0,0,0
+199,Datasource Alias,NULL,0,0,0
+200,FFTable Header Format,NULL,0,0,0
+201,Src Tgt Type,NULL,0,0,0
+202,Src Tgt Description,NULL,0,0,0
+203,Src Tgt Host,NULL,0,0,0
+204,Src Tgt Service,NULL,0,0,0
+205,Src Tgt Port,NULL,0,0,0
+206,Src Tgt File Path,NULL,0,0,0
+207,Src Tgt File Type,NULL,0,0,0
+208,Src Tgt File Encoding,NULL,0,0,0
+209,Src Tgt DS Frequency,NULL,0,0,0
+210,Src Tgt DS LastUpdated,NULL,0,0,0
+211,Src Tgt Enabled,NULL,0,0,0
+212,Ora Password Expire,NULL,0,0,0
+213,Ora Password Lock,NULL,0,0,0
+214,Ora User-Role Identify,NULL,0,0,0
+215,Ora User Def Tbs,NULL,0,0,0
+216,Ora User Temp Tbs,NULL,0,0,0
+217,Ora User Profile,NULL,0,0,0
+218,Ora User Quota Clause,NULL,0,0,0
+219,Column Source Direct Translation Logic,NULL,0,0,0
+220,Column Source Direct Translation Description,NULL,0,0,0
+221,Column Source Secondary Translation Logic,NULL,0,0,0
+222,Column Source Secondary Translation Description,NULL,0,0,0
+223,Column Target Direct Translation Logic,NULL,0,0,0
+224,Column Target Direct Translation Description,NULL,0,0,0
+225,Column Target Secondary Translation Logic,NULL,0,0,0
+226,Column Target Secondary Translation Description,NULL,0,0,0
+227,Submodel Synchronization Utility Settings,NULL,0,0,0
+228,Sybase Table Partition Number,NULL,0,0,0
+229,Oracle Hash Partition Count,NULL,0,0,0
+230,Oracle Hash Partition Tablespace,NULL,0,0,0
+231,SQL Server Text Image File Group,NULL,0,0,0
+232,Sybase Col Encryption Key,NULL,0,0,0
+233,Oracle Col Encryption Algorithm,NULL,0,0,0
+234,Oracle Col Encryption With SALT,NULL,0,0,0
+235,DB2 OS/390 Volatile Table,NULL,0,0,0
+236,Sybase Col Encrypted,NULL,0,0,0
+237,EntityEditor DDL Options,NULL,0,0,0
+238,DB2 OS/390 Table Partition Inclusive,NULL,0,0,0
+239,Model Validation Utility Settings,NULL,0,0,0
+240,SQL Server 2005 Collection Name,NULL,0,0,0
+241,AS400 Table System Name,NULL,0,0,0
+242,AS400 Table Label,NULL,0,0,0
+243,MSSQL Is Persisted,NULL,0,0,0
+244,XML Schema Generation Wizard Settings,NULL,0,0,0
+245,DT Mapping XML,NULL,0,0,0
+246,Naming Standards Utility Settings,NULL,0,0,0
+247,DT Mapping Name,NULL,0,0,0
+248,Teradata LOB Char Set,NULL,0,0,0
+249,DB2 UDB Partition Inclusive,NULL,0,0,0
+250,DB2 UDB Partition Column Literal,NULL,0,0,0
+251,DB2 UDB Partition Duration,NULL,0,0,0
+252,DB2 UDB Partition Duration Label,NULL,0,0,0
+253,DB2 UDB Partition Tablespace,NULL,0,0,0
+254,DB2 UDB Partition Lob Tablespace,NULL,0,0,0
+255,Column Nulls Order,NULL,0,0,0
+256,Oracle Table Compression,NULL,0,0,0
+257,Oracle Index Compression,NULL,0,0,0
+258,Oracle Index Compression Prefix_Length,NULL,0,0,0
+259,Partition Column Nulls Order,NULL,0,0,0
+260,SQL Server 2008 Col SPARSE,NULL,0,0,0
+261,Sybase IQ Index Type,NULL,0,0,0
+262,Sybase IQ Delimited By,NULL,0,0,0
+263,Sybase ID Limit,NULL,0,0,0
+264,Import New Source Settings,NULL,0,0,0
+265,CASESPECIFIC,NULL,0,0,0
+266,Oracle Table Row Movement,NULL,0,0,0
+
+Property_Type
+Property_Type_ID,Name,Description,IsSystemRequired,Global_User_ID,Row_Time_Stamp
+1,Table,NULL,0,0,0
+2,Index,NULL,0,0,0
+3,Partition,NULL,0,0,0
+4,Overflow Segment,NULL,0,0,0
+5,Database View,NULL,0,0,0
+6,Attribute,NULL,0,0,0
+7,Storage Object,NULL,0,0,0
+8,Model,NULL,0,0,0
+9,Foreign Key,NULL,0,0,0
+10,Database User,NULL,0,0,0
+11,Database Role,NULL,0,0,0
+
+Property_Value
+Property_Value_ID,Name,Description,Value,IsSystemRequired,Global_User_ID,Row_Time_Stamp
+1,Local,NULL,Local,0,0,0
+2,Global,NULL,Global,0,0,0
+3,Normal,NULL,Normal,0,0,0
+4,Bitmap,NULL,Bitmap,0,0,0
+5,Forward,NULL,Forward,0,0,0
+6,Reverse,NULL,Reverse,0,0,0
+7,Logged,NULL,Logged,0,0,0
+8,NotLogged,NULL,NotLogged,0,0,0
+9,NoParallel,NULL,NoParallel,0,0,0
+10,Parallel,NULL,Parallel,0,0,0
+11,Parallel Degree,NULL,Parallel Degree,0,0,0
+12,Parallel Instances,NULL,Parallel Instances,0,0,0
+13,Partition Column,NULL,Partition Column,0,0,0
+14,Column Literal,NULL,Column Literal,0,0,0
+15,Tablespace Name,NULL,Tablespace Name,0,0,0
+16,Pct Free,NULL,Pct Free,0,0,0
+17,Pct Used,NULL,Pct Used,0,0,0
+18,Init Extent,NULL,Init Extent,0,0,0
+19,Next Extent,NULL,Next Extent,0,0,0
+20,Pct Increase,NULL,Pct Increase,0,0,0
+21,Min Extents,NULL,Min Extents,0,0,0
+22,Max Extents,NULL,Max Extents,0,0,0
+23,Heap,NULL,Heap,0,0,0
+24,Cluster,NULL,Cluster,0,0,0
+25,Index-Organized,NULL,Index-Organized,0,0,0
+26,Pct Threshold,NULL,Pct Threshold,0,0,0
+27,Include Column,NULL,Include Column,0,0,0
+28,Initial Trans,NULL,Initial Trans,0,0,0
+29,Max Trans,NULL,Max Trans,0,0,0
+30,FreeLists,NULL,FreeLists,0,0,0
+31,FreeList Groups,NULL,FreeList Groups,0,0,0
+32,DEFAULT,NULL,DEFAULT,0,0,0
+33,KEEP,NULL,KEEP,0,0,0
+34,RECYCLE,NULL,RECYCLE,0,0,0
+35,CACHE,NULL,CACHE,0,0,0
+36,NOCACHE,NULL,NOCACHE,0,0,0
+37,Connect String,NULL,Connect String,0,0,0
+38,Linked Table,NULL,Linked Table,0,0,0
+39,USING HASHING,NULL,USING HASHING,0,0,0
+40,DATA CAPTURE CHANGES,NULL,DATA CAPTURE CHANGES,0,0,0
+41,DATA CAPTURE NONE,NULL,DATA CAPTURE NONE,0,0,0
+42,Index Tablespace,NULL,Index Tablespace,0,0,0
+43,LONG Tablespace,NULL,LONG Tablespace,0,0,0
+44,WITH ENCRYPTION,NULL,WITH ENCRYPTION,0,0,0
+45,WITH CHECK OPTION,NULL,WITH CHECK OPTION,0,0,0
+46,FOR BIT DATA,NULL,FOR BIT DATA,0,0,0
+47,WITH DEFAULT,NULL,WITH DEFAULT,0,0,0
+48,COMPACT,NULL,COMPACT,0,0,0
+49,PRE SQL,NULL,PRE SQL,0,0,0
+50,POST SQL,NULL,POST SQL,0,0,0
+51,DISABLE PRE SQL,NULL,DISABLE PRE SQL,0,0,0
+52,DISABLE POST SQL,NULL,DISABLE POST SQL,0,0,0
+53,ROWGUIDCOL,NULL,ROWGUIDCOL,0,0,0
+54,LOGICAL ONLY,NULL,LOGICAL ONLY,0,0,0
+55,PHYSICAL ONLY,NULL,PHYSICAL ONLY,0,0,0
+56,GBPCACHE ALL,NULL,GBPCACHE ALL,0,0,0
+57,GBPCACHE CHANGE,NULL,GBPCACHE CHANGE,0,0,0
+58,GBPCACHE NONE,NULL,GBPCACHE NONE,0,0,0
+59,ERASE YES,NULL,ERASE YES,0,0,0
+60,CLOSE NO,NULL,CLOSE NO,0,0,0
+61,COPY YES,NULL,COPY YES,0,0,0
+62,Physical Definition,NULL,Physical Definition,0,0,0
+63,GENERATED ALWAYS,NULL,GENERATED ALWAYS,0,0,0
+64,GENERATED BY DEFAULT,NULL,GENERATED BY DEFAULT,0,0,0
+65,IDENTITY CACHE,NULL,IDENTITY CACHE,0,0,0
+66,VCAT,NULL,VCAT,0,0,0
+67,STOGROUP,NULL,STOGROUP,0,0,0
+68,DATABASE,NULL,DATABASE,0,0,0
+69,PCTFREE String Value,NULL,PCTFREE String Value,0,0,0
+70,UNBALANCED SPLIT,NULL,UNBALANCED SPLIT,0,0,0
+71,EMPTY,NULL,EMPTY,0,0,0
+72,FIX,NULL,FIX,0,0,0
+73,Auditing Type,NULL,Auditing Type,0,0,0
+74,Encoding Type,NULL,Encoding Type,0,0,0
+75,WITH RESTRICT ON DROP,NULL,WITH RESTRICT ON DROP,0,0,0
+76,WHERE NOT NULL,NULL,WHERE NOT NULL,0,0,0
+77,Defer Value,NULL,Defer Value,0,0,0
+78,OBID,NULL,OBID,0,0,0
+79,Collate String,NULL,Collate String,0,0,0
+80,Column Label,NULL,Column Label,0,0,0
+81,Column Text,NULL,Column Text,0,0,0
+82,System Name,NULL,System Name,0,0,0
+83,Hidden,NULL,Hidden,0,0,0
+84,Show Object Owner,NULL,Show Object Owner,0,0,0
+85,NOFIX,NULL,NOFIX,0,0,0
+86,"",NULL,"",0,0,0
+87,IN,NULL,IN,0,0,0
+88,PARTITIONED BY,NULL,PARTITIONED BY,0,0,0
+89,CHAR,NULL,CHAR,0,0,0
+90,WITH TIME ZONE,NULL,WITH TIME ZONE,0,0,0
+91,WITH LOCAL TIME ZONE,NULL,WITH LOCAL TIME ZONE,0,0,0
+92,YEAR TO MONTH,NULL,YEAR TO MONTH,0,0,0
+93,DDL Wizard Settings,NULL,DDL Wizard Settings,0,0,0
+94,PAD_INDEX,NULL,PAD_INDEX,0,0,0
+95,SORT_IN_TEMPDB,NULL,SORT_IN_TEMPDB,0,0,0
+96,COMPUTED,NULL,COMPUTED,0,0,0
+97,ALLPAGES,NULL,ALLPAGES,0,0,0
+98,DATAPAGES,NULL,DATAPAGES,0,0,0
+99,DATAROWS,NULL,DATAROWS,0,0,0
+100,Page Gap,NULL,Page Gap,0,0,0
+101,LRU,NULL,LRU,0,0,0
+102,off,NULL,off,0,0,0
+103,Identity Gap,NULL,Identity Gap,0,0,0
+104,NO,NULL,NO,0,0,0
+105,-- --,NULL,-- --,0,0,0
+106,DUAL,NULL,DUAL,0,0,0
+107,LOCAL,NULL,LOCAL,0,0,0
+108,Teradata Journal Name,NULL,Teradata Journal Name,0,0,0
+109,Fallback Protection,NULL,Fallback Protection,0,0,0
+110,Function Value,NULL,Function Value,0,0,0
+111,Partition Type String,NULL,Partition Type String,0,0,0
+112,MINIMUM,NULL,MINIMUM,0,0,0
+113,MAXIMUM,NULL,MAXIMUM,0,0,0
+114,"NULL",NULL,"NULL",0,0,0
+115,Format,NULL,Format,0,0,0
+116,Title,NULL,Title,0,0,0
+117,Object Type,NULL,Object Type,0,0,0
+118,SET,NULL,SET,0,0,0
+119,MULTISET,NULL,MULTISET,0,0,0
+120,NOT LOCAL,NULL,NOT LOCAL,0,0,0
+121,Cycle,NULL,Cycle,0,0,0
+122,Minvalue,NULL,Minvalue,0,0,0
+123,Maxvalue,NULL,Maxvalue,0,0,0
+124,Owner,NULL,Owner,0,0,0
+125,Include,NULL,Include,0,0,0
+126,ALLOW REVERSE SCANS,NULL,ALLOW REVERSE SCANS,0,0,0
+127,PK Name Constraint,NULL,PK Name Constraint,0,0,0
+128,Table Type,NULL,Table Type,0,0,0
+129,K,NULL,K,0,0,0
+130,G,NULL,G,0,0,0
+131,M,NULL,M,0,0,0
+132,Subpartition Column Name,NULL,Subpartition Column Name,0,0,0
+133,Default Hash Subpartition Count,NULL,Default Hash Subpartition Count,0,0,0
+134,Default Hash Subpartition Tablespaces,NULL,Default Hash Subpartition Tablespaces,0,0,0
+135,Subpartition Template,NULL,Subpartition Template,0,0,0
+136,Parition Hash Subpartition Count,NULL,Parition Hash Subpartition Count,0,0,0
+137,Parition Hash Subpartition Count Tablespaces,NULL,Parition Hash Subpartition Count Tablespaces,0,0,0
+138,Table Suffix,NULL,Table Suffix,0,0,0
+139,View Prefix,NULL,View Prefix,0,0,0
+140,View Suffix,NULL,View Suffix,0,0,0
+141,Table Owner,NULL,Table Owner,0,0,0
+142,View Owner,NULL,View Owner,0,0,0
+143,Index Owner,NULL,Index Owner,0,0,0
+144,GPM Wizard Settings,NULL,GPM Wizard Settings,0,0,0
+145,Report Wizard Settings,NULL,Report Wizard Settings,0,0,0
+146,Compare Merge Wizard Settings,NULL,Compare Merge Wizard Settings,0,0,0
+147,LOB Segment,NULL,LOB Segment,0,0,0
+148,Unsigned,NULL,Unsigned,0,0,0
+149,Sort View Columns Alphabetically,NULL,Sort View Columns Alphabetically,0,0,0
+150,Temporary Table Yes,NULL,Temporary Table Yes,0,0,0
+151,Temporary Table No,NULL,Temporary Table No,0,0,0
+152,Transaction Specific,NULL,Transaction Specific,0,0,0
+153,Session Specific,NULL,Session Specific,0,0,0
+154,Conversion Complete,NULL,Conversion Complete,0,0,0
+155,DB NAME,NULL,DB NAME,0,0,0
+156,DB USER ID,NULL,DB USER ID,0,0,0
+157,DB User Password,NULL,DB User Password,0,0,0
+158,DB Owner Name,NULL,DB Owner Name,0,0,0
+159,DB Server Name,NULL,DB Server Name,0,0,0
+160,DB Connection String,NULL,DB Connection String,0,0,0
+161,Table Connection Info ID,NULL,Table Connection Info ID,0,0,0
+162,Connection Info Count,NULL,Connection Info Count,0,0,0
+163,FFTable file name,NULL,FFTable file name,0,0,0
+164,FFTable Encode Type,NULL,FFTable Encode Type,0,0,0
+165,FFTable File Format Type,NULL,FFTable File Format Type,0,0,0
+166,FFTable Is Single Delimited,NULL,FFTable Is Single Delimited,0,0,0
+167,FFTable Escape charactor,NULL,FFTable Escape charactor,0,0,0
+168,FFTable Column Delimiter,NULL,FFTable Column Delimiter,0,0,0
+169,FFTable Null Value,NULL,FFTable Null Value,0,0,0
+170,FFTable Is Using Null Value,NULL,FFTable Is Using Null Value,0,0,0
+171,FFTable Text Delimiter Type,NULL,FFTable Text Delimiter Type,0,0,0
+172,FFTable Row Delimiter Type,NULL,FFTable Row Delimiter Type,0,0,0
+173,FFTable Is First Row Column Name,NULL,FFTable Is First Row Column Name,0,0,0
+174,FFColumn ID,NULL,FFColumn ID,0,0,0
+175,FFColumn Is Nullable,NULL,FFColumn Is Nullable,0,0,0
+176,FFColumn Is Skip Import,NULL,FFColumn Is Skip Import,0,0,0
+177,FFColumn Is Using Default Value,NULL,FFColumn Is Using Default Value,0,0,0
+178,FFColumn Is Using Null Replace,NULL,FFColumn Is Using Null Replace,0,0,0
+179,FFColumn Null Value,NULL,FFColumn Null Value,0,0,0
+180,FFColumn Null Replace String,NULL,FFColumn Null Replace String,0,0,0
+181,FFTable Domain Name,NULL,FFTable Domain Name,0,0,0
+182,FFTable Machine Name,NULL,FFTable Machine Name,0,0,0
+183,FFTable Edited,NULL,FFTable Edited,0,0,0
+184,FFTable TruncateData,NULL,FFTable TruncateData,0,0,0
+185,Oracle service name,NULL,Oracle service name,0,0,0
+186,DBMS Port Number,NULL,DBMS Port Number,0,0,0
+187,FFColumn DateFormat,NULL,FFColumn DateFormat,0,0,0
+188,JMSTable Source Name,NULL,JMSTable Source Name,0,0,0
+189,JMSTable Destination name,NULL,JMSTable Destination name,0,0,0
+190,JMSTable Destination Type,NULL,JMSTable Destination Type,0,0,0
+191,JMSTable Selector,NULL,JMSTable Selector,0,0,0
+192,JMSTable Timeout,NULL,JMSTable Timeout,0,0,0
+193,JMSTable Msg Ack Mode,NULL,JMSTable Msg Ack Mode,0,0,0
+194,JMSTable Target Destination name,NULL,JMSTable Target Destination name,0,0,0
+195,JMSTable Target Destination Type,NULL,JMSTable Target Destination Type,0,0,0
+196,JMSTable Target Priority,NULL,JMSTable Target Priority,0,0,0
+197,JMSTable Target Expiretime,NULL,JMSTable Target Expiretime,0,0,0
+198,JMSTable Target Persistence,NULL,JMSTable Target Persistence,0,0,0
+199,JMSTable Target Generate ID,NULL,JMSTable Target Generate ID,0,0,0
+200,JMSTable Target Generate Timestamp,NULL,JMSTable Target Generate Timestamp,0,0,0
+201,JMSColumn Msg Field Name,NULL,JMSColumn Msg Field Name,0,0,0
+202,JMSColumn Msg Field Type,NULL,JMSColumn Msg Field Type,0,0,0
+203,JMSColumn Column Format,NULL,JMSColumn Column Format,0,0,0
+204,JMSTable Msg Type,NULL,JMSTable Msg Type,0,0,0
+205,JMSTable Target Msg Type,NULL,JMSTable Target Msg Type,0,0,0
+206,JMSTable Target Source name,NULL,JMSTable Target Source name,0,0,0
+207,JMSTable XMLFORMAT,NULL,JMSTable XMLFORMAT,0,0,0
+208,JMSTable XML WITHDTD,NULL,JMSTable XML WITHDTD,0,0,0
+209,Attach Local File,NULL,Attach Local File,0,0,0
+210,XML Column Recursive,NULL,XML Column Recursive,0,0,0
+211,SAP BAPI Name,NULL,SAP BAPI Name,0,0,0
+212,SAP User Name,NULL,SAP User Name,0,0,0
+213,SAP Password,NULL,SAP Password,0,0,0
+214,SAP Server,NULL,SAP Server,0,0,0
+215,SAP Sysname,NULL,SAP Sysname,0,0,0
+216,SAP Client,NULL,SAP Client,0,0,0
+217,SAP Language,NULL,SAP Language,0,0,0
+218,SAP RecordBase,NULL,SAP RecordBase,0,0,0
+219,SAP XML Schema,NULL,SAP XML Schema,0,0,0
+220,SAP Request Schema,NULL,SAP Request Schema,0,0,0
+221,SAP Response Schema,NULL,SAP Response Schema,0,0,0
+222,SAP Conditions,NULL,SAP Conditions,0,0,0
+223,SAP Catalog Name List,NULL,SAP Catalog Name List,0,0,0
+224,SAP Category Name List,NULL,SAP Category Name List,0,0,0
+225,SAP Category Name,NULL,SAP Category Name,0,0,0
+226,XML Schema Type,NULL,XML Schema Type,0,0,0
+227,Datasource Alias,NULL,Datasource Alias,0,0,0
+228,FFTable Header Format,NULL,FFTable Header Format,0,0,0
+229,Src Tgt Type,NULL,Src Tgt Type,0,0,0
+230,Src Tgt Description,NULL,Src Tgt Description,0,0,0
+231,Src Tgt Host,NULL,Src Tgt Host,0,0,0
+232,Src Tgt Service,NULL,Src Tgt Service,0,0,0
+233,Src Tgt Port,NULL,Src Tgt Port,0,0,0
+234,Src Tgt File Path,NULL,Src Tgt File Path,0,0,0
+235,Src Tgt File Type,NULL,Src Tgt File Type,0,0,0
+236,Src Tgt File Encoding,NULL,Src Tgt File Encoding,0,0,0
+237,Src Tgt DS Frequency,NULL,Src Tgt DS Frequency,0,0,0
+238,Src Tgt DS LastUpdated,NULL,Src Tgt DS LastUpdated,0,0,0
+239,Src Tgt Enabled,NULL,Src Tgt Enabled,0,0,0
+240,Ora Password Expire,NULL,Ora Password Expire,0,0,0
+241,Ora Password Lock,NULL,Ora Password Lock,0,0,0
+242,Ora User-Role Identify,NULL,Ora User-Role Identify,0,0,0
+243,Ora User Def Tbs,NULL,Ora User Def Tbs,0,0,0
+244,Ora User Temp Tbs,NULL,Ora User Temp Tbs,0,0,0
+245,Ora User Profile,NULL,Ora User Profile,0,0,0
+246,Ora User Quota Clause,NULL,Ora User Quota Clause,0,0,0
+247,Column Source Direct Translation Logic,NULL,Column Source Direct Translation Logic,0,0,0
+248,Column Source Direct Translation Description,NULL,Column Source Direct Translation Description,0,0,0
+249,Column Source Secondary Translation Logic,NULL,Column Source Secondary Translation Logic,0,0,0
+250,Column Source Secondary Translation Description,NULL,Column Source Secondary Translation Description,0,0,0
+251,Column Target Direct Translation Logic,NULL,Column Target Direct Translation Logic,0,0,0
+252,Column Target Direct Translation Description,NULL,Column Target Direct Translation Description,0,0,0
+253,Column Target Secondary Translation Logic,NULL,Column Target Secondary Translation Logic,0,0,0
+254,Column Target Secondary Translation Description,NULL,Column Target Secondary Translation Description,0,0,0
+255,Submodel Synchronization Utility Settings,NULL,Submodel Synchronization Utility Settings,0,0,0
+256,Sybase Table Partition Number,NULL,Sybase Table Partition Number,0,0,0
+257,Oracle Hash Partition Count,NULL,Oracle Hash Partition Count,0,0,0
+258,Oracle Hash Partition Tablespace,NULL,Oracle Hash Partition Tablespace,0,0,0
+259,SQL Server Text Image File Group,NULL,SQL Server Text Image File Group,0,0,0
+260,Sybase Col Encryption Key,NULL,Sybase Col Encryption Key,0,0,0
+261,Oracle Col Encryption Algorithm,NULL,Oracle Col Encryption Algorithm,0,0,0
+262,Oracle Col Encryption With SALT,NULL,Oracle Col Encryption With SALT,0,0,0
+263,VOLATILE,NULL,VOLATILE,0,0,0
+264,Sybase Col Encrypted,NULL,Sybase Col Encrypted,0,0,0
+265,EntityEditor DDL Options,NULL,EntityEditor DDL Options,0,0,0
+266,INCLUSIVE,NULL,INCLUSIVE,0,0,0
+267,Model Validation Utility Settings,NULL,Model Validation Utility Settings,0,0,0
+268,SQL Server 2005 Collection Name,NULL,SQL Server 2005 Collection Name,0,0,0
+269,AS400 Table System Name,NULL,AS400 Table System Name,0,0,0
+270,AS400 Table Label,NULL,AS400 Table Label,0,0,0
+271,MSSQL Is Persisted,NULL,MSSQL Is Persisted,0,0,0
+272,XML Schema Generation Wizard Settings,NULL,XML Schema Generation Wizard Settings,0,0,0
+273,DT Mapping XML,NULL,DT Mapping XML,0,0,0
+274,Naming Standards Utility Settings,NULL,Naming Standards Utility Settings,0,0,0
+275,DT Mapping Name,NULL,DT Mapping Name,0,0,0
+276,DB2 UDB Partition Column Literal,NULL,DB2 UDB Partition Column Literal,0,0,0
+277,DB2 UDB Partition Duration,NULL,DB2 UDB Partition Duration,0,0,0
+278,DB2 UDB Partition Duration Label,NULL,DB2 UDB Partition Duration Label,0,0,0
+279,DB2 UDB Partition Tablesapce,NULL,DB2 UDB Partition Tablesapce,0,0,0
+280,DB2 UDB Partition Lob Tablespace,NULL,DB2 UDB Partition Lob Tablespace,0,0,0
+281,NULLS FIRST,NULL,NULLS FIRST,0,0,0
+282,NULLS LAST,NULL,NULLS LAST,0,0,0
+283,Table Compression Yes,NULL,Table Compression Yes,0,0,0
+284,Table Compression No,NULL,Table Compression No,0,0,0
+285,Index Compression Yes,NULL,Index Compression Yes,0,0,0
+286,Index Compression No,NULL,Index Compression No,0,0,0
+287,Index Compression Prefix Length,NULL,Index Compression Prefix Length,0,0,0
+288,SQL Server 2008 Col SPARSE,NULL,SQL Server 2008 Col SPARSE,0,0,0
+289,HG,NULL,HG,0,0,0
+290,LF,NULL,LF,0,0,0
+291,HNG,NULL,HNG,0,0,0
+292,CMP,NULL,CMP,0,0,0
+293,DATE,NULL,DATE,0,0,0
+294,TIME,NULL,TIME,0,0,0
+295,DTTM,NULL,DTTM,0,0,0
+296,WD,NULL,WD,0,0,0
+297,Sybase IQ Delimited By,NULL,Sybase IQ Delimited By,0,0,0
+298,Sybase IQ Limit,NULL,Sybase IQ Limit,0,0,0
+299,Import New Source Settings,NULL,Import New Source Settings,0,0,0
+300,CASESPECIFIC,NULL,CASESPECIFIC,0,0,0
+301,Table Row Movement Yes,NULL,Table Row Movement Yes,0,0,0
+302,Table Row Movement No,NULL,Table Row Movement No,0,0,0
+
+Valid_MetaClass
+Valid_MetaClass_ID,MetaClass_ID,MetaTable_ID,Global_User_ID,Row_Time_Stamp
+1,1,1,0,0
+2,1,2,0,0
+3,2,1,0,0
+4,2,2,0,0
+5,1,3,0,0
+6,1,9,0,0
+7,1,10,0,0
+8,1,11,0,0
+9,1,4,0,0
+10,3,10,0,0
+11,1,52,0,0
+12,1,53,0,0
+
+Valid_Property
+Valid_Property_ID,Property_Type_ID,Property_ID,Label,IsMandatory,Global_User_ID,Row_Time_Stamp
+1,2,1,NULL,0,0,0
+2,2,2,NULL,0,0,0
+3,2,3,NULL,0,0,0
+4,2,4,NULL,0,0,0
+5,2,5,NULL,0,0,0
+6,2,6,NULL,0,0,0
+7,2,7,NULL,0,0,0
+8,2,8,NULL,0,0,0
+9,1,4,NULL,0,0,0
+10,1,5,NULL,0,0,0
+11,1,6,NULL,0,0,0
+12,1,7,NULL,0,0,0
+13,1,8,NULL,0,0,0
+14,1,18,NULL,0,0,0
+15,1,19,NULL,0,0,0
+16,1,20,NULL,0,0,0
+17,3,4,NULL,0,0,0
+18,3,9,NULL,0,0,0
+19,3,10,NULL,0,0,0
+20,3,11,NULL,0,0,0
+21,3,12,NULL,0,0,0
+22,3,13,NULL,0,0,0
+23,3,14,NULL,0,0,0
+24,3,15,NULL,0,0,0
+25,3,16,NULL,0,0,0
+26,3,17,NULL,0,0,0
+27,1,23,NULL,0,0,0
+28,1,24,NULL,0,0,0
+29,1,25,NULL,0,0,0
+30,1,26,NULL,0,0,0
+31,3,21,NULL,0,0,0
+32,3,22,NULL,0,0,0
+33,3,23,NULL,0,0,0
+34,3,24,NULL,0,0,0
+35,3,25,NULL,0,0,0
+36,2,23,NULL,0,0,0
+37,2,24,NULL,0,0,0
+38,2,25,NULL,0,0,0
+39,4,10,NULL,0,0,0
+40,4,11,NULL,0,0,0
+41,4,12,NULL,0,0,0
+42,4,13,NULL,0,0,0
+43,4,14,NULL,0,0,0
+44,4,15,NULL,0,0,0
+45,4,16,NULL,0,0,0
+46,4,17,NULL,0,0,0
+47,4,21,NULL,0,0,0
+48,4,22,NULL,0,0,0
+49,4,23,NULL,0,0,0
+50,4,24,NULL,0,0,0
+51,4,25,NULL,0,0,0
+52,4,4,NULL,0,0,0
+53,1,27,NULL,0,0,0
+54,1,28,NULL,0,0,0
+55,1,29,NULL,0,0,0
+56,1,30,NULL,0,0,0
+57,1,31,NULL,0,0,0
+58,1,32,NULL,0,0,0
+59,5,33,NULL,0,0,0
+60,5,34,NULL,0,0,0
+61,6,35,NULL,0,0,0
+62,6,36,NULL,0,0,0
+63,6,37,NULL,0,0,0
+64,6,4,NULL,0,0,0
+65,1,38,NULL,0,0,0
+66,1,39,NULL,0,0,0
+67,5,38,NULL,0,0,0
+68,5,39,NULL,0,0,0
+69,1,40,NULL,0,0,0
+70,1,41,NULL,0,0,0
+71,5,40,NULL,0,0,0
+72,5,41,NULL,0,0,0
+73,6,42,NULL,0,0,0
+74,1,43,NULL,0,0,0
+75,6,43,NULL,0,0,0
+76,2,44,NULL,0,0,0
+77,2,45,NULL,0,0,0
+78,2,46,NULL,0,0,0
+79,2,47,NULL,0,0,0
+80,6,48,NULL,0,0,0
+81,1,48,NULL,0,0,0
+82,6,49,NULL,0,0,0
+83,6,50,NULL,0,0,0
+84,3,51,NULL,0,0,0
+85,3,44,NULL,0,0,0
+86,1,52,NULL,0,0,0
+87,1,53,NULL,0,0,0
+88,2,54,NULL,0,0,0
+89,2,55,NULL,0,0,0
+90,1,56,NULL,0,0,0
+91,1,57,NULL,0,0,0
+92,1,58,NULL,0,0,0
+93,1,59,NULL,0,0,0
+94,2,60,NULL,0,0,0
+95,2,61,NULL,0,0,0
+96,8,38,NULL,0,0,0
+97,8,39,NULL,0,0,0
+98,8,40,NULL,0,0,0
+99,8,41,NULL,0,0,0
+100,1,62,NULL,0,0,0
+101,6,63,NULL,0,0,0
+102,6,64,NULL,0,0,0
+103,6,65,NULL,0,0,0
+104,6,66,NULL,0,0,0
+105,6,67,NULL,0,0,0
+106,8,68,NULL,0,0,0
+107,1,69,NULL,0,0,0
+108,6,70,NULL,0,0,0
+109,6,71,NULL,0,0,0
+110,6,72,NULL,0,0,0
+111,6,73,NULL,0,0,0
+112,8,74,NULL,0,0,0
+113,2,75,NULL,0,0,0
+114,2,76,NULL,0,0,0
+115,6,77,NULL,0,0,0
+116,1,78,NULL,0,0,0
+117,1,79,NULL,0,0,0
+118,1,80,NULL,0,0,0
+119,1,81,NULL,0,0,0
+120,1,82,NULL,0,0,0
+121,1,83,NULL,0,0,0
+122,1,84,NULL,0,0,0
+123,1,85,NULL,0,0,0
+124,1,86,NULL,0,0,0
+125,2,87,NULL,0,0,0
+126,1,88,NULL,0,0,0
+127,1,89,NULL,0,0,0
+128,6,90,NULL,0,0,0
+129,6,91,NULL,0,0,0
+130,6,92,NULL,0,0,0
+131,6,93,NULL,0,0,0
+132,1,94,NULL,0,0,0
+133,6,95,NULL,0,0,0
+134,6,96,NULL,0,0,0
+135,6,97,NULL,0,0,0
+136,2,98,NULL,0,0,0
+137,2,99,NULL,0,0,0
+138,2,100,NULL,0,0,0
+139,1,101,NULL,0,0,0
+140,1,102,NULL,0,0,0
+141,6,103,NULL,0,0,0
+142,1,104,NULL,0,0,0
+143,1,105,NULL,0,0,0
+144,1,106,NULL,0,0,0
+145,1,107,NULL,0,0,0
+146,3,107,NULL,0,0,0
+147,3,108,NULL,0,0,0
+148,3,109,NULL,0,0,0
+149,8,110,NULL,0,0,0
+150,8,111,NULL,0,0,0
+151,8,112,NULL,0,0,0
+152,8,113,NULL,0,0,0
+153,8,114,NULL,0,0,0
+154,8,115,NULL,0,0,0
+155,8,116,NULL,0,0,0
+156,8,117,NULL,0,0,0
+157,8,118,NULL,0,0,0
+158,7,38,NULL,0,0,0
+159,7,39,NULL,0,0,0
+160,7,40,NULL,0,0,0
+161,7,41,NULL,0,0,0
+162,6,119,NULL,0,0,0
+163,6,120,NULL,0,0,0
+164,5,121,NULL,0,0,0
+165,1,122,NULL,0,0,0
+166,1,123,NULL,0,0,0
+167,2,124,NULL,0,0,0
+168,8,125,NULL,0,0,0
+169,8,126,NULL,0,0,0
+170,8,127,NULL,0,0,0
+171,8,128,NULL,0,0,0
+172,8,129,NULL,0,0,0
+173,8,130,NULL,0,0,0
+174,8,131,NULL,0,0,0
+175,1,132,NULL,0,0,0
+176,8,133,NULL,0,0,0
+177,1,134,NULL,0,0,0
+178,1,135,NULL,0,0,0
+179,1,136,NULL,0,0,0
+180,1,137,NULL,0,0,0
+181,1,138,NULL,0,0,0
+182,1,139,NULL,0,0,0
+183,1,140,NULL,0,0,0
+184,1,141,NULL,0,0,0
+185,1,142,NULL,0,0,0
+186,1,143,NULL,0,0,0
+187,1,144,NULL,0,0,0
+188,6,145,NULL,0,0,0
+189,6,146,NULL,0,0,0
+190,6,147,NULL,0,0,0
+191,6,148,NULL,0,0,0
+192,6,149,NULL,0,0,0
+193,6,150,NULL,0,0,0
+194,6,151,NULL,0,0,0
+195,1,152,NULL,0,0,0
+196,1,153,NULL,0,0,0
+197,1,154,NULL,0,0,0
+198,1,155,NULL,0,0,0
+199,8,156,NULL,0,0,0
+200,8,157,NULL,0,0,0
+201,6,158,NULL,0,0,0
+202,1,159,NULL,0,0,0
+203,1,160,NULL,0,0,0
+204,1,161,NULL,0,0,0
+205,1,162,NULL,0,0,0
+206,1,163,NULL,0,0,0
+207,1,164,NULL,0,0,0
+208,1,165,NULL,0,0,0
+209,1,166,NULL,0,0,0
+210,1,167,NULL,0,0,0
+211,1,168,NULL,0,0,0
+212,1,169,NULL,0,0,0
+213,1,170,NULL,0,0,0
+214,1,171,NULL,0,0,0
+215,6,172,NULL,0,0,0
+216,6,173,NULL,0,0,0
+217,1,174,NULL,0,0,0
+218,6,175,NULL,0,0,0
+219,1,176,NULL,0,0,0
+220,1,177,NULL,0,0,0
+221,1,178,NULL,0,0,0
+222,1,179,NULL,0,0,0
+223,1,180,NULL,0,0,0
+224,1,181,NULL,0,0,0
+225,6,182,NULL,0,0,0
+226,1,183,NULL,0,0,0
+227,1,184,NULL,0,0,0
+228,1,185,NULL,0,0,0
+229,1,186,NULL,0,0,0
+230,1,187,NULL,0,0,0
+231,1,188,NULL,0,0,0
+232,1,189,NULL,0,0,0
+233,1,190,NULL,0,0,0
+234,1,191,NULL,0,0,0
+235,1,192,NULL,0,0,0
+236,1,193,NULL,0,0,0
+237,1,194,NULL,0,0,0
+238,1,195,NULL,0,0,0
+239,1,196,NULL,0,0,0
+240,1,197,NULL,0,0,0
+241,1,198,NULL,0,0,0
+242,8,199,NULL,0,0,0
+243,1,200,NULL,0,0,0
+244,8,201,NULL,0,0,0
+245,8,202,NULL,0,0,0
+246,8,203,NULL,0,0,0
+247,8,204,NULL,0,0,0
+248,8,205,NULL,0,0,0
+249,8,206,NULL,0,0,0
+250,8,207,NULL,0,0,0
+251,8,208,NULL,0,0,0
+252,1,209,NULL,0,0,0
+253,1,210,NULL,0,0,0
+254,8,211,NULL,0,0,0
+255,10,212,NULL,0,0,0
+256,10,213,NULL,0,0,0
+257,10,214,NULL,0,0,0
+258,10,215,NULL,0,0,0
+259,10,216,NULL,0,0,0
+260,10,217,NULL,0,0,0
+261,10,218,NULL,0,0,0
+262,11,214,NULL,0,0,0
+263,6,219,NULL,0,0,0
+264,6,220,NULL,0,0,0
+265,6,221,NULL,0,0,0
+266,6,222,NULL,0,0,0
+267,6,223,NULL,0,0,0
+268,6,224,NULL,0,0,0
+269,6,225,NULL,0,0,0
+270,6,226,NULL,0,0,0
+271,8,227,NULL,0,0,0
+272,1,228,NULL,0,0,0
+273,1,229,NULL,0,0,0
+274,1,230,NULL,0,0,0
+275,1,231,NULL,0,0,0
+276,6,232,NULL,0,0,0
+277,6,233,NULL,0,0,0
+278,6,234,NULL,0,0,0
+279,1,235,NULL,0,0,0
+280,6,236,NULL,0,0,0
+281,8,237,NULL,0,0,0
+282,3,238,NULL,0,0,0
+283,2,101,NULL,0,0,0
+284,8,239,NULL,0,0,0
+285,6,240,NULL,0,0,0
+286,1,241,NULL,0,0,0
+287,1,242,NULL,0,0,0
+288,9,43,NULL,0,0,0
+289,6,243,NULL,0,0,0
+290,2,88,NULL,0,0,0
+291,2,229,NULL,0,0,0
+292,2,230,NULL,0,0,0
+293,8,244,NULL,0,0,0
+294,8,245,NULL,0,0,0
+295,8,246,NULL,0,0,0
+296,8,247,NULL,0,0,0
+297,6,248,NULL,0,0,0
+298,3,249,NULL,0,0,0
+299,3,250,NULL,0,0,0
+300,3,251,NULL,0,0,0
+301,3,252,NULL,0,0,0
+302,3,253,NULL,0,0,0
+303,3,254,NULL,0,0,0
+304,3,255,NULL,0,0,0
+305,1,256,NULL,0,0,0
+306,2,257,NULL,0,0,0
+307,2,258,NULL,0,0,0
+308,1,259,NULL,0,0,0
+309,6,260,NULL,0,0,0
+310,2,261,NULL,0,0,0
+311,2,262,NULL,0,0,0
+312,2,263,NULL,0,0,0
+313,8,264,NULL,0,0,0
+314,6,265,NULL,0,0,0
+315,1,266,NULL,0,0,0
+
+Valid_Property_Value
+Valid_Property_Value_ID,Property_Value_ID,Valid_Property_ID,Label,IsDefault,Global_User_ID,Row_Time_Stamp
+1,1,1,NULL,0,0,0
+2,2,1,NULL,0,0,0
+3,3,2,NULL,0,0,0
+4,4,2,NULL,0,0,0
+5,5,3,NULL,0,0,0
+6,6,3,NULL,0,0,0
+7,7,4,NULL,0,0,0
+8,8,4,NULL,0,0,0
+9,9,5,NULL,0,0,0
+10,10,5,NULL,0,0,0
+11,11,6,NULL,0,0,0
+12,12,7,NULL,0,0,0
+13,13,8,NULL,0,0,0
+14,7,9,NULL,0,0,0
+15,8,9,NULL,0,0,0
+16,9,10,NULL,0,0,0
+17,10,10,NULL,0,0,0
+18,11,11,NULL,0,0,0
+19,12,12,NULL,0,0,0
+20,13,13,NULL,0,0,0
+21,23,14,NULL,0,0,0
+22,24,14,NULL,0,0,0
+23,25,14,NULL,0,0,0
+24,26,15,NULL,0,0,0
+25,27,16,NULL,0,0,0
+26,7,17,NULL,0,0,0
+27,8,17,NULL,0,0,0
+28,14,18,NULL,0,0,0
+29,15,19,NULL,0,0,0
+30,16,20,NULL,0,0,0
+31,17,21,NULL,0,0,0
+32,18,22,NULL,0,0,0
+33,19,23,NULL,0,0,0
+34,20,24,NULL,0,0,0
+35,21,25,NULL,0,0,0
+36,22,26,NULL,0,0,0
+37,30,27,NULL,0,0,0
+38,31,28,NULL,0,0,0
+39,32,29,NULL,0,0,0
+40,33,29,NULL,0,0,0
+41,34,29,NULL,0,0,0
+42,35,30,NULL,0,0,0
+43,36,30,NULL,0,0,0
+44,28,31,NULL,0,0,0
+45,29,32,NULL,0,0,0
+46,30,33,NULL,0,0,0
+47,31,34,NULL,0,0,0
+48,32,35,NULL,0,0,0
+49,33,35,NULL,0,0,0
+50,34,35,NULL,0,0,0
+51,30,36,NULL,0,0,0
+52,31,37,NULL,0,0,0
+53,32,38,NULL,0,0,0
+54,33,38,NULL,0,0,0
+55,34,38,NULL,0,0,0
+56,15,39,NULL,0,0,0
+57,16,40,NULL,0,0,0
+58,17,41,NULL,0,0,0
+59,18,42,NULL,0,0,0
+60,19,43,NULL,0,0,0
+61,20,44,NULL,0,0,0
+62,21,45,NULL,0,0,0
+63,22,46,NULL,0,0,0
+64,28,47,NULL,0,0,0
+65,29,48,NULL,0,0,0
+66,30,49,NULL,0,0,0
+67,31,50,NULL,0,0,0
+68,32,51,NULL,0,0,0
+69,33,51,NULL,0,0,0
+70,34,51,NULL,0,0,0
+71,7,52,NULL,0,0,0
+72,8,52,NULL,0,0,0
+73,37,53,NULL,0,0,0
+74,38,54,NULL,0,0,0
+75,39,55,NULL,0,0,0
+76,40,56,NULL,0,0,0
+77,41,56,NULL,0,0,0
+78,42,57,NULL,0,0,0
+79,43,58,NULL,0,0,0
+80,44,59,NULL,0,0,0
+81,45,60,NULL,0,0,0
+82,46,61,NULL,0,0,0
+83,47,62,NULL,0,0,0
+84,48,63,NULL,0,0,0
+85,8,64,NULL,0,0,0
+86,49,65,NULL,0,0,0
+87,50,66,NULL,0,0,0
+88,49,67,NULL,0,0,0
+89,50,68,NULL,0,0,0
+90,51,69,NULL,0,0,0
+91,52,70,NULL,0,0,0
+92,51,71,NULL,0,0,0
+93,52,72,NULL,0,0,0
+94,53,73,NULL,0,0,0
+95,54,74,NULL,0,0,0
+96,55,74,NULL,0,0,0
+97,54,75,NULL,0,0,0
+98,55,75,NULL,0,0,0
+99,56,76,NULL,0,0,0
+100,57,76,NULL,0,0,0
+101,58,76,NULL,0,0,0
+102,59,77,NULL,0,0,0
+103,60,78,NULL,0,0,0
+104,61,79,NULL,0,0,0
+105,62,80,NULL,0,0,0
+106,62,81,NULL,0,0,0
+107,63,82,NULL,0,0,0
+108,64,82,NULL,0,0,0
+109,65,83,NULL,0,0,0
+110,66,84,NULL,0,0,0
+111,67,84,NULL,0,0,0
+112,56,85,NULL,0,0,0
+113,57,85,NULL,0,0,0
+114,58,85,NULL,0,0,0
+115,68,86,NULL,0,0,0
+116,69,87,NULL,0,0,0
+117,70,88,NULL,0,0,0
+118,71,89,NULL,0,0,0
+119,72,90,NULL,0,0,0
+120,73,91,NULL,0,0,0
+121,74,92,NULL,0,0,0
+122,75,93,NULL,0,0,0
+123,76,94,NULL,0,0,0
+124,77,95,NULL,0,0,0
+125,49,96,NULL,0,0,0
+126,50,97,NULL,0,0,0
+127,51,98,NULL,0,0,0
+128,52,99,NULL,0,0,0
+129,78,100,NULL,0,0,0
+130,79,101,NULL,0,0,0
+131,80,102,NULL,0,0,0
+132,81,103,NULL,0,0,0
+133,82,104,NULL,0,0,0
+134,83,105,NULL,0,0,0
+135,84,106,NULL,0,0,0
+136,85,90,NULL,0,0,0
+137,86,88,NULL,0,0,0
+138,86,107,NULL,0,0,0
+139,87,107,NULL,0,0,0
+140,88,107,NULL,0,0,0
+141,86,108,NULL,0,0,0
+142,89,109,NULL,0,0,0
+143,90,110,NULL,0,0,0
+144,91,110,NULL,0,0,0
+145,92,111,NULL,0,0,0
+146,93,112,NULL,0,0,0
+147,94,113,NULL,0,0,0
+148,95,114,NULL,0,0,0
+149,96,115,NULL,0,0,0
+150,97,116,NULL,0,0,0
+151,98,116,NULL,0,0,0
+152,99,116,NULL,0,0,0
+153,100,117,NULL,0,0,0
+154,101,118,NULL,0,0,0
+155,102,119,NULL,0,0,0
+156,103,120,NULL,0,0,0
+157,104,121,NULL,0,0,0
+158,105,121,NULL,0,0,0
+159,106,121,NULL,0,0,0
+160,104,122,NULL,0,0,0
+161,105,122,NULL,0,0,0
+162,106,122,NULL,0,0,0
+163,107,122,NULL,0,0,0
+164,108,123,NULL,0,0,0
+165,109,124,NULL,0,0,0
+166,110,125,NULL,0,0,0
+167,111,126,NULL,0,0,0
+168,112,127,NULL,0,0,0
+169,113,127,NULL,0,0,0
+170,114,128,NULL,0,0,0
+171,115,129,NULL,0,0,0
+172,116,130,NULL,0,0,0
+173,117,131,NULL,0,0,0
+174,118,132,NULL,0,0,0
+175,119,132,NULL,0,0,0
+176,120,122,NULL,0,0,0
+177,121,133,NULL,0,0,0
+178,122,134,NULL,0,0,0
+179,123,135,NULL,0,0,0
+180,124,136,NULL,0,0,0
+181,125,137,NULL,0,0,0
+182,126,138,NULL,0,0,0
+183,127,139,NULL,0,0,0
+184,128,140,NULL,0,0,0
+185,129,141,NULL,0,0,0
+186,130,141,NULL,0,0,0
+187,131,141,NULL,0,0,0
+188,132,142,NULL,0,0,0
+189,133,143,NULL,0,0,0
+190,134,144,NULL,0,0,0
+191,135,145,NULL,0,0,0
+192,135,146,NULL,0,0,0
+193,136,147,NULL,0,0,0
+194,137,148,NULL,0,0,0
+195,138,149,NULL,0,0,0
+196,139,150,NULL,0,0,0
+197,140,151,NULL,0,0,0
+198,141,152,NULL,0,0,0
+199,142,153,NULL,0,0,0
+200,143,154,NULL,0,0,0
+201,144,155,NULL,0,0,0
+202,145,156,NULL,0,0,0
+203,146,157,NULL,0,0,0
+204,49,158,NULL,0,0,0
+205,50,159,NULL,0,0,0
+206,51,160,NULL,0,0,0
+207,52,161,NULL,0,0,0
+208,147,162,NULL,0,0,0
+209,148,163,NULL,0,0,0
+210,149,164,NULL,0,0,0
+211,150,165,NULL,0,0,0
+212,151,165,NULL,0,0,0
+213,152,166,NULL,0,0,0
+214,153,166,NULL,0,0,0
+215,114,167,NULL,0,0,0
+216,154,168,NULL,0,0,0
+217,155,169,NULL,0,0,0
+218,156,170,NULL,0,0,0
+219,157,171,NULL,0,0,0
+220,158,172,NULL,0,0,0
+221,159,173,NULL,0,0,0
+222,160,174,NULL,0,0,0
+223,161,175,NULL,0,0,0
+224,162,176,NULL,0,0,0
+225,163,177,NULL,0,0,0
+226,164,178,NULL,0,0,0
+227,165,179,NULL,0,0,0
+228,166,180,NULL,0,0,0
+229,167,181,NULL,0,0,0
+230,168,182,NULL,0,0,0
+231,169,183,NULL,0,0,0
+232,170,184,NULL,0,0,0
+233,171,185,NULL,0,0,0
+234,172,186,NULL,0,0,0
+235,173,187,NULL,0,0,0
+236,174,188,NULL,0,0,0
+237,175,189,NULL,0,0,0
+238,176,190,NULL,0,0,0
+239,177,191,NULL,0,0,0
+240,178,192,NULL,0,0,0
+241,179,193,NULL,0,0,0
+242,180,194,NULL,0,0,0
+243,181,195,NULL,0,0,0
+244,182,196,NULL,0,0,0
+245,183,197,NULL,0,0,0
+246,184,198,NULL,0,0,0
+247,185,199,NULL,0,0,0
+248,186,200,NULL,0,0,0
+249,187,201,NULL,0,0,0
+250,188,202,NULL,0,0,0
+251,189,203,NULL,0,0,0
+252,190,204,NULL,0,0,0
+253,191,205,NULL,0,0,0
+254,192,206,NULL,0,0,0
+255,193,207,NULL,0,0,0
+256,194,208,NULL,0,0,0
+257,195,209,NULL,0,0,0
+258,196,210,NULL,0,0,0
+259,197,211,NULL,0,0,0
+260,198,212,NULL,0,0,0
+261,199,213,NULL,0,0,0
+262,200,214,NULL,0,0,0
+263,201,215,NULL,0,0,0
+264,202,216,NULL,0,0,0
+265,128,217,NULL,0,0,0
+266,203,218,NULL,0,0,0
+267,204,219,NULL,0,0,0
+268,205,220,NULL,0,0,0
+269,206,221,NULL,0,0,0
+270,207,222,NULL,0,0,0
+271,208,223,NULL,0,0,0
+272,209,224,NULL,0,0,0
+273,210,225,NULL,0,0,0
+274,211,226,NULL,0,0,0
+275,212,227,NULL,0,0,0
+276,213,228,NULL,0,0,0
+277,214,229,NULL,0,0,0
+278,215,230,NULL,0,0,0
+279,216,231,NULL,0,0,0
+280,217,232,NULL,0,0,0
+281,218,233,NULL,0,0,0
+282,219,234,NULL,0,0,0
+283,220,235,NULL,0,0,0
+284,221,236,NULL,0,0,0
+285,222,237,NULL,0,0,0
+286,223,238,NULL,0,0,0
+287,224,239,NULL,0,0,0
+288,225,240,NULL,0,0,0
+289,226,241,NULL,0,0,0
+290,227,242,NULL,0,0,0
+291,228,243,NULL,0,0,0
+292,229,244,NULL,0,0,0
+293,230,245,NULL,0,0,0
+294,231,246,NULL,0,0,0
+295,232,247,NULL,0,0,0
+296,233,248,NULL,0,0,0
+297,234,249,NULL,0,0,0
+298,235,250,NULL,0,0,0
+299,236,251,NULL,0,0,0
+300,237,252,NULL,0,0,0
+301,238,253,NULL,0,0,0
+302,239,254,NULL,0,0,0
+303,240,255,NULL,0,0,0
+304,241,256,NULL,0,0,0
+305,242,257,NULL,0,0,0
+306,243,258,NULL,0,0,0
+307,244,259,NULL,0,0,0
+308,245,260,NULL,0,0,0
+309,246,261,NULL,0,0,0
+310,242,262,NULL,0,0,0
+311,247,263,NULL,0,0,0
+312,248,264,NULL,0,0,0
+313,249,265,NULL,0,0,0
+314,250,266,NULL,0,0,0
+315,251,267,NULL,0,0,0
+316,252,268,NULL,0,0,0
+317,253,269,NULL,0,0,0
+318,254,270,NULL,0,0,0
+319,255,271,NULL,0,0,0
+320,256,272,NULL,0,0,0
+321,257,273,NULL,0,0,0
+322,258,274,NULL,0,0,0
+323,259,275,NULL,0,0,0
+324,260,276,NULL,0,0,0
+325,261,277,NULL,0,0,0
+326,262,278,NULL,0,0,0
+327,263,279,NULL,0,0,0
+328,264,280,NULL,0,0,0
+329,265,281,NULL,0,0,0
+330,266,282,NULL,0,0,0
+331,127,283,NULL,0,0,0
+332,267,284,NULL,0,0,0
+333,268,285,NULL,0,0,0
+334,269,286,NULL,0,0,0
+335,270,287,NULL,0,0,0
+336,54,288,NULL,0,0,0
+337,55,288,NULL,0,0,0
+338,271,289,NULL,0,0,0
+339,111,290,NULL,0,0,0
+340,257,291,NULL,0,0,0
+341,258,292,NULL,0,0,0
+342,272,293,NULL,0,0,0
+343,273,294,NULL,0,0,0
+344,274,295,NULL,0,0,0
+345,275,296,NULL,0,0,0
+346,32,297,NULL,0,0,0
+347,266,298,NULL,0,0,0
+348,276,299,NULL,0,0,0
+349,277,300,NULL,0,0,0
+350,278,301,NULL,0,0,0
+351,279,302,NULL,0,0,0
+352,280,303,NULL,0,0,0
+353,281,304,NULL,0,0,0
+354,282,304,NULL,0,0,0
+355,283,305,NULL,0,0,0
+356,284,305,NULL,0,0,0
+357,285,306,NULL,0,0,0
+358,286,306,NULL,0,0,0
+359,287,307,NULL,0,0,0
+360,281,308,NULL,0,0,0
+361,282,308,NULL,0,0,0
+362,288,309,NULL,0,0,0
+363,289,310,NULL,0,0,0
+364,290,310,NULL,0,0,0
+365,291,310,NULL,0,0,0
+366,292,310,NULL,0,0,0
+367,293,310,NULL,0,0,0
+368,294,310,NULL,0,0,0
+369,295,310,NULL,0,0,0
+370,296,310,NULL,0,0,0
+371,297,311,NULL,0,0,0
+372,298,312,NULL,0,0,0
+373,299,313,NULL,0,0,0
+374,300,314,NULL,0,0,0
+375,301,315,NULL,0,0,0
+376,302,315,NULL,0,0,0
+
+MetaClass_Member
+MetaClass_Member_ID,Valid_MetaClass_ID,Name,Label,Table_Row_ID,SequenceNo,Global_User_ID,Row_Time_Stamp
+100,1,Table,NULL,117,0,2975,0
+101,1,Table,NULL,118,0,2987,0
+1,7,Model,NULL,1,0,625,0
+102,1,Table,NULL,119,0,3003,0
+103,1,Table,NULL,120,0,3024,0
+104,1,Table,NULL,121,0,3048,0
+105,1,Table,NULL,122,0,3068,0
+106,1,Table,NULL,123,0,3086,0
+107,1,Table,NULL,124,0,3100,0
+108,1,Table,NULL,125,0,3118,0
+98,7,Model,NULL,7,0,2944,0
+99,1,Table,NULL,116,0,2964,0
+
+Property_Usage
+Property_Usage_ID,MetaClass_Member_ID,Valid_Property_ID,Label,Min_Rows,Max_Rows,Enforce_Maximum,IsMandatory,Global_User_ID,Row_Time_Stamp
+1,1,155,NULL,NULL,NULL,0,0,626,0
+104,98,296,NULL,NULL,NULL,0,0,2945,0
+105,98,294,NULL,NULL,NULL,0,0,2947,0
+106,99,140,NULL,NULL,NULL,0,0,2965,0
+107,100,140,NULL,NULL,NULL,0,0,2976,0
+108,101,140,NULL,NULL,NULL,0,0,2988,0
+109,102,140,NULL,NULL,NULL,0,0,3004,0
+110,103,140,NULL,NULL,NULL,0,0,3025,0
+111,104,140,NULL,NULL,NULL,0,0,3049,0
+112,105,140,NULL,NULL,NULL,0,0,3069,0
+113,106,140,NULL,NULL,NULL,0,0,3087,0
+114,107,140,NULL,NULL,NULL,0,0,3101,0
+115,108,140,NULL,NULL,NULL,0,0,3119,0
+91,1,284,NULL,NULL,NULL,0,0,2451,0
+
+Property_Value_Usage
+Property_Value_Usage_ID,Valid_Property_Value_ID,Property_Usage_ID,Value_Override,SequenceNo,Label,Global_User_ID,Row_Time_Stamp
+1,201,1,"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""no""?>
+<!DOCTYPE ERStudioGeneratePhysicalModelWizard SYSTEM """"><!--Name		  : Embarcadero Project File
+Description   : This file contains an Embarcadero generated data file.
+Version	   : Version 1.00
+Creation Date : 05/13/21 - 10:28:22
+Last Update   : 05/13/21 - 10:28:22
+--><ERStudioGeneratePhysicalModelWizard><GeneratePhysicalModelWizPropertyValue GeneratePhysicalModelWizPropertyValue=""DOMINO""/>
+<BooleanVariables m_bEraseData=""0"" m_bFallbackProtection=""0"" m_bFileBasedXML=""0"" m_bFix=""0"" m_bGenerateAKIndex=""0"" m_bGenerateFKIndex=""0"" m_bGenerateIEIndex=""0"" m_bGeneratePKClustered=""0"" m_bGeneratePKIndex=""1"" m_bIncludeDrawingShape=""0"" m_bIncludeSubmodels=""0"" m_bIncludeTextBlocks=""0"" m_bIsDimensionalModel=""0"" m_bLogDataChanges=""0"" m_bNotLoggedInitially=""0"" m_bPadIndex=""0"" m_bReplacementStrategy=""0"" m_bSelectAllEntity=""1"" m_bSelectAllRole=""0"" m_bSelectAllUser=""0"" m_bSelectAllView=""0"" m_bSortInTempDb=""0"" m_bTableStorage=""0"" m_bUnbalancedSplit=""0"" m_bValidateModel=""1""/>
+<NumberVariables m_SpaceHandling=""2"" m_TargetDatabaseId=""73"" m_nCaseShift=""1"" m_nExtFKHandling=""0"" m_nGBPCache=""0"" m_nHandlingNonspecificRel=""0"" m_nIdxOwnershipHandling=""0"" m_nInvalidCharHandling=""1"" m_nLockMode=""0"" m_nMySQLTableType=""0"" m_nPartialSettingHandling=""1"" m_nPrefetchStrategy=""0"" m_nSaveSettingsOption=""0"" m_nStorageType=""0"" m_nTblOwnershipHandling=""0"" m_nViewGenOption=""-1"" m_nViewOwnershipHandling=""0""/>
+<CStringVariables m_PhysicalModelName=""domino"" m_TargetDatabase=""MySQL 5.x"" m_csAfterJournal="""" m_csBeforeJournal="""" m_csDB2IndexInclude="""" m_csDatabase="""" m_csDatablockSize="""" m_csDupRowControl="""" m_csExternalNSTemplatePath="""" m_csIdentityGap="""" m_csIdxBufferPool="""" m_csIdxExtentGrowthFactor="""" m_csIdxFillfactor="""" m_csIdxFreeListGroups="""" m_csIdxFreeLists="""" m_csIdxInitialExtentSize="""" m_csIdxMaxExtents="""" m_csIdxMaxRowsPerPage="""" m_csIdxMaxTransactions="""" m_csIdxMinExtents="""" m_csIdxMinTransactions="""" m_csIdxNextExtentSize="""" m_csIndexNewOwner="""" m_csIndexPctFree="""" m_csIndexPctUsed="""" m_csIndexStorage="""" m_csLongStorage="""" m_csReservePageGap="""" m_csSelectedDatatypeMapping="""" m_csSelectedNSTemplateName=""[none]"" m_csSybaseLockingScheme="""" m_csTableNewOwner="""" m_csTablePctFree="""" m_csTablePctUsed="""" m_csTablePrefix="""" m_csTableStorage="""" m_csTableSuffix="""" m_csTblBufferPool="""" m_csTblExtentGrowthFactor="""" m_csTblFillfactor="""" m_csTblFreeListGroups="""" m_csTblFreeLists="""" m_csTblInitialExtentSize="""" m_csTblMaxExtents="""" m_csTblMaxRowsPerPage="""" m_csTblMaxTransactions="""" m_csTblMinExtents="""" m_csTblMinTransactions="""" m_csTblNextExtentSize="""" m_csTextImageFileGroup="""" m_csViewNewOwner="""" m_csViewPrefix="""" m_csViewSuffix=""""/>
+<GenPhysicalDataObjectList><m_EntityList/>
+<m_ViewList/>
+<m_UserList/>
+<m_RoleList/>
+</GenPhysicalDataObjectList>
+</ERStudioGeneratePhysicalModelWizard>
+",1,NULL,627,0
+104,345,104,MySQL 5.x (system),0,NULL,2946,0
+105,343,105,"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""no"" ?>
+<DataTypeMapping xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xsi:noNamespaceSchemaLocation=""C:\ProgramData\Embarcadero\ERStudio_8.0\DatatypeMapping\DataTypeMapping.xsd"">
+
+  <DBPlatform MappingName=""MySQL 5.x (system)"" PlatformId=""73"">
+    <DataType DatatypeId=""1"" DatatypeName=""BINARY"" Identity="""" Scale=""-1"" ShortName=""BIN"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""10""/>
+    <DataType DatatypeId=""2"" DatatypeName=""BIT"" Identity="""" Scale=""0"" ShortName=""BIT"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""1""/>
+    <DataType DatatypeId=""3"" DatatypeName=""CHAR"" Identity="""" Scale=""-1"" ShortName=""CH"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""10""/>
+    <DataType DatatypeId=""4"" DatatypeName=""NATIONAL CHAR"" Identity="""" Scale=""-1"" ShortName=""CHN"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""10""/>
+    <DataType DatatypeId=""5"" DatatypeName=""DATE"" Identity="""" Scale=""-1"" ShortName=""D"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""true"" Width=""-2""/>
+    <DataType DatatypeId=""6"" DatatypeName=""DECIMAL"" Identity="""" Scale=""0"" ShortName=""DC"" ShowScale=""true"" ShowType=""true"" ShowWidth=""true"" Undefined=""false"" Width=""10""/>
+    <DataType DatatypeId=""7"" DatatypeName=""DECIMAL"" Identity="""" Scale=""0"" ShortName=""DCN"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""10""/>
+    <DataType DatatypeId=""8"" DatatypeName=""DATETIME"" Identity="""" Scale=""-1"" ShortName=""DT"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""true"" Width=""-2""/>
+    <DataType DatatypeId=""9"" DatatypeName=""DATETIME"" Identity="""" Scale=""-1"" ShortName=""DTN"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""true"" Width=""-2""/>
+    <DataType DatatypeId=""10"" DatatypeName=""TEXT"" Identity="""" Scale=""-1"" ShortName=""DTX"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""11"" DatatypeName=""FLOAT"" Identity="""" Scale=""0"" ShortName=""FLN"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""8""/>
+    <DataType DatatypeId=""12"" DatatypeName=""FLOAT"" Identity="""" Scale=""0"" ShortName=""FLT"" ShowScale=""true"" ShowType=""true"" ShowWidth=""true"" Undefined=""false"" Width=""8""/>
+    <DataType DatatypeId=""13"" DatatypeName=""INT"" Identity=""IDENTITY"" Scale=""-1"" ShortName=""INT"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""14"" DatatypeName=""INT"" Identity="""" Scale=""-1"" ShortName=""ITN"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""15"" DatatypeName=""LONGBLOB"" Identity="""" Scale=""-1"" ShortName=""LBN"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""16"" DatatypeName=""TEXT"" Identity="""" Scale=""-1"" ShortName=""LVA"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""17"" DatatypeName=""VARCHAR"" Identity="""" Scale=""-1"" ShortName=""MLS"" ShowScale=""false"" ShowType=""false"" ShowWidth=""true"" Undefined=""true"" Width=""18""/>
+    <DataType DatatypeId=""18"" DatatypeName=""DECIMAL"" Identity="""" Scale=""2"" ShortName=""MN"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""19""/>
+    <DataType DatatypeId=""19"" DatatypeName=""DECIMAL"" Identity="""" Scale=""2"" ShortName=""MNN"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""19""/>
+    <DataType DatatypeId=""20"" DatatypeName=""DECIMAL"" Identity="""" Scale=""2"" ShortName=""NMN"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""10""/>
+    <DataType DatatypeId=""21"" DatatypeName=""DECIMAL"" Identity="""" Scale=""2"" ShortName=""NUM"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""10""/>
+    <DataType DatatypeId=""22"" DatatypeName=""BLOB"" Identity="""" Scale=""-1"" ShortName=""PIC"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""23"" DatatypeName=""VARCHAR"" Identity="""" Scale=""-1"" ShortName=""ROW"" ShowScale=""false"" ShowType=""false"" ShowWidth=""true"" Undefined=""true"" Width=""18""/>
+    <DataType DatatypeId=""24"" DatatypeName=""DATETIME"" Identity="""" Scale=""-1"" ShortName=""SDT"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""true"" Width=""-2""/>
+    <DataType DatatypeId=""25"" DatatypeName=""INT"" Identity="""" Scale=""-1"" ShortName=""SER"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""26"" DatatypeName=""FLOAT"" Identity="""" Scale=""0"" ShortName=""SFL"" ShowScale=""false"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""7""/>
+    <DataType DatatypeId=""27"" DatatypeName=""SMALLINT"" Identity=""IDENTITY"" Scale=""-1"" ShortName=""SI"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""28"" DatatypeName=""DECIMAL"" Identity="""" Scale=""2"" ShortName=""SMN"" ShowScale=""true"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""7""/>
+    <DataType DatatypeId=""29"" DatatypeName=""TIME"" Identity="""" Scale=""0"" ShortName=""T"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""3""/>
+    <DataType DatatypeId=""30"" DatatypeName=""TINYINT"" Identity=""IDENTITY"" Scale=""-1"" ShortName=""TI"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""31"" DatatypeName=""TIMESTAMP"" Identity="""" Scale=""-1"" ShortName=""TS"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""32"" DatatypeName=""LONGTEXT"" Identity="""" Scale=""-1"" ShortName=""TX"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""33"" DatatypeName=""NATIONAL VARCHAR"" Identity="""" Scale=""-1"" ShortName=""VAN"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""18""/>
+    <DataType DatatypeId=""34"" DatatypeName=""VARCHAR"" Identity="""" Scale=""-1"" ShortName=""VAR"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""18""/>
+    <DataType DatatypeId=""35"" DatatypeName=""VARBINARY"" Identity="""" Scale=""-1"" ShortName=""VBN"" ShowScale=""false"" ShowType=""true"" ShowWidth=""true"" Undefined=""true"" Width=""18""/>
+    <DataType DatatypeId=""36"" DatatypeName=""INT"" Identity="""" Scale=""-1"" ShortName=""CNT"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""37"" DatatypeName=""DOUBLE"" Identity="""" Scale=""0"" ShortName=""DBL"" ShowScale=""true"" ShowType=""true"" ShowWidth=""true"" Undefined=""false"" Width=""18""/>
+    <DataType DatatypeId=""38"" DatatypeName=""BINARY"" Identity="""" Scale=""-1"" ShortName=""UID"" ShowScale=""false"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""16""/>
+    <DataType DatatypeId=""39"" DatatypeName=""BIGINT"" Identity=""IDENTITY"" Scale=""-1"" ShortName=""LIN"" ShowScale=""false"" ShowType=""true"" ShowWidth=""false"" Undefined=""false"" Width=""19""/>
+    <DataType DatatypeId=""40"" DatatypeName=""BINARY"" Identity="""" Scale=""-1"" ShortName=""VNT"" ShowScale=""false"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""20""/>
+    <DataType DatatypeId=""41"" DatatypeName=""DATETIME"" Identity="""" Scale=""0"" ShortName=""ITV"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""42"" DatatypeName=""LONGBLOB"" Identity="""" Scale=""-1"" ShortName=""XML"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""43"" DatatypeName=""DATETIME"" Identity="""" Scale=""-1"" ShortName=""DTO"" ShowScale=""false"" ShowType=""false"" ShowWidth=""false"" Undefined=""false"" Width=""-2""/>
+    <DataType DatatypeId=""44"" DatatypeName=""CHAR"" Identity="""" Scale=""-1"" ShortName=""HID"" ShowScale=""false"" ShowType=""false"" ShowWidth=""true"" Undefined=""false"" Width=""10""/>
+  </DBPlatform>
+
+</DataTypeMapping>
+",0,NULL,2948,0
+106,184,106,MYISAM,0,NULL,2966,0
+107,184,107,MYISAM,0,NULL,2977,0
+108,184,108,MYISAM,0,NULL,2989,0
+109,184,109,MYISAM,0,NULL,3005,0
+110,184,110,MYISAM,0,NULL,3026,0
+111,184,111,MYISAM,0,NULL,3050,0
+112,184,112,MYISAM,0,NULL,3070,0
+113,184,113,MYISAM,0,NULL,3088,0
+114,184,114,MYISAM,0,NULL,3102,0
+115,184,115,MYISAM,0,NULL,3120,0
+91,332,91,"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""no""?>
+<!DOCTYPE ERStudioModelValidationUtility SYSTEM """"><!--Name		  : Embarcadero Project File
+Description   : This file contains an Embarcadero generated data file.
+Version	   : Version 1.00
+Creation Date : 09/10/21 - 19:12:34
+Last Update   : 09/10/21 - 19:12:34
+--><ERStudioModelValidationUtility><ModelValidationUtilityPropertyValue ModelValidationUtilityPropertyValue=""VALIDACION""/>
+<ModelRules><RuleFolder AllSelected=""0"" Identifier=""MVRF_ENTITY""><ValidationRule Identifier=""Definition More Than %d Characters"" OptionalData=""1023"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""More Than One Identity Column"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""More Than %d Columns"" OptionalData=""999"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""More Than %d Incoming Foreign Keys On Table"" OptionalData=""10"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""More Than %d Indexes On Table"" OptionalData=""32767"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""More Than %d Outgoing Foreign Keys On Table"" OptionalData=""10"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Matches A Database Keyword"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Columns"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Note"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Owner"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Permissions"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No User-defined Mappings"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Duplicate Check Constraint Name"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_ATTRIBUTE""><ValidationRule Identifier=""Definition More Than %d Characters"" OptionalData=""1023"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Member Of More Than One Index"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Matches A Database Keyword"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Default"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Domain"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Note"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Rule"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No User-defined Mappings"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Overridden Column Properties"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Duplicate Check Constraint Name"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Has Check Constraint Without Name"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_INDEX""><ValidationRule Identifier=""Duplicate Name In Model"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Unique Index With Null Column(s)"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_VIEW""><ValidationRule Identifier=""Definition More Than %d Characters"" OptionalData=""1023"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Invalid"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Note"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Owner"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Permissions"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_RELATIONSHIP""><ValidationRule Identifier=""Business Name More Than %d Characters"" OptionalData=""65"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Constraint Name More Than %d Characters"" OptionalData=""65"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Is A Circular Relationship"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""1"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Inverse Phrase"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Note"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Verb Phrase"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Constraint Name"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_USER""><ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Permissions"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_ROLE""><ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Members"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Permissions"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+</ModelRules>
+<DataDictionaryRules><RuleFolder AllSelected=""0"" Identifier=""MVRF_ATTACHMENT""><ValidationRule Identifier=""No Default Value"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_SECURITY""><ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_DEFAULT""><ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Matches A Database Keyword"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_RULE""><ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Matches A Database Keyword"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_REFERENCE_VALUE""><ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_NAMING_STANDARDS_TEMPLATE""><ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_USER_DATATYPE""><ValidationRule Identifier=""Name Has Invalid Characters"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name Matches A Database Keyword"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Name More Than %d Characters"" OptionalData=""65"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+<RuleFolder AllSelected=""0"" Identifier=""MVRF_DOMAIN""><ValidationRule Identifier=""No Attachments"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Definition"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""No Note"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+<ValidationRule Identifier=""Not Used"" OptionalData=""0"" Selected=""0"" Severity=""MVRS_WARNING""/>
+</RuleFolder>
+</DataDictionaryRules>
+<ModelObjects><ObjectFolder AllSelected=""1"" Identifier=""Entities""><SelectableObject Identifier=""boleta"" Selected=""1""/>
+<SelectableObject Identifier=""boleta_pareja"" Selected=""1""/>
+<SelectableObject Identifier=""ciudad"" Selected=""1""/>
+<SelectableObject Identifier=""data"" Selected=""1""/>
+<SelectableObject Identifier=""evento"" Selected=""1""/>
+<SelectableObject Identifier=""jugador"" Selected=""1""/>
+<SelectableObject Identifier=""mesa"" Selected=""1""/>
+<SelectableObject Identifier=""pais"" Selected=""1""/>
+<SelectableObject Identifier=""pareja"" Selected=""1""/>
+<SelectableObject Identifier=""ronda"" Selected=""1""/>
+</ObjectFolder>
+<ObjectFolder AllSelected=""1"" Identifier=""Views""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Relationships""><SelectableObject Identifier=""boleta-boleta_pareja"" Selected=""1""/>
+<SelectableObject Identifier=""boleta-data"" Selected=""1""/>
+<SelectableObject Identifier=""ciudad-evento"" Selected=""1""/>
+<SelectableObject Identifier=""ciudad-jugador"" Selected=""1""/>
+<SelectableObject Identifier=""evento-boleta"" Selected=""1""/>
+<SelectableObject Identifier=""evento-mesa"" Selected=""1""/>
+<SelectableObject Identifier=""evento-pareja"" Selected=""1""/>
+<SelectableObject Identifier=""evento-ronda"" Selected=""1""/>
+<SelectableObject Identifier=""jugador-pareja"" Selected=""1""/>
+<SelectableObject Identifier=""jugador-pareja"" Selected=""1""/>
+<SelectableObject Identifier=""mesa-boleta"" Selected=""1""/>
+<SelectableObject Identifier=""pais-ciudad"" Selected=""1""/>
+<SelectableObject Identifier=""pareja-boleta_pareja"" Selected=""1""/>
+<SelectableObject Identifier=""pareja-data"" Selected=""1""/>
+<SelectableObject Identifier=""ronda-boleta"" Selected=""1""/>
+</ObjectFolder>
+</ModelObjects>
+<DataDictionaryObjects><DataDictionary AllSelected=""1"" Identifier=""dominoAPI CI4_DD""><ObjectFolder AllSelected=""1"" Identifier=""Attachments""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Data Security Information""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Defaults""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Rules""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Reference Values""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Naming Standards Template""/>
+<ObjectFolder AllSelected=""1"" Identifier=""User Datatypes""/>
+<ObjectFolder AllSelected=""1"" Identifier=""Domains""/>
+</DataDictionary>
+</DataDictionaryObjects>
+</ERStudioModelValidationUtility>
+",1,NULL,2452,0
+
+DbPackage
+DbPackage_ID,Model_ID,Owner_ID,Name_ID,Description_ID,Flags,Header_Value_ID,Body_Value_ID,NSTFlag,CompareFlags,Global_User_ID
+
+DbTrigger
+DbTrigger_ID,Entity_ID,Owner_ID,Name_ID,Description_ID,Type,Flags,Trigger_Action,Value_ID,NSTFlag,Global_User_ID
+
+Proc
+Proc_ID,Model_ID,Owner_ID,Name_ID,Description_ID,Type,Flags,Value_ID,NSTFlag,CompareFlags,Global_User_ID
+
+Templated_Proc
+Templated_Proc_ID,Entity_ID,Name_ID,Description_ID,Flags,Value_ID,NSTFlag,Global_User_ID
+
+Storage_Object
+Storage_Object_ID,Model_ID,Owner_ID,Name_ID,Description_ID,Value_ID,Type,NSTFlag,CompareFlags,Global_User_ID
+
+Shape
+Shape_ID,Model_ID,Name_ID,Value_ID,Type,NSTFlag,CompareFlags,Global_User_ID
+
+Shape_Edge
+Shape_Edge_ID,Model_ID,Parent_MetaTable_ID,Parent_Table_Row_ID,Child_MetaTable_ID,Child_Table_Row_ID,Name_ID,VerbPhraseId,InversePhraseId,NSTFlag,Global_User_ID
+
+Referenced_Object
+Referenced_Object_ID,Proc_ID,DbTrigger_ID,DbPackage_ID,Storage_Object_ID,MetaTable_ID,Table_Row_ID,Global_User_ID
+
+Bound_Dictionary_Object
+Bound_Dictionary_Object_ID,Dictionary_Object_ID,MetaTable_ID,Table_Row_ID,Flags,Value_Override_ID,Sequence_No,Global_User_ID
+
+Object_Tracking
+Object_Tracking_ID,MetaTable_ID,Table_Row_ID,Created_By_ID,Create_Timestamp_ID,Last_Updated_By_ID,Last_Update_Timestamp_ID,Global_User_ID
+
+Data_Dictionary
+Data_Dictionary_ID,Name_ID,Description_ID,Flags,SignatureGUID,Global_User_ID
+1,168,2,1,NULL,2
+
+Dictionary_Object_Type
+Dictionary_Object_Type_ID,Name,Dictionary_Object_Type,Data_Type
+1,Trigger,1,0
+2,Library,2,0
+3,Procedure,3,0
+4,Default,4,0
+5,Rule,5,0
+6,UserDatatype,6,0
+7,Domain,7,0
+8,Reference Value,8,0
+9,Attachment Type,9,0
+10,Valid Attachment Type,10,0
+11,Attachment,11,0
+12,Dictionary Object Link,12,0
+13,Naming Standards Template,13,0
+
+Dictionary_Object
+Dictionary_Object_ID,Data_Dictionary_ID,Dictionary_Object_Type_ID,Property_Value_Data_Type,Global_User_ID
+1,1,9,0,111
+2,1,10,0,112
+3,1,10,0,113
+4,1,10,0,114
+5,1,10,0,115
+
+Dictionary_Library
+Dictionary_Library_ID,Dictionary_Object_ID,Name_ID,Description_ID,Is_System,Value_ID,Global_User_ID
+
+Dictionary_Trigger
+Dictionary_Trigger_ID,Dictionary_Object_ID,Name_ID,Description_ID,Is_System,Trigger_Type,Trigger_Action,Value_ID,DBMS_Type,Global_User_ID
+
+Reusable_Procedure
+Reusable_Procedure_ID,Dictionary_Object_ID,Name_ID,Description_ID,Value_ID,DBMS_Type,Global_User_ID
+
+Reference_Value
+Reference_Value_ID,Dictionary_Object_ID,Name_ID,Description_ID,Value_ID,Value_Description_ID,Min_Value_ID,Max_Value_ID,Is_Not_Between,Is_Range,Global_User_ID
+
+Attachment_Type
+Attachment_Type_ID,Dictionary_Object_ID,Name_ID,Description_ID,Is_User_Defined,Global_User_ID
+1,1,5,5,0,111
+
+Valid_Attachment_Type
+Valid_Attachment_Type_ID,Dictionary_Object_ID,MetaTable_ID,Attachment_Type_ID,Min_Rows,Max_Rows,Global_User_ID
+1,2,12,1,0,0,112
+2,3,1,1,0,0,113
+3,4,3,1,0,0,114
+4,5,57,1,0,0,115
+
+Attachment
+Attachment_ID,Dictionary_Object_ID,Attachment_Type_ID,Name_ID,Description_ID,Value_Default_ID,Attachment_Data_Type,Global_User_ID
+
+Dictionary_Object_Link
+Dictionary_Object_Link_ID,Dictionary_Object_ID,Ultimate_Parent_ID,Parent_ID,Child_ID,NodeNameID,NodeLevel,IsBottomLevel,Global_User_ID
+
+Naming_Standards_Template
+Naming_Standards_Template_ID,Dictionary_Object_ID,Name_ID,Description_ID,Data_ID,Global_User_ID,Row_Time_Stamp
+
+Object_Transform
+Object_Transform_ID,Model_ID,Transform_Type,Name_ID,Description_ID,CompareFlags,Global_User_ID
+
+Transform_Member
+Transform_Member_ID,Object_Transform_ID,MetaTable_ID,Source_Table_Row_ID,Target_Table_Row_ID,Transform_Action,Global_User_ID
+
+Database_Role
+Database_Role_ID,Model_ID,Name_ID,Identification_Type,Password,Description_ID,Flags,NSTFlag,CompareFlags,Global_User_ID
+
+Database_User
+Database_User_ID,Model_ID,Name_ID,External_Name_ID,Password,Description_ID,Flags,NSTFlag,CompareFlags,Global_User_ID
+
+Object_Permission
+Object_Permission_ID,Model_ID,Object_MetaTable_ID,Object_Table_Row_ID,Attribute_ID,Object_Name_ID,Object_Owner_ID,Grantee_MetaTable_ID,Grantee_Table_Row_ID,Grantee_Name_ID,Action_Type,Permission_Type,Flags,Global_User_ID
+
+User_Role_Member
+User_Role_Member_ID,Model_ID,Database_Role_ID,Database_User_ID,Global_User_ID
+
+User_Object_Match
+User_Object_Match_ID,A_Model_ID,B_Model_ID,A_MetaTable_ID,B_MetaTable_ID,A_Table_Row_ID,B_Table_Row_ID,Flags,DefinitionId,Global_User_ID
+
+Lineage_Component
+Lineage_Component_ID,Model_ID,MetaTable_ID,Table_Row_ID,DisplayName_ID,Global_User_ID
+
+Lineage_Stream
+Lineage_Stream_ID,Model_ID,Transformation_ID,Lineage_Component_ID,Flags,Name_ID,Description_ID,Global_User_ID
+
+Lineage_Stream_Member
+Lineage_Stream_Member_ID,Lineage_Stream_ID,MetaTable_ID,Table_Row_ID,Global_User_ID
+
+Transformation
+Transformation_ID,Model_ID,Name_ID,DefinitionId,Code_ID,Type_ID,Global_User_ID
+
+InterModelObjectLink
+InterModelObjectLink_ID,UniqueObject_ID,InterModelRelationship_ID
+
+InterModelRelationship
+InterModelRelationship_ID,Global_User_ID
+
+ObjectModification
+ObjectModification_ID,UniqueObject_ID,Modification_Type
+
+Delayed_Checkout
+Delayed_Checkout_ID,ObjectTechKey,DependencyType,DependencyTechKey,UniqueObject_Id,ObjectType,Flags
+1,1,0,0,23,0,0
+
+UniqueObject
+UniqueObject_Id,ObjectType_Id,Model_ID,Object_Domain_ID,InterModel_Id,IntraModelObject_Id,GUID,VersionGUID,CreationDate,CreateDate,RepositoryStatus,LastUpdateDate,Row_Time_Stamp
+2332,1,1,1,7,10,21e8995eda1f4bae8caf353f98486831,789434b9e36a481fb8ad5286ca29ae6a,09/10/2021 22:51:45G,1631312110,1,0,0
+2333,26,1,1,224,0,fa19442791524a33b7a2e8b6b400d3fe,ae66852e12904b61abd425327ebf987e,09/10/2021 22:51:45G,1631312110,1,0,0
+1,4,0,1,1,0,86737afbcb7e4c22a98881ba11c4ba70,232599f615b44c4c898e009350a42deb,05/13/2021 00:08:10G,1620862626,1,0,0
+2,55,0,2,1,0,23658e1f6edd465a9e20328846f8d0b7,da4c10d011b741998a2ec9157bd5b831,05/13/2021 00:08:10G,1620862626,1,0,0
+3,7,1,1,0,0,e8e61ff1fd604387b1c7a2f41068ec0e,847d9745d174452cae09abc0034a87f1,05/13/2021 00:08:10G,1620862626,1,0,0
+4,53,0,1,0,0,dfdb3a926e6548078aa901f5dcbdffa2,95808a5c356b4bca9c91a7a9c9bdf06f,05/13/2021 00:08:10G,1620862626,1,0,0
+5,53,0,1,0,0,553bc6f2ce0845e9a0f08af83214bd17,f070dd70e66a4a0e96c7a2dc6077ca82,05/13/2021 00:08:10G,1620862626,1,0,0
+6,53,0,1,0,0,a2d63972ab3a4487885cd37dc8628ec3,1fbbed017e144d86abe4251b7a65036e,05/13/2021 00:08:10G,1620862626,1,0,0
+2338,6,1,1,2,10,1e17702a29c94ada8545a773f64ec129,6465c67e58a84c92b65177d3ae98894c,09/10/2021 22:51:45G,1631312155,1,0,0
+7,53,0,1,0,0,09288f1a29094245b1cd38e61f5edb2d,d5ee137a4259429198b8e497803fc0ac,05/13/2021 00:08:10G,1620862626,1,0,0
+2339,40,1,1,0,0,aa2de6836d6948288a960def1101c026,d582a0d4802841d68d14ea3e3717dfa4,09/10/2021 22:51:45G,1631312155,1,0,0
+8,53,0,1,0,0,84f91a8d9ee2493fa2fc5b6bdf3e80cd,bc902dee511b4ab3a97a81b8ca7f649c,05/13/2021 00:08:10G,1620862626,1,0,0
+2340,28,1,1,0,0,45ba06d49c4f479a92d1db6ded82dba3,1f5fa4628a56440eaaca875080d8a2d9,09/10/2021 22:51:45G,1631312155,1,0,0
+9,53,0,1,0,0,082a44de42994c62986d68fd03f919a9,893d2bc1fd244e539c02a30f9aa31c9f,05/13/2021 00:08:10G,1620862626,1,0,0
+2341,28,1,1,0,0,67f42feb5dbe47cdb4765024f258ee4e,7433945c25b94278be540ac4e483e249,09/10/2021 22:51:45G,1631312155,1,0,0
+10,53,0,1,0,0,8a9bd686310746159860a4d834555912,38d205152119445b99e0919f3c4ab29c,05/13/2021 00:08:10G,1620862626,1,0,0
+11,53,0,1,0,0,e3b8e3eba48842c8b5c191130d6f2885,304613e5de084c10b715644978bec014,05/13/2021 00:08:10G,1620862626,1,0,0
+12,53,0,1,0,0,568d7eaf3ca446c6ae1a7d197199e216,b47de8c8f66c44a78861c14fc93695b2,05/13/2021 00:08:10G,1620862626,1,0,0
+13,53,0,1,0,0,6a38b6249c184c119bf05df0f807845a,4b94f39de0cb42b69d65e6782079f844,05/13/2021 00:08:10G,1620862626,1,0,0
+14,53,0,1,0,0,c20cb9f4ba464c71bf4b5445a08edaa6,2055145e59f448498f4b75816324e3f7,05/13/2021 00:08:10G,1620862626,1,0,0
+1180,37,3,1,0,0,1a25540a36764910a81d075d3cbb2adb,3ead5317a81d424a8c2ffe91fe141cc7,05/13/2021 15:46:44G,1620916972,1,0,0
+15,53,0,1,0,0,52c4f1612779414b807ab6c269ed6a5f,733051242b1b4921b82462bca7dacd91,05/13/2021 00:08:10G,1620862626,1,0,0
+1181,37,3,1,0,0,dfa9be205c35434b836363fd16603820,aea6fec874dc45d780cfd28f0e9f810f,05/13/2021 15:46:44G,1620916972,1,0,0
+16,53,0,1,0,0,1aba83302c5c4294b45e68ec1456da6e,141049986d6840679a71d5a94f1601f1,05/13/2021 00:08:10G,1620862626,1,0,0
+1182,37,3,1,0,0,8a37c827c26a41bca1ba493ada5b3695,a9c0473ba06d47d89ab436f38d398e2d,05/13/2021 15:46:44G,1620916972,1,0,0
+17,53,0,1,0,0,fcc9cb733ca743f1b1df753a582553bc,45b78c591f694d2e9bfff7b4cff43b7d,05/13/2021 00:08:10G,1620862626,1,0,0
+1183,37,3,1,0,0,ca34457de30c4785b0423d55435448f1,30f71d296c774eb0b90c556f9678ac7d,05/13/2021 15:46:44G,1620916972,1,0,0
+18,53,0,1,0,0,768f93e7546c424695fa02d135ce7506,0f6cf9864b364e549991d6503d7fb763,05/13/2021 00:08:10G,1620862626,1,0,0
+1184,37,3,1,0,0,8d73719e974741bdac342d99bc5568eb,e4f19133657842b0afca5abd8e3ec61a,05/13/2021 15:46:44G,1620916972,1,0,0
+19,53,0,1,0,0,d03f88703b2944ea9754c471ca88271b,15e42e4e66c841a78ac205cc70a9746e,05/13/2021 00:08:10G,1620862626,1,0,0
+1185,37,3,1,0,0,67c29be46a23474594861f6c7869332b,bb272de9ad424af6a91ce2d66c54e56c,05/13/2021 15:46:44G,1620916972,1,0,0
+20,53,0,1,0,0,e5d15e16779640f086984d7d338458d4,f05199a9971c468bbb3d2d32c18b9bc2,05/13/2021 00:08:10G,1620862626,1,0,0
+1186,37,3,1,0,0,f0688b39e10b4d48bb1ae6a077756c5e,25e42cac71ae4b83b92ccfb61a3e8eb1,05/13/2021 15:46:44G,1620916972,1,0,0
+21,53,0,1,0,0,742336dbddcb4431930dd1d742e7ea5e,ff8c45c9d0f64be199ef75d3f55e1f21,05/13/2021 00:08:10G,1620862626,1,0,0
+1187,37,3,1,0,0,0ae25b3f697146c686db58c61561c2fe,a44d7d0e3fa54767b003e266035d17f9,05/13/2021 15:46:44G,1620916972,1,0,0
+22,25,1,1,1,0,64d10b810dc94546b691e75444e50640,8839a51b3ba04c1ea14cd990e80a4585,05/13/2021 00:08:10G,1620862626,1,0,0
+23,36,1,1,0,0,9a3aa74bd4d04a22a32f54634843c5f4,ca2483eff1c74dfa9937d9691c0455d5,05/13/2021 00:08:10G,1620862626,1,0,0
+24,39,1,1,0,0,95157e008b494668a65453783815ab60,32c54c454523490fbf13a8c10a56ee90,05/13/2021 00:08:10G,1620862626,1,0,0
+25,37,1,1,0,0,8105320c510e4fc785564bb01fe7800d,62538bbfd7b240cdbcf710b171f3e6bd,05/13/2021 00:08:10G,1620862626,1,0,0
+1191,37,3,1,0,0,9b19e8717e8042a8935e38a63070d5e7,4605ad0a5e1d4a68a0e2c38b5cfdb86a,05/13/2021 15:46:44G,1620916972,1,0,0
+26,37,1,1,0,0,4ff634a7bb4f4bbbaa895a7103280472,1e2939fc3efa40e9b0233baa6ec04dcf,05/13/2021 00:08:10G,1620862626,1,0,0
+1192,37,3,1,0,0,2fd13e0cdcaa416faff338ba79569cda,afa6fa8dc1384eedbece5337db334cde,05/13/2021 15:46:44G,1620916972,1,0,0
+27,37,1,1,0,0,067c02598f0447f4a6e5eac2c86f1d30,56e1fe69c79f49aa9b67af207e3b05a1,05/13/2021 00:08:10G,1620862626,1,0,0
+2359,28,1,1,0,0,e6f95ad9f98e404ea50cac6110995263,e9bcbf7373cf4bdcb026676a55c1587a,09/10/2021 22:51:45G,1631312461,1,0,0
+28,37,1,1,0,0,09b2219c7db84e8c9992a3ba7a3cb851,c853675632784674a5af2ee13a6f3377,05/13/2021 00:08:10G,1620862626,1,0,0
+29,37,1,1,0,0,90edb4eca2ab478d9635ebcaf289922b,5420cfb3cb684ade95cfeec2506b750a,05/13/2021 00:08:10G,1620862626,1,0,0
+30,37,1,1,0,0,252f439ef9ad4c2187ca6ad8112c5203,1d7d3ee8d396497e8c947ad58ce815e4,05/13/2021 00:08:10G,1620862626,1,0,0
+31,37,1,1,0,0,288a88e7fd11486ca3e1b58b2be90ab2,4ef10178fa1e464a855e5dafbff606d9,05/13/2021 00:08:10G,1620862626,1,0,0
+32,37,1,1,0,0,9fe78a0393034cbc9b575399f932a95c,245c1c655a364120a24207a09c84687a,05/13/2021 00:08:10G,1620862626,1,0,0
+2364,8,1,1,57,0,9727e6bce6224cddbba02a9956afedc9,a25002684769424f990e0b8cb5941732,09/10/2021 22:51:45G,1631312841,1,0,0
+33,37,1,1,0,0,c2e158084dff47ee8e52a2c7bc36ceba,d5095d7129b74d87875299a6e2bd15e4,05/13/2021 00:08:10G,1620862626,1,0,0
+2365,29,1,1,57,0,0aae1f2fb1d946cdb8108b73865c70ff,48a98c3c2209408480bf7fe143210ab3,09/10/2021 22:51:45G,1631312841,1,0,0
+34,37,1,1,0,0,25c93c39453845e09aa203d7883aba46,31396554683a4994bae8a26443c83371,05/13/2021 00:08:10G,1620862626,1,0,0
+2366,1,1,1,19,13,9984e1a2d74140c9b8f5b320f25cfebc,d4b2f48117d845749a5248b2b2a590fb,09/10/2021 22:51:45G,1631312848,1,0,0
+35,37,1,1,0,0,69094a1c6dfa40a5947c279670cfab6a,db67ec969f7c41fc937fdbab10b6203a,05/13/2021 00:08:10G,1620862626,1,0,0
+2367,26,1,1,228,0,cda473f840c14e52b8b5642702b92ff1,527763e4e7d44a06b2d42e2486c70af8,09/10/2021 22:51:45G,1631312848,1,0,0
+36,37,1,1,0,0,0e1637899db14d7f8e6e11e80a07ec49,60f7025a644b401481dc3512124c6f56,05/13/2021 00:08:10G,1620862626,1,0,0
+1202,38,3,1,0,0,94acce6be4ac4bc49b82183a64d41d6c,ac4b36ecaa3744aaaf5042630dc8b970,05/13/2021 15:46:44G,1620916972,1,0,0
+2368,8,1,1,58,0,e00f54bca81546cb962821445b07bd3c,6117749cc63740d3a9a12f7aee60b084,09/10/2021 22:51:45G,1631312853,1,0,0
+37,37,1,1,0,0,4ef5ddc4c91f459da1fd5b5e8ad46dae,08eac4a21ba94e63a679c0aa75d1ce92,05/13/2021 00:08:10G,1620862626,1,0,0
+1203,38,3,1,0,0,96c3d69d16b74f8a9289c879e15480ed,6cddfb3e4cff44cc899532b2f47296d7,05/13/2021 15:46:44G,1620916972,1,0,0
+2369,29,1,1,58,0,12d2de2710874dba8613abdb0222df15,ac4e371d87054a5b869ffb40ab58eb91,09/10/2021 22:51:45G,1631312853,1,0,0
+38,37,1,1,0,0,5985328b11b14793b42728c3891bb213,9a730b46bc7a412088bbcc9cebc16567,05/13/2021 00:08:10G,1620862626,1,0,0
+1204,38,3,1,0,0,b9e730b61d424d7989c1c70527a7c1a6,a5285d5076564fbead06db30617279dc,05/13/2021 15:46:44G,1620916972,1,0,0
+2370,1,1,1,20,13,a8fc7d9e91ec485dadea4c662ea97af6,0738f42204c7452cbcc58763affbb770,09/10/2021 22:51:45G,1631312861,1,0,0
+39,37,1,1,0,0,a8d3c02e19044d6e989d88e1cc20518b,f0906e81726142f9bba1b84973259903,05/13/2021 00:08:10G,1620862626,1,0,0
+1205,38,3,1,0,0,16f98c5d274b4fb1a33b110f1d8068fb,a017fe199ab24e4fa7f58ccb6aed1453,05/13/2021 15:46:44G,1620916972,1,0,0
+2371,26,1,1,229,0,06bccbbe8c2d4901807be9a9edd12d29,467af88b775140e987954171aa9be3ec,09/10/2021 22:51:45G,1631312861,1,0,0
+40,37,1,1,0,0,f1d1d6f79f65440fa2f2db5532ceea80,5fe1c8acba844e24931702e3d140df8c,05/13/2021 00:08:10G,1620862626,1,0,0
+1206,38,3,1,0,0,dd16baf927fd4d969a79e09f845efe6c,b4190c9a0b26443cb9e366d11a7c008f,05/13/2021 15:46:44G,1620916972,1,0,0
+2372,8,1,1,59,0,884facaa832242f89bdf72985305386b,b2a17c9280304a6488578d7b15d366b3,09/10/2021 22:51:45G,1631312862,1,0,0
+41,37,1,1,0,0,041f0d3b6b934f2886ba869cf6da6b47,2dc28643e27945a78ccac02ebd406663,05/13/2021 00:08:10G,1620862626,1,0,0
+1207,38,3,1,0,0,1d399c5cb1914b33935e0215d0679509,f5b2bbad96f049878bbd177a1852c384,05/13/2021 15:46:44G,1620916972,1,0,0
+2373,29,1,1,59,0,e2183b3d35c544a39fe2a2a59dc9bfe1,721991c293ce45f9b89cbbf322f86e6e,09/10/2021 22:51:45G,1631312862,1,0,0
+42,37,1,1,0,0,f943da191eb84df683c121a79fc9b554,f9423412b6fc4880a5095a680340da21,05/13/2021 00:08:10G,1620862626,1,0,0
+1208,38,3,1,0,0,c63479425eaa438f8054aa424ac2cbc3,cb271328273f48409fab2057275d671c,05/13/2021 15:46:44G,1620916972,1,0,0
+2374,1,1,1,21,13,4fda39c56ac64fc0a68b64d21cabcc4e,13b13d0aaa774256b4741e2519996532,09/10/2021 22:51:45G,1631312868,1,0,0
+43,37,1,1,0,0,aca27994ab0343e5abb99d690aeb52f0,ec87e96bb91f43a4b9689570d923d028,05/13/2021 00:08:10G,1620862626,1,0,0
+1209,38,3,1,0,0,360dd800f69c4d92aa4a213567eb3c9c,3321765724f14b12a98236cd4be3a2f5,05/13/2021 15:46:44G,1620916972,1,0,0
+2375,26,1,1,230,0,c348b1da022e4bdd8c92ca26783211a8,dabbb5ef4c8d4c37835b5c27331029c5,09/10/2021 22:51:45G,1631312868,1,0,0
+44,37,1,1,0,0,c0120f21ccfc428a9e9aeddaab70992e,4508de35ae2646c5b33124d4ad0e1c90,05/13/2021 00:08:10G,1620862626,1,0,0
+2376,1,1,1,17,24,08e8dc3b824649ffa03523d73b9a69ac,891657b118194412bd6170398da0a3e1,09/10/2021 22:51:45G,1631313011,1,0,0
+45,37,1,1,0,0,e0146db76dc84b5ea2621e5fe5732a4a,eaeb26ab150240fc89f56580497aecef,05/13/2021 00:08:10G,1620862626,1,0,0
+46,37,1,1,0,0,d0436dc6ee5548b28fa1b88b9e2173ac,4882e088bf8e4220b776163924f05675,05/13/2021 00:08:10G,1620862626,1,0,0
+2378,8,1,1,60,0,83befb4815c6478187a29129d7ed1c66,bf00f488919d492eaa291a35f79706f1,09/10/2021 22:51:45G,1631313030,1,0,0
+47,38,1,1,0,0,7aaab7bfbe72478ea5715879d02b8234,b30c1660174340afa64312ee91986645,05/13/2021 00:08:10G,1620862626,1,0,0
+1213,37,3,1,0,0,5236f875e6e549f08335cb2257d49da0,604bb9e6556a4b1f83e941ae0d6123e9,05/13/2021 15:46:44G,1620916972,1,0,0
+2379,29,1,1,60,0,2566a5a532fe4ef1a97fe4e3790f8a9d,0350e1947ee646b4838275f5e53eaa2e,09/10/2021 22:51:45G,1631313030,1,0,0
+48,38,1,1,0,0,bd65bc8cf63742c2a8c9f69a466c6e96,fd8ddba5576943538cf348a3fdc022cd,05/13/2021 00:08:10G,1620862626,1,0,0
+1214,38,3,1,0,0,c12466994da948f4b2db0c888745d864,1d81b1ea945c42ecb2e4bb6c81b45d79,05/13/2021 15:46:44G,1620916972,1,0,0
+2380,1,1,1,18,24,a2a179cd94e34253a2ae068bf59b4022,a89c076ac4a5431abafb6ee049785e22,09/10/2021 22:51:45G,1631313055,1,0,0
+49,38,1,1,0,0,163ba21e533c421dac124b65f67c886c,1888adadce9846dc91acb28bda41c4be,05/13/2021 00:08:10G,1620862626,1,0,0
+1215,38,3,1,0,0,b51e2e0049a54cde97cf8fae3de6fb90,d1ac5bda1970481f862f44a59fee2142,05/13/2021 15:46:44G,1620916972,1,0,0
+2381,26,1,1,231,0,23af16bd590540d5ab8f8d8f65ac1bad,6900c3b1903e44dbb70b012148872f69,09/10/2021 22:51:45G,1631313055,1,0,0
+50,38,1,1,0,0,4d0c211e728d499c8ae648349bd0c205,a59cfb3ba3574275b23d4a6add149ff1,05/13/2021 00:08:10G,1620862626,1,0,0
+1216,38,3,1,0,0,03311aab97c742699756509eccec1b04,40bc8223ee334c1fa48f633d547e500e,05/13/2021 15:46:44G,1620916972,1,0,0
+2382,8,1,1,61,0,886162245c2645a98d3a8e2504b87712,d491eefed3f744e8a2fed3bcc089792a,09/10/2021 22:51:45G,1631313263,1,0,0
+51,38,1,1,0,0,541f7e881d784f9d890077b198410c10,6223ca821a264f77b436a0bf3ede0abe,05/13/2021 00:08:10G,1620862626,1,0,0
+2383,29,1,1,61,0,c93ed60b5a0b461c8bf44b5eb38d42eb,ce35c64bba314b5e8643042456ae7a48,09/10/2021 22:51:45G,1631313263,1,0,0
+52,38,1,1,0,0,086b6c1c680746788daa916cf21e3bb5,52e78b1331794b1baaeef01b91a5ce46,05/13/2021 00:08:10G,1620862626,1,0,0
+2384,1,1,1,19,24,90b53f9f2c3444a88358de33614ad5f3,34f37c8e9d1141eaaceb6c54d21ac88d,09/10/2021 22:51:45G,1631313282,1,0,0
+53,38,1,1,0,0,6b33a7a642e84725913016c0e028c276,be65a5f2aafd4d5c94f5e0bea47e2827,05/13/2021 00:08:10G,1620862626,1,0,0
+2385,26,1,1,232,0,8aae26965ea04adca0c960ff727b5be8,7baf11ed9f2344a08b2622b2d7f05633,09/10/2021 22:51:45G,1631313282,1,0,0
+54,38,1,1,0,0,73d85d1f3f55410c9bf84c628b8aa176,c64466281b6a485cb545e406a7acc4d0,05/13/2021 00:08:10G,1620862626,1,0,0
+2386,1,1,1,14,14,3ba2737ce0c04b43b6166bb77a562de6,e369450f6e3541589bfadc4bc7bed4c4,09/10/2021 22:51:45G,1631313510,1,0,0
+55,38,1,1,0,0,a56fe011df1942948862950afa655ddf,13100e9d9190422499f349582058af20,05/13/2021 00:08:10G,1620862626,1,0,0
+2387,8,1,1,62,0,6130a0dff757471fbb77269ae2fabbd4,c7692bc66f7e42908867cd7f2e83596b,09/10/2021 22:51:45G,1631313541,1,0,0
+56,38,1,1,0,0,130c26730d2f48058a64c52df1e4bd33,fb5dbc7973b148db8d425e061d050404,05/13/2021 00:08:10G,1620862626,1,0,0
+2388,29,1,1,62,0,c68faf4cdf2b4c97a1af27ebcbf5acd1,990330c9838947279201bdd4182ad20d,09/10/2021 22:51:45G,1631313541,1,0,0
+57,38,1,1,0,0,b040e9f467fe4fdd949006d976d58071,f197b028b6b54ded9755602e3085774f,05/13/2021 00:08:10G,1620862626,1,0,0
+2389,1,1,1,15,14,36c7781d80534a6fab47fecd827dc8a8,f573318ae4434bcaade36fabf6e4de01,09/10/2021 22:51:45G,1631313548,1,0,0
+58,38,1,1,0,0,1d7b59ac03564e159f4553fecceb7bfa,fadf61c55e8b4289993bd9a90761d726,05/13/2021 00:08:10G,1620862626,1,0,0
+2390,26,1,1,233,0,1a69ccfd066b4159a0536b0868d8c493,83df1b42883244f89e8406c793a2330f,09/10/2021 22:51:45G,1631313548,1,0,0
+59,38,1,1,0,0,e5b22734cf7142a39f473333641f9eeb,727b97ef1603445d87257de510fe15b9,05/13/2021 00:08:10G,1620862626,1,0,0
+1225,38,3,1,0,0,997984476675455d85560ed0f7a833a8,a748af7c309b461686744898c29e5bd7,05/13/2021 15:46:44G,1620916972,1,0,0
+2391,8,1,1,63,0,aba9ed7417bb43989dabfb15e83262fb,db6018fbf45347bdbeefcb6bcc6bfb5a,09/10/2021 22:51:45G,1631313552,1,0,0
+60,38,1,1,0,0,ddc16a646ab64c6fb0a4251889c18884,976d8d4615884a9599e2fa54ddbbd8ee,05/13/2021 00:08:10G,1620862626,1,0,0
+2392,29,1,1,63,0,37dc00debf494148a518e3fdac876396,bbc4dbb75df64e16a3ca550daf075206,09/10/2021 22:51:45G,1631313552,1,0,0
+61,38,1,1,0,0,aa9c70866b1140008966490cdac0328c,8c7e13f0d82544458250c0c394a4f84b,05/13/2021 00:08:10G,1620862626,1,0,0
+2393,1,1,1,16,14,a540efaef3ce436b837254356e83d0c1,81e3b87b97734f72acf6c583f1457586,09/10/2021 22:51:45G,1631313561,1,0,0
+62,38,1,1,0,0,49ae241639da498aad2539e86e59b9d6,800ba75f5a424c2fbb351e46e7febbf6,05/13/2021 00:08:10G,1620862626,1,0,0
+2394,26,1,1,234,0,4b8d7c184eba407ab6a944f741ed08ef,a9096c632686477e86b8852b90d3026b,09/10/2021 22:51:45G,1631313561,1,0,0
+63,38,1,1,0,0,1d6e39fe28dd418cbe4998684258449e,72f2cf9320824362a085c3eb51a5d002,05/13/2021 00:08:10G,1620862626,1,0,0
+64,38,1,1,0,0,e9dd7e169e624961a387bdae46961eb4,e69b86a1479a4fa5a07f5cadab8da533,05/13/2021 00:08:10G,1620862626,1,0,0
+65,37,1,1,0,0,2e028415e55942c99bcdff2e994cb856,4ab35d73f90647e99092c91e818805eb,05/13/2021 00:08:10G,1620862626,1,0,0
+66,38,1,1,0,0,f94495e77a8e4d96b23096aa620d9e11,f464e9fcf907483c9633a305935f41ce,05/13/2021 00:08:10G,1620862626,1,0,0
+67,38,1,1,0,0,294ef95b0ed04c8580f9a0b2df490164,9a2fd7e4087343e48aaa88efc5f53204,05/13/2021 00:08:10G,1620862626,1,0,0
+68,38,1,1,0,0,f0dcbee097d94136ba636b6cb2517a11,cf29d3decd1a4a0f99268895493c0e31,05/13/2021 00:08:10G,1620862626,1,0,0
+2400,6,1,1,2,13,c4137da5cabe44deaf6b5eaa71acb43b,2a3c431ec423448287e78a1d806241cf,09/10/2021 22:51:45G,1631313700,1,0,0
+69,38,1,1,0,0,08e3dcdb87cf45babdc6cfd32e1cad89,6476df983e40445c91a652d3407518a3,05/13/2021 00:08:10G,1620862626,1,0,0
+2401,40,1,1,0,0,7de8cf92d8a54efcb8047b0d3f1f9034,99d6632438484afe9585d8a1ad773c73,09/10/2021 22:51:45G,1631313700,1,0,0
+70,38,1,1,0,0,fc46a334d0474728aa6e71b29b720349,d3b976baa20a4e0e8a4a478019c47cc0,05/13/2021 00:08:10G,1620862626,1,0,0
+2402,28,1,1,0,0,cfb6b023806c42dcb209a6132d32e991,c282fb30e7d84ebe80881d688a286012,09/10/2021 22:51:45G,1631313700,1,0,0
+71,38,1,1,0,0,65a1abb81c7a44779868e3ebf57b23fe,e963bb61651d4a12b7ecd84ddcf82737,05/13/2021 00:08:10G,1620862626,1,0,0
+2403,28,1,1,0,0,7b8530d9c13748ab91c69f039b5fed75,920ad055362a485cb355c22161ab795f,09/10/2021 22:51:45G,1631313700,1,0,0
+72,38,1,1,0,0,d242559456d846299b04b4b7409eb4b0,7c945226bcef45f1b7f4e2b34595d820,05/13/2021 00:08:10G,1620862626,1,0,0
+2404,28,1,1,0,0,7f9d7aca4ba249c4aab38efeb9d2a329,c125947e203e4efb8c0785165b213049,09/10/2021 22:51:45G,1631313700,1,0,0
+73,38,1,1,0,0,17b4ed047b6a4a56b4367eb22d03db1e,a01a2b821fd14e41a206f7dc36b9aec1,05/13/2021 00:08:10G,1620862626,1,0,0
+1239,38,3,1,0,0,44b60bd00ebd4682bcef894ecdcea7c3,2737360a0e2949149c9187b09d5fb024,05/13/2021 15:46:44G,1620916972,1,0,0
+2405,28,1,1,0,0,4ecb7ab4ec0f4b45a7c16c7bfeacc11c,4a211ff35b61434d9f4b1d6796bd35c4,09/10/2021 22:51:45G,1631313700,1,0,0
+74,38,1,1,0,0,f0ac1d8eabb447c4b10a1b5deb2afac5,d425c347ab3747d1a0af157c6fe23dc7,05/13/2021 00:08:10G,1620862626,1,0,0
+1240,38,3,1,0,0,2b87d6c322414ba7990e173c5dac7ff3,d0e73536484e442682828e50e76e2dd7,05/13/2021 15:46:44G,1620916972,1,0,0
+2406,6,1,1,2,14,13afc7f91cb848f39c289c38f4ed28c5,d70ff4270a3741b58d14d9a6545936b0,09/10/2021 22:51:45G,1631313802,1,0,0
+75,38,1,1,0,0,aa1dc6af7c254f159217ccf1e9579458,faa175293c41404f812efbc99d6d8197,05/13/2021 00:08:10G,1620862626,1,0,0
+1241,38,3,1,0,0,59541ea5eac248dc965a18f3bc53fd0d,702597891bfd42d1807dc568ab2be29c,05/13/2021 15:46:44G,1620916972,1,0,0
+2407,40,1,1,0,0,b2efc9e649d94cf2abdfa65f7033b049,3eff5a65e6844e9fa16a38657b7866f6,09/10/2021 22:51:45G,1631313802,1,0,0
+76,38,1,1,0,0,dc9868b52e95484e87d87e908cebbfac,c3860a8c55d94273a560149481a9a84b,05/13/2021 00:08:10G,1620862626,1,0,0
+1242,38,3,1,0,0,1323c037fc01405991b231fd223aeefb,cc5cf4006bed477294e88d3a6141a07f,05/13/2021 15:46:44G,1620916972,1,0,0
+2408,28,1,1,0,0,b081320027d8489b947f8c606aaadb4d,4a91ede974f1416a81258ff5c99f0ed0,09/10/2021 22:51:45G,1631313802,1,0,0
+77,38,1,1,0,0,1a57b313534a4837b2f28a6fdb845458,a9f5ae45a1f440fca1c35f52baeac48a,05/13/2021 00:08:10G,1620862626,1,0,0
+1243,38,3,1,0,0,c501a490f73d4140818cd6fe790dc084,7eeb15a4b2534ea8852fc774e91536bd,05/13/2021 15:46:44G,1620916972,1,0,0
+2409,28,1,1,0,0,c8821cadf577453692380d00d9828037,c311363eb88741ffbbe68acdb97dbf9c,09/10/2021 22:51:45G,1631313802,1,0,0
+78,38,1,1,0,0,b2523a4e28ff4b0eb193f306d6829f8a,89e43f8ab9b84f0980b7c8c8dfed1754,05/13/2021 00:08:10G,1620862626,1,0,0
+1244,37,3,1,0,0,a6c1139f816142c8a320fcb8b8727e8b,d1daf5cbeb31483c9be5e4a3d32263ea,05/13/2021 15:46:44G,1620916972,1,0,0
+2410,28,1,1,0,0,3cb5905f980e47dd89c1f34d0811b057,87fb5bbda7244be1abcee1ab7f7ded7d,09/10/2021 22:51:45G,1631313802,1,0,0
+79,38,1,1,0,0,7ba85e61d291492dad8837e9c94b8279,1ed45bee96a547e89ad35eadca88f6c2,05/13/2021 00:08:10G,1620862626,1,0,0
+1245,37,3,1,0,0,9512b972c2144c56890cb2e054d40504,64a72f4485f04022a3cfec4c111c1a16,05/13/2021 15:46:44G,1620916972,1,0,0
+80,38,1,1,0,0,14a38522aec042829676f3c284611d3c,ee900c0f57bb4b8d956486262589596b,05/13/2021 00:08:10G,1620862626,1,0,0
+1246,38,3,1,0,0,bd79461b44e043b4af9ec489c57f2cf3,5ebeb879257d49b9b0cbb3907d9d619e,05/13/2021 15:46:44G,1620916972,1,0,0
+81,38,1,1,0,0,d5dee42ef39f487a84156a7d5b03dc71,5db0122da1cb429e9583e686d8bd107f,05/13/2021 00:08:10G,1620862626,1,0,0
+1247,38,3,1,0,0,a2084208fc7d4a7380aa98f122fc0925,5f25b90ab7d3458cbb689f391bab328b,05/13/2021 15:46:44G,1620916972,1,0,0
+82,38,1,1,0,0,4bdd5a8b45d146f385781fd655baaac3,92170bd7677942879371b9815e072668,05/13/2021 00:08:10G,1620862626,1,0,0
+1248,38,3,1,0,0,b60c155d5fbb4872bf4ed860ac4cce3f,6f37fd8324d7446a8fa7bda2eedf0a86,05/13/2021 15:46:44G,1620916972,1,0,0
+83,38,1,1,0,0,6d3009540e5f4782a8a6639d3eb63070,c42c6d0e638c4ecea467a719a6012f6f,05/13/2021 00:08:10G,1620862626,1,0,0
+1249,38,3,1,0,0,e0600d24d2214bbcac2150efad35de9c,88d5b7caf6f7488c9277ec72525171e3,05/13/2021 15:46:44G,1620916972,1,0,0
+84,38,1,1,0,0,eef887548b904b6eb5379a38d85ecdb9,16ea1c6382a045479acf5606fcaffa1d,05/13/2021 00:08:10G,1620862626,1,0,0
+1250,38,3,1,0,0,0733ec9cdd4744a890b2e23c37899668,9d6cec73d84a42e5982406cf4b4907c2,05/13/2021 15:46:44G,1620916972,1,0,0
+85,38,1,1,0,0,b3df6cb3c3da42e9844f87d562de0b02,ae0e5104614649158f27aac17fd5f986,05/13/2021 00:08:10G,1620862626,1,0,0
+1251,38,3,1,0,0,1237e7d99f3c48009e2c28b32e989df7,3c0ee4228ab440ee9795cba191558edd,05/13/2021 15:46:44G,1620916972,1,0,0
+86,38,1,1,0,0,e46cceaa0724453b86cb2b8e9c3385c8,a27d8ab4fdcc47ada513d09ef5f0104b,05/13/2021 00:08:10G,1620862626,1,0,0
+1252,38,3,1,0,0,d17ae98aba3341abab5656582b363ac7,050830d8e9c2460a8ca1709c3ecba41b,05/13/2021 15:46:44G,1620916972,1,0,0
+87,38,1,1,0,0,6d3b4e8b0cd245e39ed2748abf572d93,ad1de5a025234554b4ed46a1232e91a8,05/13/2021 00:08:10G,1620862626,1,0,0
+1253,38,3,1,0,0,d087d3080b554ea5acfd1a8468920d9d,70523332bc8c48c1bf5454aae83f480f,05/13/2021 15:46:44G,1620916972,1,0,0
+88,38,1,1,0,0,49e4d1d13be24a8fa73ef78c87494910,ee8ef6a6b2664bd9af512787834557a2,05/13/2021 00:08:10G,1620862626,1,0,0
+1254,37,3,1,0,0,794690c2d900470b8ac58e93636c5407,a892e733afcc47a7954558e0b3953a2b,05/13/2021 15:46:44G,1620916972,1,0,0
+89,38,1,1,0,0,ebe442815cbc421aa8fae7df86ca7c34,3f17ace9c74048c99df6c80b5494c186,05/13/2021 00:08:10G,1620862626,1,0,0
+1255,37,3,1,0,0,44a778fe64414ec4afe0509d238d079d,9ab61314bba845a490502861bf99bdec,05/13/2021 15:46:44G,1620916972,1,0,0
+90,38,1,1,0,0,dc67fbcaecaf48539b2bb8b4019a0c28,d10dedc19722472bbd0433e288ae8aa1,05/13/2021 00:08:10G,1620862626,1,0,0
+1256,37,3,1,0,0,2c62ba45df204bc68ad07d3433ea2773,2dcd446dc6e44dea97eb9fec34addf38,05/13/2021 15:46:44G,1620916972,1,0,0
+91,38,1,1,0,0,7c9974dbd3f442b5bf22c775dc73e699,fa2fe078bc5c49c496c16de2304b14db,05/13/2021 00:08:10G,1620862626,1,0,0
+1257,37,3,1,0,0,8e049e39207f4ed2ace9e2bf901a7f77,c701d810fcdc45a3bc903dc9e2ab6e6f,05/13/2021 15:46:44G,1620916972,1,0,0
+92,38,1,1,0,0,d8d35a16c870450e8a5970a824318acc,b54e5826b46b4507ae06819297c81b2b,05/13/2021 00:08:10G,1620862626,1,0,0
+1258,37,3,1,0,0,62045e2397c846c1812959c71ca804ec,53f73b6d68554393af7546109f052403,05/13/2021 15:46:44G,1620916972,1,0,0
+93,38,1,1,0,0,406c484c7cce4cf9beb8f68d39272831,7ccee7b3864c4fa9abc8e12673cae163,05/13/2021 00:08:10G,1620862626,1,0,0
+2425,8,1,1,67,0,622eff2fd5f54e998fb8b538a7f847e1,50baee5e1cde4a81a6593a916a3e2484,09/10/2021 22:51:45G,1631313950,1,0,0
+94,38,1,1,0,0,8ac3ab123e2c43fba08026d056feaf08,24caba5f619641d5ab949ff49a156c84,05/13/2021 00:08:10G,1620862626,1,0,0
+2426,29,1,1,67,0,42c19177be47475b9d816e77d44c302c,b2f6d34d689b40a79a5402eca482cc63,09/10/2021 22:51:45G,1631313950,1,0,0
+95,38,1,1,0,0,3a5aedf4a8ff4774bb7770e867ce2ad4,fabf95e5fb184e6c9f5bae7fbff2d0ac,05/13/2021 00:08:10G,1620862626,1,0,0
+2427,1,1,1,3,17,7a1856bd3dee4eb286442ea8a26701fe,35805dfb4d464bf685c5c3878325e751,09/10/2021 22:51:45G,1631313958,1,0,0
+96,37,1,1,0,0,8e0b0cc068134d408ba572ec87be5add,3e7ade2c31bb45ccbcc0caa183e478ee,05/13/2021 00:08:10G,1620862626,1,0,0
+2428,26,1,1,238,0,3cd822f4d97a4399bd2b45b92524f65d,386c62fb0d1244d8aaf7841946f781cf,09/10/2021 22:51:45G,1631313958,1,0,0
+97,37,1,1,0,0,3fa17d2538784211b02a1377ce40e70b,421833e813b742c5ad5c70b418b5b980,05/13/2021 00:08:10G,1620862626,1,0,0
+98,38,1,1,0,0,0ef91bbd7b644a098f6ccd8bd018df04,88d12994873a49f9a2fc8550396165cb,05/13/2021 00:08:10G,1620862626,1,0,0
+99,38,1,1,0,0,db70e14cd67d42fdbbc55df97b56ef99,de9ae6987fa848c092f52096a65fc5b4,05/13/2021 00:08:10G,1620862626,1,0,0
+100,38,1,1,0,0,0705938691da43a0b54a301c81907955,f1bbb12b03d441598e4036ac36fdf3f3,05/13/2021 00:08:10G,1620862626,1,0,0
+101,38,1,1,0,0,20d352a7a42b4033b059e7b912f01f47,79c1a4c569fe4e54a5e6c32760b24edb,05/13/2021 00:08:10G,1620862626,1,0,0
+102,38,1,1,0,0,7f931a18cd804372b2b558f3c2288282,17f73538565844bc96f6ceb522dcd521,05/13/2021 00:08:10G,1620862626,1,0,0
+103,38,1,1,0,0,9c8e7bdcdcc744c8a55dce25df98150b,ebff9663e71246c984704029553a9b7a,05/13/2021 00:08:10G,1620862626,1,0,0
+104,38,1,1,0,0,21735562b7c94e71a3c1a77b51dfee41,907d594ed5a44b7598e423effcf67d25,05/13/2021 00:08:10G,1620862626,1,0,0
+105,38,1,1,0,0,6a7f5ce322644f6381d8782bfac75df1,fad2b3e0562d4be48158ee0142e8c307,05/13/2021 00:08:10G,1620862626,1,0,0
+2437,1,1,1,14,11,4eba7680b3084c21ab3490ac543bdf25,8701fd50ec304b3a9f78aace931ab894,09/10/2021 23:05:59G,1631314842,1,0,0
+106,37,1,1,0,0,8a7821de198447e3879a96bbc070b7cf,f263eff87fc04566935be1dc6a6e3714,05/13/2021 00:08:10G,1620862626,1,0,0
+2438,1,1,1,16,12,70d81937c0c547579852ef6ae09b5fd4,e4e030c0a40c4ba0941746ea4c53f32f,09/10/2021 23:05:59G,1631314996,1,0,0
+107,37,1,1,0,0,c92641e723b04917aa23c93c61ccca0f,1a58c96de32742ad8498f7c199ad94fd,05/13/2021 00:08:10G,1620862626,1,0,0
+2439,1,1,1,17,12,13a35ad9d79348cf8a9935d5b19daa80,708db9766eb14036bf80c107e88195bd,09/10/2021 23:05:59G,1631314996,1,0,0
+108,37,1,1,0,0,378a90f0552a47a9a3330f958b591776,8590e3ec78b64b839e22a6c545a017dd,05/13/2021 00:08:10G,1620862626,1,0,0
+2440,1,1,1,18,12,486cde0a06c9493796142cb3aac7d6c5,010e58f0c6314b0b86c625a4a07c140a,09/10/2021 23:05:59G,1631314996,1,0,0
+109,37,1,1,0,0,c0451d854a7e467697ba35df3f11cb25,2f963177a9f4438a8fc7b2e61cf41cb3,05/13/2021 00:08:10G,1620862626,1,0,0
+2441,1,1,1,19,12,15e3d5daccbb42adb50524c7bd051bb5,e711c14c2e0a4141a0dfd946fc964b35,09/10/2021 23:05:59G,1631314996,1,0,0
+110,37,1,1,0,0,46ecec6f70734c53b7ce3403c4322ab1,98241c8d421a4795a3cad8c2a01b976a,05/13/2021 00:08:10G,1620862626,1,0,0
+2442,1,1,1,20,12,0949f2b421a74a60a0fddd6aeb2c0f29,054f37e12b0e43c4ab18ab0a79fde16d,09/10/2021 23:05:59G,1631315045,1,0,0
+111,58,0,2,1,0,bf8fdea610ef4dc28372266f48c621ba,45e127f1b0a14ef99424f03e89c43667,05/13/2021 00:08:10G,1620862626,1,0,0
+2443,8,1,1,70,0,de26bab9b47a4dc3bec1fed840f1a914,f5ec012758f94fe0821d35bb992696cc,09/10/2021 23:05:59G,1631315078,1,0,0
+112,59,0,2,2,0,80d36419674a4e92b7e66e051888c908,ad056b72d1c34a4bacf380b431d22581,05/13/2021 00:08:10G,1620862626,1,0,0
+2444,29,1,1,70,0,6cd9a2171b384a1fb5c6074b4d6beda5,6e077ce6f5d947c1b1557d6a93e4e666,09/10/2021 23:05:59G,1631315078,1,0,0
+113,59,0,2,3,0,1d64fbd7b6b9421b80da7b78ffdfa331,ddad9066cfa043a095e8904506ecdd4a,05/13/2021 00:08:10G,1620862626,1,0,0
+2445,1,1,1,6,17,bc7f57cff7f94e188b719e582a5b4d41,1a9d40c4f62e4956aa480c6ed8556f77,09/10/2021 23:05:59G,1631315091,1,0,0
+114,59,0,2,4,0,ca157c958c9e4abea60818c4bc5da976,0f264fb424c547dfaac79e771ccb2f65,05/13/2021 00:08:10G,1620862626,1,0,0
+2446,26,1,1,241,0,3bd48b17b707495d9929b97dbb89a8ca,6cfb2097102c47d6a72a108c52e2a939,09/10/2021 23:05:59G,1631315091,1,0,0
+115,59,0,2,5,0,2cf79365a17e4131bd540d5070c6a577,1a07846ba1da44dfa23a9c15226580ba,05/13/2021 00:08:10G,1620862626,1,0,0
+2447,8,1,1,71,0,f1b4be108bd34fc9b9aa3436ba31c4aa,e932fd408bed46609af6775f147ad1c0,09/10/2021 23:05:59G,1631315093,1,0,0
+116,5,1,1,1,0,39dff1c685a243e7b5fc9a003eeb5dfb,4a8dcd04834347419cdc098debfc2567,05/13/2021 00:08:10G,1620862635,1,0,0
+2448,29,1,1,71,0,ae85cb05c5fb4854911bf4aa374fe6a6,0b4a40d51ed745de90953a88bbf9733e,09/10/2021 23:05:59G,1631315093,1,0,0
+117,41,1,1,0,0,af30556137cf47058ac7f18a18200504,ff30f564b2e746dfaeb4354a3117059d,05/13/2021 00:08:10G,1620862635,1,0,0
+2449,1,1,1,7,17,a9e1362217034a5ea0072ab3e74b8c18,60f6e4acdfe44833b31a2c621241d53f,09/10/2021 23:05:59G,1631315099,1,0,0
+118,6,1,1,1,1,10724caf34db4f3f99a2f1e125ddcce7,bd4ffe7761b545daa51728d0f9690dcb,05/13/2021 00:08:10G,1620862635,1,0,0
+2450,26,1,1,242,0,57fab19cc26f4c93a8208d05f275e592,71c75da6913842bf83828c57e03172c3,09/10/2021 23:05:59G,1631315099,1,0,0
+119,40,1,1,0,0,b00eb970218741b4a7cdd3eec7f49a6c,73f88fab1b6940c2bf465354e2e4d081,05/13/2021 00:08:10G,1620862635,1,0,0
+2451,51,0,1,0,0,71dde7c970c34d3e80b85f29758ea011,bc0074856a344e91a9ac8aeaec1f4f6b,09/10/2021 23:45:06G,1631315554,1,0,0
+120,27,0,1,1,0,07dfe24deb174e72bf1a1bf2a1da2a5c,1e86837423904dfc8927b821bb53318f,05/13/2021 00:08:10G,1620862635,1,0,0
+2452,52,0,1,0,0,f55019945b1242c38de1fd9ac9f3f8e6,3fcd8200cdac43aab0e98b99077704ac,09/10/2021 23:45:06G,1631315554,1,0,0
+121,1,1,1,1,1,0709761557a2493a96dd3f527b3e7d28,a1268887793841beae8ede320d499457,05/13/2021 00:08:10G,1620862639,1,0,0
+122,28,1,1,0,0,fe575c991d95433a9b64100e21d1623a,84102ad041f04339a9966c84c320c947,05/13/2021 00:08:10G,1620862639,1,0,0
+2454,28,1,1,0,0,059e61c42c294d1c925b646b755401cb,79ea87b65eae4628b187a76e480746b9,09/10/2021 23:45:06G,1631315641,1,0,0
+123,1,1,1,2,1,026ea177d2cd46d684ac31ac7e6f8330,9107259d051d4e858f70453f3ac9fa7f,05/13/2021 00:08:10G,1620862642,1,0,0
+124,1,1,1,3,1,0ce71bfe814244d682111c9ab0da9297,a6d4cd8e8a844cdc99570e90ecdae822,05/13/2021 00:08:10G,1620862647,1,0,0
+2456,28,1,1,0,0,a36ddd00e7b0440eb76fd3e06744bb1d,293e205c6411451585c355609f29faf8,09/10/2021 23:45:06G,1631315933,1,0,0
+2457,28,1,1,0,0,02da9a3cfe104e5fa70bfb19380a7f6e,29aab29e05ef4cbfbda79a58b4d81d80,09/10/2021 23:45:06G,1631315965,1,0,0
+2458,28,1,1,0,0,da65891b57014e02abee19245b10dd6d,c20f29b5d687432fa3aa2e6653624c8a,09/10/2021 23:45:06G,1631315965,1,0,0
+132,5,1,1,2,0,658f2c412f204459bb41805ce8095ffd,dcf7f931638a4cb0a9180884e07abc14,05/13/2021 00:08:10G,1620862732,1,0,0
+133,41,1,1,0,0,2b11677291184021aa85272de8170cb6,f5a6df58afd24122941d7fd750c526a4,05/13/2021 00:08:10G,1620862732,1,0,0
+134,6,1,1,1,2,aac1cc6ca86a4038a77684fc4f8b1826,1236479c3ca64f56b30a4bb3d460970b,05/13/2021 00:08:10G,1620862732,1,0,0
+135,40,1,1,0,0,dc6233cebad549a7ae6f3baff8ed066f,d23fa1528ca24a57b929f84b503e614d,05/13/2021 00:08:10G,1620862732,1,0,0
+136,27,0,1,2,0,d447d04d89e843df9b78b199070e3b7e,87c38386ee9c43dfb1c9cbf5aee671bd,05/13/2021 00:08:10G,1620862732,1,0,0
+137,1,1,1,1,2,1ceb1a24ddb74ef1ac513509445e867c,f381a08767144f179b17d1b28801a5eb,05/13/2021 00:08:10G,1620862735,1,0,0
+138,28,1,1,0,0,b9fe5504fe694125931d79fb373d747e,39c4d9a4cfd946feb0b21c66f7f609f5,05/13/2021 00:08:10G,1620862735,1,0,0
+141,1,1,1,3,2,2ad8717c8c2740b3a10c1d62d4c72826,f8cb2e90bf944ac2a080d85485973f2f,05/13/2021 00:08:10G,1620862743,1,0,0
+142,5,1,1,3,0,a78710c8da7d4cf2b0cc77138ff5ae4b,ceec7ee41339409aa4a71d33ca6965d9,05/13/2021 00:08:10G,1620862750,1,0,0
+143,41,1,1,0,0,f07fe6acc0c548d78c161ce43af96561,652a737d87074369a2d2f49edc9dbe4b,05/13/2021 00:08:10G,1620862750,1,0,0
+144,6,1,1,1,3,db83af268d864a24b5e97d52e5d3389c,f88c1ab2d42f4d979f2cb3e0ff9f0aff,05/13/2021 00:08:10G,1620862750,1,0,0
+145,40,1,1,0,0,5a63023cdf1841a4ad044fbce6e500b5,7639dc53926741c89a67b61688215024,05/13/2021 00:08:10G,1620862750,1,0,0
+146,27,0,1,3,0,36ac4a80a9c84be18e1eb375e242af27,0176bf11e9254b18925ec3efa2c0278e,05/13/2021 00:08:10G,1620862750,1,0,0
+147,1,1,1,1,3,6b078a02979647fa830eb02979d905f8,8f71b0e192f24f7cb07c6eb7d60b768f,05/13/2021 00:08:10G,1620862755,1,0,0
+148,28,1,1,0,0,44b07da7a0034092b0763c84784f2929,7c4c8789d5c84240a1fd587071985aab,05/13/2021 00:08:10G,1620862755,1,0,0
+151,1,1,1,3,3,16f4b7ac98de4178b45a63a352982d9a,9d4f385e44d04953ab24ffe5a8c11475,05/13/2021 00:08:10G,1620862758,1,0,0
+2488,37,6,1,0,0,6b47fcdee24245d0bd0e145f313b07d6,d9e9afc22c8c468cae8480c335bd0713,09/10/2021 23:45:06G,1631316232,1,0,0
+2489,37,6,1,0,0,7b766a38decc4996a49bd215abb3fe2d,1867009f645f4912979a7ed79959a8b8,09/10/2021 23:45:06G,1631316232,1,0,0
+2490,37,6,1,0,0,30f28989beb64c75bbcb6e61c1e287ad,d9199d7934a84c729de7a072d67b4765,09/10/2021 23:45:06G,1631316232,1,0,0
+2491,37,6,1,0,0,488822e389ab43aaa0ec8333e022e2f7,bd3a0feb9f6244d6a053ff7ebc37f4a0,09/10/2021 23:45:06G,1631316232,1,0,0
+2492,37,6,1,0,0,c156354d68154c03b1cc53fc7457e90a,ab6c0799f856401282d399d53836fcf2,09/10/2021 23:45:06G,1631316232,1,0,0
+2493,37,6,1,0,0,5e27fd0b56054b24b1a123165947b385,81f242b8a06c4f55b53cbdb6f98e1836,09/10/2021 23:45:06G,1631316232,1,0,0
+2494,37,6,1,0,0,381a5a01fe9d4696b8a3e9fbcbba5f70,44fed7ea3451429c98bb0ba1ae91ce88,09/10/2021 23:45:06G,1631316232,1,0,0
+2495,37,6,1,0,0,5fb44d320fc84d5cbabfafb864a97a69,bb1e6b59135d497fb3a5c420f5b838aa,09/10/2021 23:45:06G,1631316232,1,0,0
+2499,37,6,1,0,0,0658d2aac52c4ff387d2f7b1a0919200,a8cbef7db1eb4528be9de8f18915eb98,09/10/2021 23:45:06G,1631316232,1,0,0
+2500,37,6,1,0,0,adc62da4ad9649da90bdf963ee9bd2fb,a0e8ce1f0e6c4646887662ee9d4c463a,09/10/2021 23:45:06G,1631316232,1,0,0
+2510,38,6,1,0,0,b621ccebe65c4451b4267a72095a96fb,63777b9ba5ee4e9ca6ceebec0f02f146,09/10/2021 23:45:06G,1631316232,1,0,0
+2511,38,6,1,0,0,2c79aa26700c486298c5c6117b599155,058c54242fdb45f7b566e4a5245daa7e,09/10/2021 23:45:06G,1631316232,1,0,0
+2512,38,6,1,0,0,02314bd3f1a944fe8f83a717379e7118,648d2e2c2e1449f68f66ee9dbedf77ac,09/10/2021 23:45:06G,1631316232,1,0,0
+2513,38,6,1,0,0,7368f47a3a1c4a02a7d152ba06b83a72,761e2998e3564521a7ba06c08298ee19,09/10/2021 23:45:06G,1631316232,1,0,0
+2514,38,6,1,0,0,e4d5514a49de406aa5f2a3082b7fa58a,d558d076780143c5990528b373f2c147,09/10/2021 23:45:06G,1631316232,1,0,0
+2515,38,6,1,0,0,fa272f22b13f43c2bda0d8d7b3a54e95,f5af9fb3fc594918b6e995fcd98b74ae,09/10/2021 23:45:06G,1631316232,1,0,0
+2516,38,6,1,0,0,9cabb8a782a5405891ec80c647e0b7f9,261171296b454475981e457dd5774a92,09/10/2021 23:45:06G,1631316232,1,0,0
+2517,38,6,1,0,0,6e4e38c3d44a4c03a7e95ad44f37c1b5,8901555fed0647209a2d2c64c8b100b3,09/10/2021 23:45:06G,1631316232,1,0,0
+2521,37,6,1,0,0,65b792b2878e44b0ab90f974365f0302,31aacfc2be99494290a2ffb6db735742,09/10/2021 23:45:06G,1631316232,1,0,0
+2522,38,6,1,0,0,92c90e2006c24611a1864873032b6018,c4cc40f671ac4cfaa1faea1dda57c2d9,09/10/2021 23:45:06G,1631316232,1,0,0
+2523,38,6,1,0,0,a7f522b33bdc47b6abb2b3c873dfa825,247a59ceda7f45cda0939591880f9b8f,09/10/2021 23:45:06G,1631316232,1,0,0
+2524,38,6,1,0,0,cd7445b6c9c7471e85cc359a4e3ff55e,511165f976004d5d829fa9e8d508cd6b,09/10/2021 23:45:06G,1631316232,1,0,0
+194,5,1,1,10,0,ef98489958ee4644840ed47a462e3e54,69cf4232c01f41c6af002d2920242248,05/13/2021 00:08:10G,1620862896,1,0,0
+195,41,1,1,0,0,c1732ce3fbdb428682bee732fd3c0c5d,ecbf7dfb5bad453181712f81e8194824,05/13/2021 00:08:10G,1620862896,1,0,0
+196,6,1,1,1,10,db58fe9626284f6f905e03dd605f0bb7,d93f991da4964c838608798c5ccd9321,05/13/2021 00:08:10G,1620862896,1,0,0
+197,40,1,1,0,0,911ec94192bd46bea2bb3b4bbca67437,585467216abe428ca43a3a5f0d5b1d41,05/13/2021 00:08:10G,1620862896,1,0,0
+198,27,0,1,10,0,81be4780e7d64309a2efa2ad8a3ebce9,062aecb878bd423ebcb31de0db926f84,05/13/2021 00:08:10G,1620862896,1,0,0
+199,5,1,1,11,0,78e212f5c24741f09c744a5bdd828706,7b233930ab2d4dbdb39d47bccd94121a,05/13/2021 00:08:10G,1620862918,1,0,0
+200,41,1,1,0,0,302739e621e64699a1c1dbffeef79032,919290bcb6e44a67bc849032c0047cb6,05/13/2021 00:08:10G,1620862918,1,0,0
+201,6,1,1,1,11,207fe2480a1a4947832f26e27b1c532b,a829c7f9437848ebb608b562cb8231a6,05/13/2021 00:08:10G,1620862918,1,0,0
+2533,38,6,1,0,0,2856142a61354f869aeff380cedbcbab,e2be8d6864fa43b9a1f6e0cea86ed99d,09/10/2021 23:45:06G,1631316232,1,0,0
+202,40,1,1,0,0,6cfa6d50306c437486a76d8f08050af1,e9b26524dbc148cb94aaf938d1833705,05/13/2021 00:08:10G,1620862918,1,0,0
+203,27,0,1,11,0,9ce46811d89448c0b912609d5d7d31ca,e1c7f090b3ca4637bd93b139d7f2e92b,05/13/2021 00:08:10G,1620862918,1,0,0
+206,5,1,1,12,0,cb77e89a42f44cb8899eff081d285f85,e3706ed61ae3417a8c79acacdaa572f3,05/13/2021 00:08:10G,1620862952,1,0,0
+207,41,1,1,0,0,c15d94f43cdb4da2bd23440ea58aae44,474509775d674647838974978c88b10f,05/13/2021 00:08:10G,1620862952,1,0,0
+208,6,1,1,1,12,5118209708434bbeb240f35e320a8409,3fb23effec424487824de0803450ebd9,05/13/2021 00:08:10G,1620862952,1,0,0
+209,40,1,1,0,0,329fd8630c7a4893ad97df7593f13686,a4633f98b786440bb8650bcbb38b7a9d,05/13/2021 00:08:10G,1620862952,1,0,0
+210,27,0,1,12,0,d15ca1f99d574cf3b7a63e64ed0801f0,b517db11b519444093a9d84f921f3c07,05/13/2021 00:08:10G,1620862952,1,0,0
+211,5,1,1,13,0,9fc3c75329134aadacbc57957b6f738e,126e012876364ab58d74863656556cac,05/13/2021 00:08:10G,1620862963,1,0,0
+212,41,1,1,0,0,80c90f03abbf4fa6b6782418eaffde4a,e89c301d62844833808ae41464b8bb99,05/13/2021 00:08:10G,1620862963,1,0,0
+213,6,1,1,1,13,cdd980d02319462baec628b3be12898c,133743d2475043deb9361d825e652a2a,05/13/2021 00:08:10G,1620862963,1,0,0
+214,40,1,1,0,0,a0202e23ef2f4c979baab52f27a9559f,947a9531db1348bba111db7be477de5d,05/13/2021 00:08:10G,1620862963,1,0,0
+215,27,0,1,13,0,63bfac65e1c648de858d42183135c874,3900bb2314dd4dc98c22ba7dc1e4c167,05/13/2021 00:08:10G,1620862963,1,0,0
+2547,38,6,1,0,0,3c69bc80e4eb439c95d924fa54aefc43,aae4342c860245dab43759336d29257b,09/10/2021 23:45:06G,1631316232,1,0,0
+216,5,1,1,14,0,cd9f21de7ce74d8a9f23343ae612f8d0,3713c53c4c994808a1e1636c45b5fa11,05/13/2021 00:08:10G,1620862971,1,0,0
+2548,38,6,1,0,0,b1261bc1bba645968e7e98fc09a39c3c,fefc2a5f6c514f29a006a69873d4e8aa,09/10/2021 23:45:06G,1631316232,1,0,0
+217,41,1,1,0,0,26524dc558fa4a9991784c814098fe44,964c2a13d5f448f3a0fb98203502855f,05/13/2021 00:08:10G,1620862971,1,0,0
+2549,38,6,1,0,0,e985f3a5e2a94719a73a70050681ca01,a45e3349f12a4faaa2fea5559dc5f18f,09/10/2021 23:45:06G,1631316232,1,0,0
+218,6,1,1,1,14,bb821ec1647141d88dbcc2d9d92688cb,e513898b484743db994b4a607e54a0da,05/13/2021 00:08:10G,1620862971,1,0,0
+2550,38,6,1,0,0,89ba64168f6241958d7f2da774a4de73,1f6d5e6e397f45d2883606ae8bf53007,09/10/2021 23:45:06G,1631316232,1,0,0
+219,40,1,1,0,0,c8bcc2ade64c482880d32b88ad4b319c,f4d39c4bab1e48648926e0b88216208a,05/13/2021 00:08:10G,1620862971,1,0,0
+2551,38,6,1,0,0,cdd431f89fa243f08ab9b699b54c7272,8ccd43ccf89d4df48343d46e649a727f,09/10/2021 23:45:06G,1631316232,1,0,0
+220,27,0,1,14,0,fda10f59424a46379161597dfa407b1b,11a4d2c04dcb45439844e6083bb79f04,05/13/2021 00:08:10G,1620862971,1,0,0
+2552,37,6,1,0,0,48a5ed80cdaf4cfeb59ddd6b3407c741,877a25d6e7e944afb11be762635f2a36,09/10/2021 23:45:06G,1631316232,1,0,0
+2553,37,6,1,0,0,38b6d0747fbc456a990dda5cf4495f12,801698d98df84b2ba0ba8418f2981e1b,09/10/2021 23:45:06G,1631316232,1,0,0
+2554,38,6,1,0,0,7e286c87bde046beb4399948261571e7,61024c8d9dce4b0880ed196c63f7a283,09/10/2021 23:45:06G,1631316232,1,0,0
+2555,38,6,1,0,0,c61ee255195d45e39d174ee9985bee3e,4acbbec014dd48bd80a2389d6f38cec7,09/10/2021 23:45:06G,1631316232,1,0,0
+2556,38,6,1,0,0,5fd87247548d4ef086c41bbd8f99a257,53a93184ed4d460ca390c27c3acf112e,09/10/2021 23:45:06G,1631316232,1,0,0
+2557,38,6,1,0,0,8f193717be7344ed935658e1df312c05,65cae5a1c7fc41b78d19b71c5536ae8b,09/10/2021 23:45:06G,1631316232,1,0,0
+2558,38,6,1,0,0,cfc3be6d0455477f89526c4d876704e9,86d1e7b8b2fa4eb1893b250aefa85f30,09/10/2021 23:45:06G,1631316232,1,0,0
+2559,38,6,1,0,0,c35d29b069974163b03b1687fc42441d,ce476184c17642108e7cf5a260536ab7,09/10/2021 23:45:06G,1631316232,1,0,0
+2560,38,6,1,0,0,0e0ec50867034d43a1a12acb0069417a,3b24b90f5d3b4b35a07ee76732753ec5,09/10/2021 23:45:06G,1631316232,1,0,0
+2561,38,6,1,0,0,8a7a7e88412a420295ca1eeb0280dac5,84ae9ae694f244a390c35712519078cd,09/10/2021 23:45:06G,1631316232,1,0,0
+2562,37,6,1,0,0,4ec1bc8d61d344729ffa6a9aa272051b,d84b61a09463492c9c1ffb53abe7a762,09/10/2021 23:45:06G,1631316232,1,0,0
+2563,37,6,1,0,0,2794c1040815470e9f694621207f349a,39ecc95b6bf84b0a915dcba70782e021,09/10/2021 23:45:06G,1631316232,1,0,0
+2564,37,6,1,0,0,3d786eeb277041c3b55de5bcd00c12bb,e3205194fe904e94845fb8f3ad9211c8,09/10/2021 23:45:06G,1631316232,1,0,0
+233,8,1,1,4,0,8440b9fc5abc4d77bcc8709e0d481173,bcfd5317376a47e7a7e452f168b9217e,05/13/2021 00:08:10G,1620863094,1,0,0
+2565,37,6,1,0,0,01abc7b5037b461297f24f76045bb69b,fd7f6ef1661544c9926ae29e7b947847,09/10/2021 23:45:06G,1631316232,1,0,0
+234,29,1,1,4,0,2f9c904627cd481c890a0e3231965a6d,85a7708d24e94128b8cbad75d6727a06,05/13/2021 00:08:10G,1620863094,1,0,0
+2566,37,6,1,0,0,916b475fc5674103b9bdb567be16dced,8100329b21b04d41993a778d3e8ee85c,09/10/2021 23:45:06G,1631316232,1,0,0
+235,1,1,1,4,3,01a7968d5987422b9384c5f61c3b144e,e72e965ec98d48189cddd7b54bfd3441,05/13/2021 00:08:10G,1620863101,1,0,0
+236,26,1,1,4,0,5edff73684134b099695ed23249a0c1a,760dfd1b239d42349f9fded6cfb8063b,05/13/2021 00:08:10G,1620863101,1,0,0
+237,8,1,1,5,0,5d8fcd2daae049c0887db54fea81c8b2,f093a0cb9113417a9214741f6da30d9d,05/13/2021 00:08:10G,1620863215,1,0,0
+238,29,1,1,5,0,6780fe156e6c47358e6cee613f71996a,47ab380c18ed4f9d9a1c967bd1113644,05/13/2021 00:08:10G,1620863215,1,0,0
+239,1,1,1,14,1,b44f3ed786374e529454c79417859ad4,89b76d71fdaa4dde903d1d40b183d739,05/13/2021 00:08:10G,1620863223,1,0,0
+240,26,1,1,5,0,b9de77d0d8004b0c9d3a9972b4508301,2754c9519bb84c43ac7d1b3fbde20c77,05/13/2021 00:08:10G,1620863223,1,0,0
+280,1,1,1,1,12,2652e69874254d6d86b24b445271c2b2,2828f913950a40e4907ef96a925bd0ae,05/13/2021 00:08:10G,1620864432,1,0,0
+281,1,1,1,2,12,948b6591fa184d09bf4daa7cc93b07e3,5696808fd5b24c35beee4fbb3928f871,05/13/2021 00:08:10G,1620864432,1,0,0
+282,1,1,1,3,12,b87880c41bce48359ce02e5e53523629,c82390eb81b74798b9b4b0cdb1b07240,05/13/2021 00:08:10G,1620864432,1,0,0
+284,1,1,1,5,12,5ed8700e7be746e2b492a5401c12252f,133b28b4d1314a4cbd98ba2165569c7a,05/13/2021 00:08:10G,1620864432,1,0,0
+285,1,1,1,6,12,379fbf6228304e54b4caff98ed947157,af9287467a404aaf967375d4d0d279d8,05/13/2021 00:08:10G,1620864432,1,0,0
+290,1,1,1,11,12,1328816d18464f8082b45be451e65d4a,f07f99e5c25f4b1892b38c52bd35f3a7,05/13/2021 00:08:10G,1620864432,1,0,0
+291,28,1,1,0,0,9742e8f65889466ca00b206af037ee5a,d909954d19594efca6c2f0b6d4f3fe4b,05/13/2021 00:08:10G,1620864432,1,0,0
+292,8,1,1,12,0,52a63e12d878436ba7ad3f392931a2bd,48575668b4d84a25b6d29ac6e08241f1,05/13/2021 00:08:10G,1620864463,1,0,0
+293,29,1,1,12,0,d9e16e1991c54ee9afa4c13a1f02eed7,24a6265d652e462a90d876b0f7844c6e,05/13/2021 00:08:10G,1620864463,1,0,0
+294,1,1,1,12,12,e7b216e49b704fdf92d968c2bed1e52c,7b5ad9d459ad477c866f5681cd750bcb,05/13/2021 00:08:10G,1620864469,1,0,0
+295,26,1,1,10,0,5fb759021c8e4c1582e97b5b1f3eb3ef,45c30cef53b04c7c816ed475d52d6110,05/13/2021 00:08:10G,1620864469,1,0,0
+296,67,1,1,1,0,f8ae13b8398b4d54a9d4acd0e0fa5199,8f518d709e0241409e096d3a44fcec17,05/13/2021 00:08:10G,1620864490,1,0,0
+297,68,1,1,1,0,4b7310ccb1084af8a00775704aa40a61,5fd32d2a22ab4cb78ed9307020b730f5,05/13/2021 00:08:10G,1620864490,1,0,0
+298,69,1,1,1,0,ee2a383a0b7744d89cd6fb6c3096e954,68504f07d73e4561a13c31f2439297aa,05/13/2021 00:08:10G,1620864490,1,0,0
+299,70,1,1,1,0,741b68b0f59242adb79a7e5f5dd2b311,24dfcba2f2c44ad4a02561e96b28a013,05/13/2021 00:08:10G,1620864490,1,0,0
+300,71,1,1,1,0,cf222799d2fd4cb582c90aec38d0c947,4db4df9602334569bd29b490c42cd75d,05/13/2021 00:08:10G,1620864490,1,0,0
+301,72,1,1,1,0,ed343a96ef8b4d3da2d0aad43d28b8eb,22bae10f229d4d17afd312f7d64feff4,05/13/2021 00:08:10G,1620864490,1,0,0
+302,73,1,1,1,0,70bd7233a09a4070ac6e715561a4e2aa,78892242adc046ddaa2aa96d9e237c22,05/13/2021 00:08:10G,1620864490,1,0,0
+303,74,1,1,1,0,b4af7ced311f44de93d752be64563c4a,8e507ea0a23d4043af5f6b4f2d6bb7c1,05/13/2021 00:08:10G,1620864490,1,0,0
+304,5,1,1,17,0,9bf9a132d466481fb465d6e5c37ae157,9aa0b4e2805f472a833bb7690033b1ce,05/13/2021 00:11:17G,1620864547,1,0,0
+305,41,1,1,0,0,844835f410ca4bcf8bc86a52743536bd,d681c51de6064b3897e67cfc0c79feea,05/13/2021 00:11:17G,1620864547,1,0,0
+306,6,1,1,1,17,70c149fb33644afcb7c02f222e42a0ca,94c8e0a168244f64b9a8f234de9a1e15,05/13/2021 00:11:17G,1620864547,1,0,0
+307,40,1,1,0,0,90713452549e492dae17f876ea3a8189,e941646ec4bb40c7868aefbb9129b6ea,05/13/2021 00:11:17G,1620864547,1,0,0
+308,27,0,1,17,0,12f13a3b463446e392cfcd54e747e9b6,f6be420112dd462c9f834954cfd81b08,05/13/2021 00:11:17G,1620864547,1,0,0
+309,1,1,1,1,17,2f421acb332b4d469a0069e0558df094,ffd634a38e6e4afb8ebefc3699324f07,05/13/2021 00:11:17G,1620864554,1,0,0
+311,1,1,1,2,17,5f7673809c6047418a40db79f6792a13,e188ac27642e4e14a0ca23016ab9d517,05/13/2021 00:11:17G,1620864557,1,0,0
+332,1,1,1,15,1,5dcec722f4f642939ff9c4e95473aa9e,3ca449da1eef4b82a405a1c71703c547,05/13/2021 00:14:56G,1620864852,1,0,0
+333,1,1,1,16,1,b1bd6a6eac5e4abeb87c871c950d7179,c320d1ee176b4753b1e89c56723913e7,05/13/2021 00:14:56G,1620864852,1,0,0
+334,1,1,1,17,1,2ce7bcbf543b4d69bd564f562be3cdb4,e0e209521b5649b6b428b9feb7b2b234,05/13/2021 00:14:56G,1620864852,1,0,0
+335,1,1,1,18,1,6aa6c9e3785a440f8d88bce195e1b33f,81e8fd987f3e4d91a4ca2bfeb899b446,05/13/2021 00:14:56G,1620864852,1,0,0
+336,1,1,1,1,10,155ba61e53264ff083584587b947f1eb,4a0f3da18cb84ce9a85d78292fd69a34,05/13/2021 00:36:19G,1620865074,1,0,0
+346,1,1,1,3,11,26f260cc52864502a2bfb4e6a337633d,d05ff6f4d9404b7ab41dead281e9af92,05/13/2021 00:36:19G,1620865237,1,0,0
+367,1,1,1,7,11,70973cf988e94952bffc013b1d2d87aa,4af3f4a6b8b44b80ad21c2e7f3d427db,05/13/2021 00:36:19G,1620865450,1,0,0
+368,1,1,1,8,11,27635706dd3945058a4c710f6f12d43e,48673620e90c4376b636254c823885ef,05/13/2021 00:36:19G,1620865450,1,0,0
+369,1,1,1,9,11,ea8b1c0f0f774393a825e419c907b131,5806fb806c5d483c9759c030ebaab8bb,05/13/2021 00:36:19G,1620865450,1,0,0
+370,1,1,1,10,11,67e0284191954f9099036915bb3144bd,189e986fca5442728a5312eff392cd22,05/13/2021 00:36:19G,1620865500,1,0,0
+400,1,1,1,7,13,d30bcae716dc46e282a891f6dfa9cb2a,0874bc13788c49e5a2d6857edb21bb89,05/13/2021 00:36:19G,1620865845,1,0,0
+426,1,1,1,14,13,9fb532327454477aa2230d0fc9e13328,40da305ba3e1479784ad3f787079887b,05/13/2021 00:36:19G,1620866177,1,0,0
+427,1,1,1,15,13,1119dd027fa44926aeef53f905b090f9,1cee7b2fa9bc42c398e0fa4c2b5c3634,05/13/2021 00:41:27G,1620866484,1,0,0
+2835,28,1,1,0,0,7daaec94332f4b3783ea8cdf36b39158,e26d7c0190a749fea192bb9e869be53b,09/10/2021 23:45:06G,1631317133,1,0,0
+2836,7,7,1,0,0,3cc7c87e4f3046f881e1cba2877e990d,8484c7f42906496bab206d05d8e2c85b,09/10/2021 23:45:06G,1631317205,1,0,0
+2837,53,0,1,0,0,0ab965106f514e1aab92f13cfedd1f02,30e12e8009684778a85661a98cde9f84,09/10/2021 23:45:06G,1631317205,1,0,0
+2838,53,0,1,0,0,ace9d83db793465bb3f81b71b04bc00f,e708d4f8222a4f4984a15dc2914a3463,09/10/2021 23:45:06G,1631317205,1,0,0
+2839,53,0,1,0,0,bd0192dbf26b4105b6cec932cf06aaba,6ee67423be7b4444aa786083d16b6785,09/10/2021 23:45:06G,1631317205,1,0,0
+2840,53,0,1,0,0,eb63e37c6be045d89b111733f782fe47,ab9bc1d6c1664fb1be4bb91bd77afaa0,09/10/2021 23:45:06G,1631317205,1,0,0
+2841,53,0,1,0,0,caf294aeb6214d93b84b2717e85de424,7909c5a9eb704fa1819492b3610fcaaf,09/10/2021 23:45:06G,1631317205,1,0,0
+2842,53,0,1,0,0,9037f9d7eb2b4a37b39aa4c796f0198f,eaadeda8e211463cbfa035e88297affa,09/10/2021 23:45:06G,1631317205,1,0,0
+2843,53,0,1,0,0,59329b1982854c3386fd9cdccf756078,6acd592b5fbc492889369e1c898cde5e,09/10/2021 23:45:06G,1631317205,1,0,0
+512,1,1,1,13,12,dd81370ca25a420291d733583391278a,06e8c011b735451c8fd4a49084498c5e,05/13/2021 04:33:17G,1620880192,1,0,0
+1678,53,0,1,0,0,efc44c6aed4942709d42a052e832a109,92d5b1c737e845959189108d211b2bd4,05/13/2021 15:58:28G,1620921107,1,0,0
+2844,53,0,1,0,0,5b0f9e51db9b480d81373c0bd8237291,f6b6096a0f0a4d97929b1ab6af01ea6f,09/10/2021 23:45:06G,1631317205,1,0,0
+2845,53,0,1,0,0,c3ef2303ea674b159ac7e194eaffb3f0,983e5f8d159a4a7581ff49538f7e3706,09/10/2021 23:45:06G,1631317205,1,0,0
+2846,53,0,1,0,0,f10ce8b037864313afc8f721307a1736,483dc4dcb97f4086a2c6a87cd651d378,09/10/2021 23:45:06G,1631317205,1,0,0
+1681,53,0,1,0,0,70ff2c3f930b4f9aafc5a34100ef9b25,75262717e32c412c8fb370906cf47951,05/13/2021 15:58:28G,1620921107,1,0,0
+2847,53,0,1,0,0,3606a5c0ac624f22a13a4c71b3b6448c,39352d8a1e854562a8085a04ff5198b5,09/10/2021 23:45:06G,1631317205,1,0,0
+2848,53,0,1,0,0,f4c49688b859409bb4047d4b12b25b66,0fb303fd5cbe421ca2ce26dce3bcab1e,09/10/2021 23:45:06G,1631317205,1,0,0
+2849,53,0,1,0,0,bf96f127e0b54c10aa284460871f21b2,a6a2631f86bd4f368a2e1c5e15f737e0,09/10/2021 23:45:06G,1631317205,1,0,0
+2850,53,0,1,0,0,db7740f55ba64d58be5e182e47c6500c,3eef9d0b4062494991887bbb0a77721e,09/10/2021 23:45:06G,1631317205,1,0,0
+2851,53,0,1,0,0,c409e5f22f69436b81b3d8fc34fee109,fe991d6a624d4f5689a84625b6cb65fd,09/10/2021 23:45:06G,1631317205,1,0,0
+2852,53,0,1,0,0,3e9a9f031c8a4ee2998be052993303ac,564b404034304233b091b8c5a75af6d4,09/10/2021 23:45:06G,1631317205,1,0,0
+2853,53,0,1,0,0,98ef4cffd8944eeba838205dd4c9b0f8,2204cd4464874c2d96ba9d20bbe7219a,09/10/2021 23:45:06G,1631317205,1,0,0
+2854,53,0,1,0,0,c5ed756f02c64bdfb55a73a78579718b,4db74866d86e4a5e969550eb085debcd,09/10/2021 23:45:06G,1631317205,1,0,0
+2855,25,7,1,1,0,e38d0f7a523e4755935a73038f4c377e,25ff5c4df5f2405680354edde57ec2cf,09/10/2021 23:45:06G,1631317205,1,0,0
+2856,36,7,1,0,0,06b53fdd203d43c8a8acf2393a4c0085,bfb388afe8d24db99de1e7320570146e,09/10/2021 23:45:06G,1631317205,1,0,0
+2857,39,7,1,0,0,6889399cae8b4bb5bf638d13cabafb65,a6629ec7aee044649f5d90a729aa48cc,09/10/2021 23:45:06G,1631317205,1,0,0
+1692,37,4,1,0,0,bf86e77af9784b108f8af5987d8abc35,9fb876b8d24c4037b13a686517ec9a72,05/13/2021 15:58:28G,1620921107,1,0,0
+2858,37,7,1,0,0,d319c04402a2474981ab8082fccfb064,3de1c3c94aee473cac5786ba0e3af58e,09/10/2021 23:45:06G,1631317205,1,0,0
+1693,37,4,1,0,0,dcd01daf744147368060150aa3ed637f,343669db9bf84407bd782236efb1c41a,05/13/2021 15:58:28G,1620921107,1,0,0
+2859,37,7,1,0,0,dfa3d9f98ad5476a8f01adf17c987f34,f194f20d1e164a4abc002830debb7598,09/10/2021 23:45:06G,1631317205,1,0,0
+1694,37,4,1,0,0,b46c8a18bb804ea699577897cda1e46b,460f32ed2c2c4202a0519c2e674085d3,05/13/2021 15:58:28G,1620921107,1,0,0
+2860,37,7,1,0,0,d94da56ee37044fca3d658b48fb829f9,65df2e4128a7480282b93d0d37b2ed97,09/10/2021 23:45:06G,1631317205,1,0,0
+1695,37,4,1,0,0,56f2bea32ba24591870b22e523f93acd,31f31abbe9cb466db1888029d7fe5edc,05/13/2021 15:58:28G,1620921107,1,0,0
+2861,37,7,1,0,0,c24f866b237a4e28a1831f76c35a3c9a,dcac65f084554e0b8220b9997efe7898,09/10/2021 23:45:06G,1631317205,1,0,0
+1696,37,4,1,0,0,92d6d1dd6f9046dd96df057a2d4ed7c2,810c54800dc44e31b74e2e28b628382c,05/13/2021 15:58:28G,1620921107,1,0,0
+2862,37,7,1,0,0,dc5d4f2e084c48edb0820d23e59125ea,9fb6c910683e49b5849f73b23fdd3e1f,09/10/2021 23:45:06G,1631317205,1,0,0
+531,1,1,1,14,12,4895f6d25484438fa869f485e6f33b8d,2c6d9d1f30f44753ac9f8d86e398175d,05/13/2021 05:03:53G,1620881847,1,0,0
+1697,37,4,1,0,0,9a700727ec044880bc12d69cf6cc2771,a3f48120ec084d92818787de023726e8,05/13/2021 15:58:28G,1620921107,1,0,0
+2863,37,7,1,0,0,9583520a2f784991a3d13ac99c1d2525,fb106fabd5544c3ca8141857ccccb58a,09/10/2021 23:45:06G,1631317205,1,0,0
+532,1,1,1,15,12,6bf65f6121f8423e8126a9874047fc08,1f03c1a3660d44a58eaf80805c19e221,05/13/2021 05:03:53G,1620881906,1,0,0
+1698,37,4,1,0,0,18553a28d12646559c44d4e6fa4bb180,9564b44441fc40b0b0b7a4414bd10cc9,05/13/2021 15:58:28G,1620921107,1,0,0
+2864,37,7,1,0,0,e14e870af6f34578905bb9ce7f270b94,c3132e43c1db462ba9010303f4325f02,09/10/2021 23:45:06G,1631317205,1,0,0
+1699,37,4,1,0,0,24f9197e12084b48a4eade4c100eba00,26f815ac81c8498ba7f4d4b6ed9ad33f,05/13/2021 15:58:28G,1620921107,1,0,0
+2865,37,7,1,0,0,70b9ac5a3d524d8aa344a9b4579cef03,c5f06dfab7fa41618e555901c6a319a7,09/10/2021 23:45:06G,1631317205,1,0,0
+1700,37,4,1,0,0,5d72f69ca7de4f2e956b405fa948a517,3068c7a58d28400b8958fbbb2968cb37,05/13/2021 15:58:28G,1620921107,1,0,0
+2866,37,7,1,0,0,b1b11dd8c19a4fadbe36b458a5d435a6,fe9df07d8bb2489f87396d590565b1b9,09/10/2021 23:45:06G,1631317205,1,0,0
+2867,37,7,1,0,0,bfa8a386471746cd95aa6509d2d58282,5ddbac3b5c2c4bbe8ee5b7c6de319115,09/10/2021 23:45:06G,1631317205,1,0,0
+2868,37,7,1,0,0,837c6f66c1bc46bfbcb40059cdc51b5a,16df672e4d6c4f5781e95ab1484446a4,09/10/2021 23:45:06G,1631317205,1,0,0
+2869,37,7,1,0,0,fd8bbcd357a342e1abb916f72b595ba5,bfa8649ed43b4772aab687036ba51758,09/10/2021 23:45:06G,1631317205,1,0,0
+1704,37,4,1,0,0,bfaa270aeeff4987be06d56ca2247691,06e13ac95ce4433dacba2c14b9ccc562,05/13/2021 15:58:28G,1620921107,1,0,0
+2870,37,7,1,0,0,8a602a1189c146bba86927ede29bd056,04e2774e3b414e5bad28ed25f8768914,09/10/2021 23:45:06G,1631317205,1,0,0
+1705,37,4,1,0,0,fe2da2d50ac84dd79df1afcab7e0dd81,af7ba3882b3c49269190b9072573c691,05/13/2021 15:58:28G,1620921107,1,0,0
+2871,37,7,1,0,0,78f82d21b10d456b97abe9f0c0bdd735,d5a5f279d6a841ab97bca60e1ca7c75a,09/10/2021 23:45:06G,1631317205,1,0,0
+2872,37,7,1,0,0,c8abfccbe9dc45aca26402df6692927f,af3d76b71e34450f90817349bb4681e7,09/10/2021 23:45:06G,1631317205,1,0,0
+2873,37,7,1,0,0,c718b11f3e8b4a938eeefc105d822ae1,5156e03494ad434e916a623d845fd4f0,09/10/2021 23:45:06G,1631317205,1,0,0
+1708,38,4,1,0,0,8d1ecb9ed028404a989f84b323117330,25d465adb8ed413ebb8a066cca3bccfc,05/13/2021 15:58:28G,1620921107,1,0,0
+2874,37,7,1,0,0,419ec0ac73e141058ba97777b0a44eb9,21995a7920ea4d0c96a5d68a621275e3,09/10/2021 23:45:06G,1631317205,1,0,0
+2875,37,7,1,0,0,58508b1266d44a6bb83afed6df91d521,d9de47a75b1b4fef9655f55db736a199,09/10/2021 23:45:06G,1631317205,1,0,0
+2876,37,7,1,0,0,b4ca85acfa1a4a05b0fc878c2cc463a2,20fe22b296774775b96ba7c57e1e3ec3,09/10/2021 23:45:06G,1631317205,1,0,0
+2877,37,7,1,0,0,f6a8698315cf4471b6137dbcf35f0117,c9ff1c81f4ee472f8aa8c42905ef784f,09/10/2021 23:45:06G,1631317205,1,0,0
+2878,37,7,1,0,0,c68be688918e43cabaaa17cb36ecee1b,08443b559bdf499b95d3afa1e0f5f7b5,09/10/2021 23:45:06G,1631317205,1,0,0
+2879,37,7,1,0,0,739ba09aee144c6a859947cbc2634eab,4b693748da404810a3195aada48fc251,09/10/2021 23:45:06G,1631317205,1,0,0
+2880,38,7,1,0,0,b85c370e5e9445179c0b7e31834cc292,826d05a1215f4fc2889a37cb05c5a596,09/10/2021 23:45:06G,1631317205,1,0,0
+1715,38,4,1,0,0,a14ba2e1dc3f48748cfd0b4aaf090725,0850cd4c023c44569fe5ce2998c337dd,05/13/2021 15:58:28G,1620921107,1,0,0
+2881,38,7,1,0,0,773f8936518447e28d20d1b710687480,f6ab602dcb514b03846d53da29de41bb,09/10/2021 23:45:06G,1631317205,1,0,0
+1716,38,4,1,0,0,d51dfd58d34243f78dfe8066e809ada2,d36355d1e57a40e9860de32032eb5091,05/13/2021 15:58:28G,1620921107,1,0,0
+2882,38,7,1,0,0,6be24b38594740eca98b0c07ad34f4ab,67a1daee99c94749aed6955cbe2c3a13,09/10/2021 23:45:06G,1631317205,1,0,0
+1717,38,4,1,0,0,4a001345c2164d0582eda669bdb86d32,c54494ce6b4541b69ab9b36dac708960,05/13/2021 15:58:28G,1620921107,1,0,0
+2883,38,7,1,0,0,84085c62b90a4a3f86f10948430c0b15,8f0eafc033d84bec8be8de85e0974283,09/10/2021 23:45:06G,1631317205,1,0,0
+1718,38,4,1,0,0,c20b9c360fad461ba8f4067ace15073f,bfc1a77f71884e879cf258b29ee92d63,05/13/2021 15:58:28G,1620921107,1,0,0
+2884,38,7,1,0,0,e41a2fdeb60e4123b6b330f6c5392c31,16b3f7e887d04ba28d241f5fe1699522,09/10/2021 23:45:06G,1631317205,1,0,0
+1719,38,4,1,0,0,0ca89ca44aaf46da9328552f43d86043,5cae19744c7f4c9d80f762514b28f576,05/13/2021 15:58:28G,1620921107,1,0,0
+2885,38,7,1,0,0,1682318f087f4db1afacb704747e459f,28728fe430c34d26a7f75c8e22380eb0,09/10/2021 23:45:06G,1631317205,1,0,0
+1720,38,4,1,0,0,300582ceeac74588b3ea1a434ed884f3,139bc329e77f4061a70a06ffaa12d41a,05/13/2021 15:58:28G,1620921107,1,0,0
+2886,38,7,1,0,0,4361e899cb53410da23ce44a97cec779,5b4e07785fab46ef87ac62ef0cc6b3ae,09/10/2021 23:45:06G,1631317205,1,0,0
+1721,38,4,1,0,0,5a8e3a1461544089bb209761dffdd49b,fb721db94dac44d59abeddbd111b9db5,05/13/2021 15:58:28G,1620921107,1,0,0
+2887,38,7,1,0,0,94809fb6ba154664ad7c4347f56c41ea,5942d3378be74a319273cd56f7ec594a,09/10/2021 23:45:06G,1631317205,1,0,0
+1722,38,4,1,0,0,c66dfe7e929f4f9996069d74b533437a,bc4fcc66bda847f6870ee99196182287,05/13/2021 15:58:28G,1620921107,1,0,0
+2888,38,7,1,0,0,9c9ae4cea25b436097f20967bf7dcb98,cef7ec717a564b3e9a5ba156b2f4a546,09/10/2021 23:45:06G,1631317205,1,0,0
+1723,38,4,1,0,0,0d9b18d6052b4ec98187b4acf8b150a6,3dd519c1d5ba4808bebb7f87dd4dd091,05/13/2021 15:58:28G,1620921107,1,0,0
+2889,38,7,1,0,0,202d4368746f441c861a9ef04530a267,7ffa966358f74fde90ead00820205bc1,09/10/2021 23:45:06G,1631317205,1,0,0
+2890,38,7,1,0,0,7411554751214483b02258249ae7d224,358570f6ed204e558141a48555f3cf93,09/10/2021 23:45:06G,1631317205,1,0,0
+2891,38,7,1,0,0,f0598f88709942098adbf2afc7cf6779,dd673146af52455785ebeee132d24553,09/10/2021 23:45:06G,1631317205,1,0,0
+1726,37,4,1,0,0,a4937d1ff0104be5bb89b0acf41b7c01,b5e07d9d4bbf40e0921683d64faa9f05,05/13/2021 15:58:28G,1620921107,1,0,0
+2892,38,7,1,0,0,25b46de7000b427c9c96dbcfd8772d52,095bb5826407413183b9dd86e31979b1,09/10/2021 23:45:06G,1631317205,1,0,0
+561,1,1,1,10,14,75f52857dde642c49d9203bc764bcd01,a18d975574dc402abb9e5b4fd57c7815,05/13/2021 05:03:53G,1620882211,1,0,0
+1727,38,4,1,0,0,7a8ca878077444a095d5f18f820d9e21,aaf4d7c35ca34f72a709a733418db652,05/13/2021 15:58:28G,1620921107,1,0,0
+2893,38,7,1,0,0,fa5a5cd3ca4e464f9c1e2dc2fcb0fb73,90faa57440d74ca893661b28617268f3,09/10/2021 23:45:06G,1631317205,1,0,0
+562,1,1,1,9,14,c83a553b662a44e89b3cf8017d002579,e45c23c668c34ea49c27fa287d4b9da2,05/13/2021 05:03:53G,1620882211,1,0,0
+1728,38,4,1,0,0,fca379ba00bd49058e4ae9e4dd57a83d,1279821433ef458ea4320a531fefdaa5,05/13/2021 15:58:28G,1620921107,1,0,0
+2894,38,7,1,0,0,dc60ad79e8ee466486e9bfd4c7e78542,b3f600fea471478781ad80408bcc714d,09/10/2021 23:45:06G,1631317205,1,0,0
+1729,38,4,1,0,0,fad4ee9fef6d4be69242a806978e9505,de73dfc57f2e4b70983ccf5e52252e50,05/13/2021 15:58:28G,1620921107,1,0,0
+2895,38,7,1,0,0,b248b121dff746788173a905bea7f527,e776bf399e9d4e67b4554218681ec073,09/10/2021 23:45:06G,1631317205,1,0,0
+2896,38,7,1,0,0,622a8573a37b49338f6c84ccf36c53a3,d8dcd86ae14f4963929025c92c018c7d,09/10/2021 23:45:06G,1631317205,1,0,0
+2897,38,7,1,0,0,3c8ffe3e54234234ab36405b094c29a4,fb3ced1927394a60b038b931b08ed8b7,09/10/2021 23:45:06G,1631317205,1,0,0
+2898,37,7,1,0,0,038166a74a084a2080ad25326190f075,611fda461bf24e84a5c1254931db5cb0,09/10/2021 23:45:06G,1631317205,1,0,0
+2899,38,7,1,0,0,766942f3ff914cb6847364f0961317b6,a713136af14c4c8e8c3a2926f4d3d3d6,09/10/2021 23:45:06G,1631317205,1,0,0
+2900,38,7,1,0,0,b03b9e8c777b4e638aabdcc87451a40f,0cecae75a71f404aa34a9baf0ba28ff8,09/10/2021 23:45:06G,1631317205,1,0,0
+2901,38,7,1,0,0,e3af68744c684021b16c2e5646684da8,9b079a53401f495ca997be4b2a2c5ae2,09/10/2021 23:45:06G,1631317205,1,0,0
+2902,38,7,1,0,0,19eb8eae05974fe58fe051c4fa8e8435,6b97745e63d047a990994aeeaae511c1,09/10/2021 23:45:06G,1631317205,1,0,0
+2903,38,7,1,0,0,1081520ac7d441a88bc446425ec04e5b,c5cf524221b4413f998bd6b62f2baa85,09/10/2021 23:45:06G,1631317205,1,0,0
+1738,38,4,1,0,0,ab731e6537f74c1b864c0674d853a575,ab49736283934cd59e78f1179fba1b68,05/13/2021 15:58:28G,1620921107,1,0,0
+2904,38,7,1,0,0,7e2bbfc932634fdc86e52197c57ffb19,5a893a2d82cf458ca544a07d82e01787,09/10/2021 23:45:06G,1631317205,1,0,0
+2905,38,7,1,0,0,258208e445774271a23a0d95826a7b21,ce617ad0acbb42febc7659657f0556b4,09/10/2021 23:45:06G,1631317205,1,0,0
+2906,38,7,1,0,0,cb7defb914a5433eb9d053c1081a3a2b,a3ed63b6069247ff862f13acd4dc48d6,09/10/2021 23:45:06G,1631317205,1,0,0
+2907,38,7,1,0,0,68fd6fa440d246baa7cec5d3f4d927c9,9fb2e77c5aed46a08e5c2e101129f29d,09/10/2021 23:45:06G,1631317205,1,0,0
+2908,38,7,1,0,0,806c40f5f5c8480cb8f7b5f25652d5fa,4071c74b79a54f55b7d8393717e4a52b,09/10/2021 23:45:06G,1631317205,1,0,0
+1743,38,4,1,0,0,e9356b48956540a0b6d2e4c4442fc88e,0d50b0a1f5f646b3bd7c620441c16766,05/13/2021 15:58:28G,1620921107,1,0,0
+2909,38,7,1,0,0,bd00715efd824ca5919ce4f169bb1124,160913b571644dbd93c66338155baae2,09/10/2021 23:45:06G,1631317205,1,0,0
+1744,38,4,1,0,0,d72f265cb100464183f3e3e3c5227a9c,9e27ff28664f43a98b805041cf901a36,05/13/2021 15:58:28G,1620921107,1,0,0
+2910,38,7,1,0,0,909764977f224f60a2c5b8022e66d41c,24284a920ee644ab8873cde459930c24,09/10/2021 23:45:06G,1631317205,1,0,0
+2911,38,7,1,0,0,280e3b697874484194d27fbad1463275,3bf49800a035475596195acdc10ca7d5,09/10/2021 23:45:06G,1631317205,1,0,0
+2912,38,7,1,0,0,361d8ffc041c4e978cde3b25f5cb711e,2a89fd97dac148059cca0e9cec8623cf,09/10/2021 23:45:06G,1631317205,1,0,0
+2913,38,7,1,0,0,ff4326ea0521480b9699be25006a9718,1ec1e6dd08bf4ca6ac76bde3f298a424,09/10/2021 23:45:06G,1631317205,1,0,0
+2914,38,7,1,0,0,597dd2fddd89425f814be94abefed2c6,962f29442ce14dd892f8fd7f45def8b4,09/10/2021 23:45:06G,1631317205,1,0,0
+1749,38,4,1,0,0,26733f69dba5422d83b1cbe95dc2ebed,f0425d4d72c34748aebd6373eef79b9f,05/13/2021 15:58:28G,1620921107,1,0,0
+2915,38,7,1,0,0,a860455972a44d999f851bfbac0d8151,f9bb07ec16eb43d49e84619c81b8404c,09/10/2021 23:45:06G,1631317205,1,0,0
+2916,38,7,1,0,0,b2ea711ef2c047618318d5506fa169b6,e7709d70d31944b6948505f9324b3ce6,09/10/2021 23:45:06G,1631317205,1,0,0
+2917,38,7,1,0,0,07ec11be9cbc4ca693dc3d64ea4b6ef3,a51183eed63a4303900d8978a789ebc7,09/10/2021 23:45:06G,1631317205,1,0,0
+1752,38,4,1,0,0,6da408eb6df740bb91699d6898d5fa26,a4581ee356374c5ca31627bfbee82d3f,05/13/2021 15:58:28G,1620921107,1,0,0
+2918,38,7,1,0,0,eea748fba43c4324ba5c84693d3ff9c7,157595d1d4734552bf8ba3a625a78218,09/10/2021 23:45:06G,1631317205,1,0,0
+1753,38,4,1,0,0,aa6d18fe1ded42f4b15f2d6ef87a85f5,1a3e8338553e4efbadbc34cfe9ef792e,05/13/2021 15:58:28G,1620921107,1,0,0
+2919,38,7,1,0,0,9fe25be6839a44bc8d2c0f74fc1d8472,8018bbc4fc4046859e4d7cd04f51cf22,09/10/2021 23:45:06G,1631317205,1,0,0
+1754,38,4,1,0,0,81e593f275b141c3bbe3d216cead32e1,00281c422cbf4461af79bfd46ea92c8c,05/13/2021 15:58:28G,1620921107,1,0,0
+2920,38,7,1,0,0,eb0017c0e4f64ebca0f71923f4ad64d5,b9f4212c267242b2aa0cf77444f6b2b7,09/10/2021 23:45:06G,1631317205,1,0,0
+1755,38,4,1,0,0,f98f90793b83405b90d2928cdb759559,41b43b37567d47db9c681a9b45dbe026,05/13/2021 15:58:28G,1620921107,1,0,0
+2921,38,7,1,0,0,e9d7c7e4c68d49fcaa078f9221e45da1,fe6cf6564a314b8ab07505f82069ddd3,09/10/2021 23:45:06G,1631317205,1,0,0
+590,5,1,1,24,0,ea83c57b6ab743a0a820453052513451,51ce0234374248519aa156a824f9f12f,05/13/2021 14:21:06G,1620915318,1,0,0
+1756,38,4,1,0,0,9881cb4c52e640db83e26896478fdc9c,b300340801fa40659bf929accca67a4a,05/13/2021 15:58:28G,1620921107,1,0,0
+2922,38,7,1,0,0,613b9cd567004878b380571d9a847c1d,964a0e33a14f41089b3b80414c6bfafe,09/10/2021 23:45:06G,1631317205,1,0,0
+591,41,1,1,0,0,50839f2fcb254fceac75febbc78a613e,7736431c26554f2880683f1e5508599c,05/13/2021 14:21:06G,1620915318,1,0,0
+1757,37,4,1,0,0,1d92772f7ab149d28c4cab9a6cf6e26d,913f7da9048349a4b7a7dc3a45125a2e,05/13/2021 15:58:28G,1620921107,1,0,0
+2923,38,7,1,0,0,f89bb7ab409b4b2484c72ee592e909f4,a7f60688051f40d0baf485fc296df5f8,09/10/2021 23:45:06G,1631317205,1,0,0
+592,6,1,1,1,24,e3136112c575457483595da85cd5f991,ce2db3ca9f7d4e67aae5328bc502b66b,05/13/2021 14:21:06G,1620915318,1,0,0
+1758,37,4,1,0,0,3dc4907ab03141ff88dff8b2dbb04e36,1af54e8a4b774661bd2b589d3d6dcf2a,05/13/2021 15:58:28G,1620921107,1,0,0
+2924,38,7,1,0,0,f78600e12d584485a61f939ae6555845,deac389e9f984473b124b1b043da8cdd,09/10/2021 23:45:06G,1631317205,1,0,0
+593,40,1,1,0,0,b7940febbb1742d994d28351dd3cdeed,72a13ccb77814927878bf9baf1ca3803,05/13/2021 14:21:06G,1620915318,1,0,0
+1759,38,4,1,0,0,14de4757023840caa5e5cabb362ae0ac,94ea90063380468e8fdbf17f719304eb,05/13/2021 15:58:28G,1620921107,1,0,0
+2925,38,7,1,0,0,f9080d55da2344fc811514d470f5351e,385153d16f214fe28d875a4e13f13d2b,09/10/2021 23:45:06G,1631317205,1,0,0
+594,27,0,1,24,0,375804babb674a6c89b3d3a82e43db58,1f79dea7c4994ee2b717806fea51b5f9,05/13/2021 14:21:06G,1620915318,1,0,0
+1760,38,4,1,0,0,bb324866bee04048985512bbd8e0a6c9,5226ab66007548eb910166c23ca780f2,05/13/2021 15:58:28G,1620921107,1,0,0
+2926,38,7,1,0,0,eba6bd85c03443088b6ac3a63d1c8471,d66322dd35f44a12ad92f8238d5e3ca3,09/10/2021 23:45:06G,1631317205,1,0,0
+1761,38,4,1,0,0,5310815896344f25bea8e227334dcb1b,c45ed78abf164816986d6a758e07cd24,05/13/2021 15:58:28G,1620921107,1,0,0
+2927,38,7,1,0,0,6f93401b3f83498d866e5fd7e1f30ea6,2be8470372204ea28fd512d303683789,09/10/2021 23:45:06G,1631317205,1,0,0
+1762,38,4,1,0,0,3969c87a32544ca199b26541f3118ee4,d7d81b36183a4cc493ff22f7f3f0107a,05/13/2021 15:58:28G,1620921107,1,0,0
+2928,38,7,1,0,0,7fb2b90ce55040728877f85fa6dc15b5,07958083667a42b0894c0598a4a17372,09/10/2021 23:45:06G,1631317205,1,0,0
+1763,38,4,1,0,0,f389e86be5024607af5875b0007a2d23,07a6ba35eda847c48c1dbaab13882a00,05/13/2021 15:58:28G,1620921107,1,0,0
+2929,37,7,1,0,0,340c8c27a0104b3f905717c9c8d3058e,fc20cca3b6414852954d423ded8999b9,09/10/2021 23:45:06G,1631317205,1,0,0
+1764,38,4,1,0,0,67a2912074b34e3da9a31fac1b042c2b,b1f1119c730b46cda773bc8eef55a0e4,05/13/2021 15:58:28G,1620921107,1,0,0
+2930,37,7,1,0,0,f97c6fa61d9741fbae1cbb66cf2dd649,8d5190aec669445d907a638823b3be21,09/10/2021 23:45:06G,1631317205,1,0,0
+1765,38,4,1,0,0,bf89101cf63542c492119bbb4353dee1,552f8295b90e46d69b940ee67e57e4f5,05/13/2021 15:58:28G,1620921107,1,0,0
+2931,38,7,1,0,0,04c36c189a874938b8373f334e912c2a,87eb14fe9c074f5fb00e147bd3a9b0df,09/10/2021 23:45:06G,1631317205,1,0,0
+1766,38,4,1,0,0,7b081c82b3ad43ff8aa9acd498c148a9,c8b013642fc04c4c9117707c43bfbaee,05/13/2021 15:58:28G,1620921107,1,0,0
+2932,38,7,1,0,0,34cb690f50ef4c8db4835c90c572a63b,ab34e68a740b472397e365cef38faf41,09/10/2021 23:45:06G,1631317205,1,0,0
+1767,37,4,1,0,0,ab9e824ac913423fb506e4c33df21308,47adb347409c48bba1ca560534ef356c,05/13/2021 15:58:28G,1620921107,1,0,0
+2933,38,7,1,0,0,16a27dea904c401baed05d3c810481e5,f9d7fdad1a33465f882bc84dc710a85f,09/10/2021 23:45:06G,1631317205,1,0,0
+1768,37,4,1,0,0,fb824b832339478b83bcc24785eafab0,a7fb6a88c9f145cc8e666561682f170f,05/13/2021 15:58:28G,1620921107,1,0,0
+2934,38,7,1,0,0,293450f084e247b38690de0495c6e52f,85d8dcc0a3134d4aa52bb4bc20e09bfd,09/10/2021 23:45:06G,1631317205,1,0,0
+1769,37,4,1,0,0,6124bb730d4c4159be11fa70cab67f08,3f13aa6f0fb44caf881a6ea09a06e25a,05/13/2021 15:58:28G,1620921107,1,0,0
+2935,38,7,1,0,0,7f145c92aa1c4a5ebcde92ad26573048,ad0cda3bb731416c9ec6eb9c3ea9f668,09/10/2021 23:45:06G,1631317205,1,0,0
+1770,37,4,1,0,0,9de8f1095af54f62ba3241195f2c4e6f,74fcede1c6e2400fbc046fccff0babd6,05/13/2021 15:58:28G,1620921107,1,0,0
+2936,38,7,1,0,0,7711f6d3444446a19e6403a44ea58277,1eb468d3281b46eb87b24111ff75df68,09/10/2021 23:45:06G,1631317205,1,0,0
+1771,37,4,1,0,0,7f802456ae6b4fe796ffab6d9462183d,72ed4bff62084cb5b1fec90ed942cb43,05/13/2021 15:58:28G,1620921107,1,0,0
+2937,38,7,1,0,0,4fab1c9ad1eb4745a6c81ec55b76e9df,6c1ac755e4974d6a93716d65bd4ab15f,09/10/2021 23:45:06G,1631317205,1,0,0
+2938,38,7,1,0,0,2533eac59a1247038621ac8f4bf3ea72,a6ca06de6e0d4618ac764869f6534ee5,09/10/2021 23:45:06G,1631317205,1,0,0
+2939,37,7,1,0,0,34aa2aeefc1841899a03b5743167c6ef,f582131c59a44099b1b77a6448b54c3d,09/10/2021 23:45:06G,1631317205,1,0,0
+2940,37,7,1,0,0,fc7b4657615c45c8a81931064c035af6,1b361774e35e4c16afc23e53188c89c7,09/10/2021 23:45:06G,1631317205,1,0,0
+2941,37,7,1,0,0,fe0513c9d9174613a606401c9c93934a,a493e3842d4a43dbb7bbccab7732beb7,09/10/2021 23:45:06G,1631317205,1,0,0
+2942,37,7,1,0,0,fa8fbbe086c94db8ae72e48b65e9e3f6,60fd011eff9d4fc3867addade639f7e7,09/10/2021 23:45:06G,1631317205,1,0,0
+2943,37,7,1,0,0,8b22ecc05c0d4b9fb96ae9abf799eae4,d1c946dc60794719990edf017e254607,09/10/2021 23:45:06G,1631317205,1,0,0
+2944,50,0,1,0,0,005277cd90034ee0992aeebe35ee81c2,b72be5ce31c747a6a4e3a70ac16b4f3c,09/10/2021 23:45:06G,1631317205,1,0,0
+2945,51,0,1,0,0,83faac1d460b4a99a4875cb13fc4519e,81fa688e93ba4b7687ffbc80f15c982e,09/10/2021 23:45:06G,1631317205,1,0,0
+2946,52,0,1,0,0,b66fce80b2ef4d62bea2ab960d306b13,1835587b87964a5ab6bf751911632b51,09/10/2021 23:45:06G,1631317205,1,0,0
+2947,51,0,1,0,0,c4d8e6fb799c4569b792740a06c70e89,3f6df7c6a5654dd79dd5c8ada3497d50,09/10/2021 23:45:06G,1631317205,1,0,0
+2948,52,0,1,0,0,9edfad5d149847ea9cbff75970a460cd,a5c79f4f1da04edca02e98cf5ab7bde6,09/10/2021 23:45:06G,1631317205,1,0,0
+2949,5,7,1,1,0,4b1ebf790954448d99c71cbdac473326,be7f8f4821384aedbe804b34e1212295,09/10/2021 23:45:06G,1631317205,1,0,0
+618,1,1,1,8,24,1e9e1bf8ba1b49059cdf9b0e6f7c5524,dbda2b15ded14ae889a39115bacbe9af,05/13/2021 14:21:06G,1620915637,1,0,0
+2950,41,7,1,0,0,74315f81c4524c95a7450ab967744e68,a81cf7fdde384be8b068a243da6a3d5e,09/10/2021 23:45:06G,1631317205,1,0,0
+619,1,1,1,9,24,16406b6830d3406c991243d0fc4f1b73,d1f7e4f2fae04cfb9fe025b248ff8e18,05/13/2021 14:21:06G,1620915637,1,0,0
+2951,1,7,1,1,1,9707e81355364d9684296a541e0f80a9,0dfcc9bd69ff418a85dbb1289f2d500a,09/10/2021 23:45:06G,1631317205,1,0,0
+620,1,1,1,10,24,940908e8a683478a82397f13caaf13ee,e6313a740e2b4eb9825284b5ab1cec78,05/13/2021 14:21:06G,1620915637,1,0,0
+2952,1,7,1,2,1,5ee95d3b8f4b4084afadbd8305f6ae49,a3eef90c02734a8c9bd71418c541811b,09/10/2021 23:45:06G,1631317205,1,0,0
+621,1,1,1,11,24,b025f4eefac040658d39cab420d4aac4,ed9949c8499244f3877c19f514c3cbd7,05/13/2021 14:21:06G,1620915637,1,0,0
+2953,1,7,1,3,1,bffaf73e93234eac8104904aaba914d8,531e5d5de5ba477ebb090015605b7fb6,09/10/2021 23:45:06G,1631317205,1,0,0
+622,1,1,1,12,24,70f7c011b58d4f90a2f1baf7470b9cda,2aca964051b744f297e449b4d29eda92,05/13/2021 14:21:06G,1620915637,1,0,0
+2954,1,7,1,15,1,e9a2023f3e8f403b87bc4539fb73cd9b,23989f9927f74a818e5a3ad5a868d8e2,09/10/2021 23:45:06G,1631317205,1,0,0
+623,1,1,1,13,24,23e054fee1874e338800143ac34b0a73,fbd157f2c7ba489d824db43b099307d4,05/13/2021 14:21:06G,1620915637,1,0,0
+2955,1,7,1,16,1,187b343280ae402d885759b76ecb79b0,ff01d2419e194cc2abb0f9e1de2c69d5,09/10/2021 23:45:06G,1631317205,1,0,0
+2956,1,7,1,17,1,f507cbea99e64746a0656d94f3c1cf02,ac62f0347608443abb6d828ba1147bc4,09/10/2021 23:45:06G,1631317205,1,0,0
+625,50,0,1,0,0,e64dca4a392540fb9ca17e432846db55,10e4638faf8a4fc79914cfbc5276b8e0,05/13/2021 15:46:44G,1620916102,1,0,0
+2957,1,7,1,18,1,314be96b5f474bc2a3f83551710ab555,165bc635150b4b6280f797fad65e9995,09/10/2021 23:45:06G,1631317205,1,0,0
+626,51,0,1,0,0,a9e395d158e14418833e3a401fb8d946,065933cc434745db8f7bd5f8aff198b8,05/13/2021 15:46:44G,1620916102,1,0,0
+2958,1,7,1,21,1,f1c8ed0d79b448c5a416d8651c9711bb,27707845716e447784c9ab5050238f51,09/10/2021 23:45:06G,1631317205,1,0,0
+627,52,0,1,0,0,be3dfa0c037946bc83716a156d45092f,c8ee1e344edc48b29c8bf7e4c02adfc7,05/13/2021 15:46:44G,1620916102,1,0,0
+2959,1,7,1,22,1,a70c83c11681498cb49a10725f4e1813,5670f1c385fe4543b3c6f712326124cf,09/10/2021 23:45:06G,1631317205,1,0,0
+2960,1,7,1,14,1,eec2ea60a2554c049abc506fa0c46b99,73d9f2fba54244d0a156f21c9e9929ee,09/10/2021 23:45:06G,1631317205,1,0,0
+2961,6,7,1,1,1,0470043dc7ef4b879365a3001bb06f5f,4d297cd2edd8425e97bb17d85f5175c7,09/10/2021 23:45:06G,1631317205,1,0,0
+2962,40,7,1,0,0,2d69f7670c624ab0b61fef6841683910,40bc5eb1518b4bba8c19c9537b3177b4,09/10/2021 23:45:06G,1631317205,1,0,0
+2963,28,7,1,0,0,f028aeef94144d35ad64dfef8a32953c,81b8a7d713a345c5aa1f9d16b6caa455,09/10/2021 23:45:06G,1631317205,1,0,0
+2964,50,0,1,0,0,2945852cf545475c88e3f00e53124df9,140c11dd877e417a8701111e143a13d7,09/10/2021 23:45:06G,1631317205,1,0,0
+2965,51,0,1,0,0,5ad37a5c6c3e49a0a4a8b5b4285b9c24,ef8f0f8e4ff24c9bbc4d00c30590cf46,09/10/2021 23:45:06G,1631317205,1,0,0
+2966,52,0,1,0,0,dc7fe604b4454a9993e4ec22fc8c1f06,98870b2fdd324790a40fa216724af622,09/10/2021 23:45:06G,1631317205,1,0,0
+2967,27,0,1,1,0,531cdc9c210c480e9416c308b6ce93da,e799916d02e343328b2e3301c3e1aabd,09/10/2021 23:45:06G,1631317205,1,0,0
+2968,5,7,1,2,0,8ce66e185a074e8eb9062f0c2866fac9,4ffd4bf0eb24412da55cd5aa91bafe30,09/10/2021 23:45:06G,1631317205,1,0,0
+2969,41,7,1,0,0,a9d0c30985eb4426966a6bf0cdb47794,31f1a538566f45afb5860fc2d6ce6384,09/10/2021 23:45:06G,1631317205,1,0,0
+2970,1,7,1,1,2,847c05bcc21b4a5583d7ff973cd8ead8,35b9eb1f86004c238c829d7b51f60d1e,09/10/2021 23:45:06G,1631317205,1,0,0
+2971,1,7,1,3,2,3c9693a50862437ea26b705e4f467d5f,91fbee765a484feab87c5489a41f6a61,09/10/2021 23:45:06G,1631317205,1,0,0
+2972,6,7,1,1,2,91a3c027c2034ce089e1b924076254d8,64e9b9936b54481ea0f6256150110fa3,09/10/2021 23:45:06G,1631317205,1,0,0
+2973,40,7,1,0,0,cb949fe48df3483bab45c51b3c5ab506,bd0bc70032424ccd99675ba184913fc2,09/10/2021 23:45:06G,1631317205,1,0,0
+2974,28,7,1,0,0,7ea60236575b457f9e2be0910dc8fb2e,4f7aa789923e4847a8bca7a44199228c,09/10/2021 23:45:06G,1631317205,1,0,0
+2975,50,0,1,0,0,3437238a84a4422ba4f03174e5a20d42,545a84bd05d84340aa58fb0cd5233261,09/10/2021 23:45:06G,1631317205,1,0,0
+2976,51,0,1,0,0,61840cc538214f1281b275a176633f00,fbdec3a9b2ad408299fce2066464bc43,09/10/2021 23:45:06G,1631317205,1,0,0
+2977,52,0,1,0,0,e9b1083b22984724bd541e9ea42707d0,e79d7fecbb2e45479782a7505b4dbec7,09/10/2021 23:45:06G,1631317205,1,0,0
+2978,27,0,1,2,0,c10c308b21574aa0b6663e1f3a33a796,6a96fda0798c42cebeafe476ca85652d,09/10/2021 23:45:06G,1631317205,1,0,0
+2979,5,7,1,3,0,0e4f81b28fbc4ea1b2778dfc18387de7,37eaebdc597b4393987c4a85ef31df3a,09/10/2021 23:45:06G,1631317205,1,0,0
+2980,41,7,1,0,0,a9a254ed727040c5ba96e6c4bd178aca,e89a3a1155fb496ab534c4d7703805cb,09/10/2021 23:45:06G,1631317205,1,0,0
+2981,1,7,1,1,3,c6021d114eb643e9984ef084e8280b39,c4eb9717b07e4d8c9e4fb52c33f35f5d,09/10/2021 23:45:06G,1631317205,1,0,0
+2982,1,7,1,3,3,51820005e90b44ffaf67c3ad86cc610f,c72e3432758046c29d8a6aa8e51811ae,09/10/2021 23:45:06G,1631317205,1,0,0
+2983,1,7,1,4,3,9f54a8d0e3074ecb90368492ed6147ba,20ead14413ee4e00be803d4749e96a97,09/10/2021 23:45:06G,1631317205,1,0,0
+2984,6,7,1,1,3,ab8f1cb5b4014d658271bab56b21f072,283c2c95bb84423aa64b9502d24e2d34,09/10/2021 23:45:06G,1631317205,1,0,0
+2985,40,7,1,0,0,a080322fac31441eb3f6e883f68ad7ff,3d4f9ba4dbc941a7bfe6f16d75fd8b0e,09/10/2021 23:45:06G,1631317205,1,0,0
+2986,28,7,1,0,0,176f1e07567a409eb1d9f90f327ff46a,a96e036a5e6d434e86d8e2e6412b9fef,09/10/2021 23:45:06G,1631317205,1,0,0
+2987,50,0,1,0,0,9177e436b8064452a03f8b1459db39de,9b0f51e93a4444cfbadef312ab8185c2,09/10/2021 23:45:06G,1631317205,1,0,0
+2988,51,0,1,0,0,7f96a6aca92a4a73aef5fe767cfcbb51,d81aba279a464d3395f62ef9c3d64041,09/10/2021 23:45:06G,1631317205,1,0,0
+657,37,2,1,0,0,07e9ff68886b499a89c8d1ef40d9a19c,86b6aca181884bc592f31a7741593cd2,05/13/2021 15:46:44G,1620916109,1,0,0
+2989,52,0,1,0,0,bd831ff1bdd54cb987e8972bdb6b0aa1,ac30c1e50e4944d68c95c20914ed84c3,09/10/2021 23:45:06G,1631317205,1,0,0
+658,37,2,1,0,0,e631cba0f6f94e5fbb9d0b2e24686af4,e6cc420a6d3544f5b25a814c5f895d73,05/13/2021 15:46:44G,1620916109,1,0,0
+2990,27,0,1,3,0,35472636fde9443d8f3d87c0896ba25b,aa98faca947d436894260bf801428506,09/10/2021 23:45:06G,1631317205,1,0,0
+659,37,2,1,0,0,191f43e23e4d447a896b69f4cccbc3d9,c146930fc23d4167b52fda695fb6e4a4,05/13/2021 15:46:44G,1620916109,1,0,0
+2991,5,7,1,10,0,e2a9d30c545540be9cd0995b6d76c6d1,9b9680ab89d045f0a5cc808dbe8de02c,09/10/2021 23:45:06G,1631317205,1,0,0
+660,37,2,1,0,0,f2f07190f3694c68b9c528affc6284d8,e4154eb83ea44afb94cf746191e8b697,05/13/2021 15:46:44G,1620916109,1,0,0
+2992,41,7,1,0,0,eb4d9a87500240f496e3a591869dc9e6,ab7a3f9f7f7f4d56848a7e3b1d4d8ad5,09/10/2021 23:45:06G,1631317205,1,0,0
+661,37,2,1,0,0,53e95e73126749aea986acf67446cd69,cd00904b44cf4e90ad9f7b009ec7483b,05/13/2021 15:46:44G,1620916109,1,0,0
+2993,1,7,1,1,10,38b76a744bac422996f8c3cac8f799c2,9c06a4b5ef2646b5a9bd0ab54f74717a,09/10/2021 23:45:06G,1631317205,1,0,0
+662,37,2,1,0,0,9dddff25c2ba454e8f9d734832bcf953,5a2cd8e42e6c4cc684a75d45530015e1,05/13/2021 15:46:44G,1620916109,1,0,0
+2994,1,7,1,6,10,6a5a8d7efbf14c938f74f9b26b4e8082,6eeedb4739b047f9b6f1621195173e66,09/10/2021 23:45:06G,1631317205,1,0,0
+663,37,2,1,0,0,09728cf2818942659a749ff76d8a0879,1e4650be2e02400c97a0de2411b47827,05/13/2021 15:46:44G,1620916109,1,0,0
+2995,1,7,1,7,10,3703ff017d484273a5bb667e55a7febd,2e942e2811fb48b09ef49131d8a89408,09/10/2021 23:45:06G,1631317205,1,0,0
+664,37,2,1,0,0,be4ea59ffc264a438c48bb3d07e3f00e,b10b0019fbca4e0f9dc53ed91f0ccc39,05/13/2021 15:46:44G,1620916109,1,0,0
+2996,6,7,1,1,10,745ebc237379415cbf1d41d83cd23c67,495a3e157287426cb7804fa785c04e77,09/10/2021 23:45:06G,1631317205,1,0,0
+2997,40,7,1,0,0,8edd470ae24643a680e03e2e9060fbd4,98433062c39f439e85c9c590987f1628,09/10/2021 23:45:06G,1631317205,1,0,0
+2998,28,7,1,0,0,8af28b2931a942869ce2f1a5a1dc7409,8efbb644634d4e689e179f842a19a625,09/10/2021 23:45:06G,1631317205,1,0,0
+2999,6,7,1,2,10,6b249487006848a59d09bb94ecd4294c,3209781f79de4a6b84c74ec49f8dcb23,09/10/2021 23:45:06G,1631317205,1,0,0
+668,37,2,1,0,0,444d5a57a964440d9cfb6e1ea4d6922a,636b6dd580a44c2bb021986dc6e3edb1,05/13/2021 15:46:44G,1620916109,1,0,0
+3000,40,7,1,0,0,2edbf30fa5d245b8a26c8790d0eb7f04,fc76be82f79e41a5a3ae4c2795dccdb5,09/10/2021 23:45:06G,1631317205,1,0,0
+669,37,2,1,0,0,494e8f7015af498eaafda963500177f0,7c43dd48ea42420a88b29cf91f3f53b2,05/13/2021 15:46:44G,1620916109,1,0,0
+3001,28,7,1,0,0,150ea92106af42d58ad0eae82ee90c52,ee9a4ca3f4344147ba68910cdd0a5066,09/10/2021 23:45:06G,1631317205,1,0,0
+3002,28,7,1,0,0,3fd40d6cd2884352b8d3482a54ae0680,184a938f3b424103bec8774ef47b5b92,09/10/2021 23:45:06G,1631317205,1,0,0
+3003,50,0,1,0,0,e11be8b9e9b04bf29b57670b280cc6c5,63daa12e5f984af7957dc08337bd1d2e,09/10/2021 23:45:06G,1631317205,1,0,0
+3004,51,0,1,0,0,4785c08003ed4f0bbc5a113847ed9f36,f9ad112c713b4228a492759d135b3a46,09/10/2021 23:45:06G,1631317205,1,0,0
+3005,52,0,1,0,0,ea4a100a13d54e0da8d632722aeb7b5a,cb4e3e4bbc03445eb160029e6f3874be,09/10/2021 23:45:06G,1631317205,1,0,0
+3006,27,0,1,10,0,f79d2998c8b54d9ba51e7240e8b477ef,a71850540f70455f8e45a697d65674ac,09/10/2021 23:45:06G,1631317205,1,0,0
+3007,5,7,1,11,0,39e3fe320e4d43369fe049732dbd7ec1,8ea8ce3494464c27a095efe6600394fa,09/10/2021 23:45:06G,1631317205,1,0,0
+3008,41,7,1,0,0,2cb703a712ba4aa48655755c92db006f,d13663763975421da5e49961c5980661,09/10/2021 23:45:06G,1631317205,1,0,0
+3009,1,7,1,3,11,683f8e0ead4f4babb54ed40f2abf7ac2,1123d81e83594f4283a10fcc03f1fcd8,09/10/2021 23:45:06G,1631317205,1,0,0
+3010,1,7,1,7,11,93b1253a8e7c4c2c86ec526ede6a8024,37e0bf3bbd2d40c4952740b4ec7a30cc,09/10/2021 23:45:06G,1631317205,1,0,0
+679,38,2,1,0,0,a6f7b2cff8654a1193311453a07e7a01,aa54d82c28384c6897afdf3e6d80cd98,05/13/2021 15:46:44G,1620916109,1,0,0
+3011,1,7,1,8,11,1b23a284d8d14e0d978000f2ffd84f05,c973b7317c3240f1b3174aa483bd79b9,09/10/2021 23:45:06G,1631317205,1,0,0
+680,38,2,1,0,0,627617c4dab94096b6742798e55eda30,8c70591323394e3a804ea23da9bde883,05/13/2021 15:46:44G,1620916109,1,0,0
+3012,1,7,1,9,11,1c2125953ffe4e81918f2c8523aab37c,f7b0b3557c8b4857aa09a59183e55573,09/10/2021 23:45:06G,1631317205,1,0,0
+681,38,2,1,0,0,577e41aa09f644dcbdcbaab0000253eb,0ec02cf45a9d4b9092df0a21bf05498b,05/13/2021 15:46:44G,1620916109,1,0,0
+3013,1,7,1,10,11,4a26d939a0754fd3866f50b089581d43,05bfa3d1b706483583c7e32ea3a4cfc0,09/10/2021 23:45:06G,1631317205,1,0,0
+682,38,2,1,0,0,d5ed93a9f2bc479ea9ff8e6b17a5d043,46fa5f773c3f4aa19d7dfc18893ffa43,05/13/2021 15:46:44G,1620916109,1,0,0
+3014,1,7,1,12,11,df5243a0d22f4d2d9e11f9928da6516b,a08009af9f024db28e3945f3dce7c577,09/10/2021 23:45:06G,1631317205,1,0,0
+683,38,2,1,0,0,516176c8dfbc49dcacf9e6caacc65983,b391112d4cfd43929e339ae5c8eb4695,05/13/2021 15:46:44G,1620916109,1,0,0
+3015,1,7,1,14,11,052e89c8b49d4fa9942ea8828b61bc0e,de1d860f32264ce5992d4a4d67e65421,09/10/2021 23:45:06G,1631317205,1,0,0
+684,38,2,1,0,0,1e38e0cf9af845f5809c08aa3f5eb307,8153e0f4865d4dcfbbfaf46b829e3ee1,05/13/2021 15:46:44G,1620916109,1,0,0
+3016,1,7,1,13,11,8b335cb49baf4b3a8caa121b20b56ee1,12070768a32648b5b4b3d2dfdc15b215,09/10/2021 23:45:06G,1631317205,1,0,0
+685,38,2,1,0,0,b525e44e6c1a41e8981c02dc3ed90dcc,eb3fb73a13a641dead8a40fee51265ec,05/13/2021 15:46:44G,1620916109,1,0,0
+3017,6,7,1,1,11,e1a06de98ad34b3094d720d1061a1247,17c808955dce48fa8e85c05f70cbd104,09/10/2021 23:45:06G,1631317205,1,0,0
+686,38,2,1,0,0,980f501263704ab8a4f3fcd6ff6a80f0,7f52a9eb34cf4b189dd88d86fde4e448,05/13/2021 15:46:44G,1620916109,1,0,0
+3018,40,7,1,0,0,5da90a923d51433a8239d293c4184e16,a00fbc81160445ef96cc56ef0ca079a1,09/10/2021 23:45:06G,1631317205,1,0,0
+3019,28,7,1,0,0,67abb9b38dcd4f488e6ca4879572b2d3,82027c674bca4293a779850b77dfda85,09/10/2021 23:45:06G,1631317205,1,0,0
+3020,6,7,1,2,11,bb6cdcf041a6428db38dd35fc30211c1,03b04e54a2d1498080c8fd8e8c936c1a,09/10/2021 23:45:06G,1631317205,1,0,0
+3021,40,7,1,0,0,5b0ba062857445d580d3d114635765ab,029e2ba54abf495bb6298701628c51f7,09/10/2021 23:45:06G,1631317205,1,0,0
+690,37,2,1,0,0,11ad0194bbcf437daf47cb8c9003560b,f0ccefb88ebd4083bd371234f1a1577f,05/13/2021 15:46:44G,1620916109,1,0,0
+3022,28,7,1,0,0,1d3896c6226f4da68f1ca40b1424977a,fee1bea484814bfba99eff3b00ee7e9d,09/10/2021 23:45:06G,1631317205,1,0,0
+691,38,2,1,0,0,859b8965b283461280f80b00869974d0,4fd2127441b54f55b30bad4143c29254,05/13/2021 15:46:44G,1620916109,1,0,0
+3023,28,7,1,0,0,79c232a1a6de4268b5684d9b34c5155c,a1258b5af2584bb0adfd3452a047e616,09/10/2021 23:45:06G,1631317205,1,0,0
+692,38,2,1,0,0,635a6f74a6804c589a405c2d6b4ca9ae,46d84b768df74fc8b5d51c9135acf83a,05/13/2021 15:46:44G,1620916109,1,0,0
+3024,50,0,1,0,0,f29851bdc0c2436a8be54a1c1e26263f,e26f6a5eae98427e86698c0df7405fa8,09/10/2021 23:45:06G,1631317205,1,0,0
+693,38,2,1,0,0,86566270b642412696c15a01f9fec947,cf33fe89cd7040a18be42b00dba85dd9,05/13/2021 15:46:44G,1620916109,1,0,0
+3025,51,0,1,0,0,b0cde6faae1148c6b22ddb22427bc023,d2e2587cc3a54637be99b3004ecfc34a,09/10/2021 23:45:06G,1631317205,1,0,0
+3026,52,0,1,0,0,41d8e32542cd4befb8f35ee45c5c8450,71656dc9d3dd451a953635e33d55c3d2,09/10/2021 23:45:06G,1631317205,1,0,0
+3027,27,0,1,11,0,36dc774933bb45eabf052c8952c521c4,ee99f2a5b5d74341aaa22e8f2d578842,09/10/2021 23:45:06G,1631317205,1,0,0
+3028,5,7,1,12,0,6467e95b764e455dbfcd33924bb1a1e9,9c8f9443b98f458385680e2296589dfb,09/10/2021 23:45:06G,1631317205,1,0,0
+3029,41,7,1,0,0,3e1301f506ef480a98957f99b2402ea9,beef202ddc614f8d9547da83845f3e96,09/10/2021 23:45:06G,1631317205,1,0,0
+3030,1,7,1,1,12,0eb4b8983fdc48bea06f40e1a5b953ad,b5a61f52cfe6432da2d4b66a7e50902c,09/10/2021 23:45:06G,1631317205,1,0,0
+3031,1,7,1,2,12,659fe0d31f5444d19928d82e530fca8d,7d76e75defdf41e2af0941be16666e88,09/10/2021 23:45:06G,1631317205,1,0,0
+3032,1,7,1,3,12,abeb590e6d1248c19e20eaa1fbf85487,da4ad86fc7ab4e8c8ddac056469c9d4c,09/10/2021 23:45:06G,1631317205,1,0,0
+3033,1,7,1,5,12,56bd6a7ffd424668bbd15f0d67b29b39,d3232e0b64bb4b2f98082785f09cf5b2,09/10/2021 23:45:06G,1631317205,1,0,0
+702,38,2,1,0,0,9a11773a8fff45adbc6e267675e3d750,77202edb8ea94760887f0756264d9176,05/13/2021 15:46:44G,1620916109,1,0,0
+3034,1,7,1,6,12,5246fa2fdb654ac9bdcb523416f59fbe,1c1e66ffaa734455916590e2f46dbee7,09/10/2021 23:45:06G,1631317205,1,0,0
+3035,1,7,1,11,12,2002e7bce72f482e9779341d9f34c00e,f78a677ffa2d4f11a59e75070016a5ab,09/10/2021 23:45:06G,1631317205,1,0,0
+3036,1,7,1,13,12,01dc835d5da04ff7ad392efc9af8023c,ecb9f84f96344a89a9cc99e7f82dc114,09/10/2021 23:45:06G,1631317205,1,0,0
+3037,1,7,1,14,12,cf58d331dc7b487698e541853cdd2e48,e3ab2dcb65f84284a518697bcc682595,09/10/2021 23:45:06G,1631317205,1,0,0
+3038,1,7,1,15,12,9087f1697f2949f0b8b02ef89dad0706,3c98807f209c4c7d89b0820580c1b9b9,09/10/2021 23:45:06G,1631317205,1,0,0
+3039,1,7,1,16,12,e72c60f1b7cd428299c221547b888768,122bfcc7b3aa4a84be149e73802b1ec0,09/10/2021 23:45:06G,1631317205,1,0,0
+3040,1,7,1,17,12,3ec036a381b24e6fb3155b62fee14075,db645b1382834a8184bf48e4b9437bf0,09/10/2021 23:45:06G,1631317205,1,0,0
+3041,1,7,1,18,12,4b53db733ae740498a3aacf6a2b8cbdb,45350bbfc4844f669be7936ca98355ea,09/10/2021 23:45:06G,1631317205,1,0,0
+3042,1,7,1,19,12,dbaea9c86bb4405bb02c9318ee235e70,fff6103ef93241b0a75c2600c958cd56,09/10/2021 23:45:06G,1631317205,1,0,0
+3043,1,7,1,20,12,2e6559caeaa84ff28716a75f53c2e4ae,cb188e53e99f4bce86c2bccdb48af83a,09/10/2021 23:45:06G,1631317205,1,0,0
+3044,1,7,1,12,12,0d9978fa08924711bf6fcc8c3143efe9,7609f173dc864fa0861ce29544fd0d34,09/10/2021 23:45:06G,1631317205,1,0,0
+3045,6,7,1,1,12,a304d6cc7e124e549f74b045aaa68789,00961e85a1d243179d05318fb433205f,09/10/2021 23:45:06G,1631317205,1,0,0
+3046,40,7,1,0,0,7480774b35434d56932c84fb6b7756f1,883b7c1a0b1840e8bb771de5cf4ff800,09/10/2021 23:45:06G,1631317205,1,0,0
+3047,28,7,1,0,0,09daeb0a7acb4f16b8bd22859090390d,638c10361ae64d3899fedbeaf6a2c044,09/10/2021 23:45:06G,1631317205,1,0,0
+716,38,2,1,0,0,b2bf5064aaf5426ab2faf73ffd0ddc30,4e036a063c854b29b5319ef5df58056d,05/13/2021 15:46:44G,1620916109,1,0,0
+3048,50,0,1,0,0,db5af2102d0b4b9581fc710d0b2e3c24,9d04956b09f24398af5302482af7db4a,09/10/2021 23:45:06G,1631317205,1,0,0
+717,38,2,1,0,0,51f1864fe8944ecda7eaa79ef42398ff,4bf1986e049f4f2eb15158027b06ac85,05/13/2021 15:46:44G,1620916109,1,0,0
+3049,51,0,1,0,0,faa498811b4a44f6a4c9e4e251f0d3d1,a9456bb2fa9a440db1c2719f35cfc51f,09/10/2021 23:45:06G,1631317205,1,0,0
+718,38,2,1,0,0,4ba0515c3ba24e838e8b03ebe1d6c718,35e84a205ab34f34a09e748d3dad53b7,05/13/2021 15:46:44G,1620916109,1,0,0
+3050,52,0,1,0,0,d6791dd7921b41fd827593778adfdc20,6d25af60deda45329775cc14044610ba,09/10/2021 23:45:06G,1631317205,1,0,0
+719,38,2,1,0,0,39c4aa92a6014d5f94205c386e6937e2,eb063b7347214800b1305e84ca0a6920,05/13/2021 15:46:44G,1620916109,1,0,0
+3051,27,0,1,12,0,8bf7bd6b3a3f4b02b1e5b2f3c825362f,cd60be0afec7433582277e27d16e9897,09/10/2021 23:45:06G,1631317205,1,0,0
+720,38,2,1,0,0,625069018fba4b84a1edfc11508f0bd6,3b7d84d18a1d458d9d9ebd11acedc00b,05/13/2021 15:46:44G,1620916109,1,0,0
+3052,5,7,1,13,0,efff8ca0e4dc46ac8478b9007cc0d140,a25d67e0cc9e4fc19fb55a69e6edbded,09/10/2021 23:45:06G,1631317205,1,0,0
+721,37,2,1,0,0,bcab4677c7bc4d4ead0e0137b7a906dd,4a1b3e8ad1464824a95f4fcbd2808ecb,05/13/2021 15:46:44G,1620916109,1,0,0
+3053,41,7,1,0,0,bf1db4bf5c1a4a9188049b37cc7c0fea,6c2960c9bbbb4ed39bfe9299598d8980,09/10/2021 23:45:06G,1631317205,1,0,0
+722,37,2,1,0,0,67561408b7f4471bb68126f006e65f34,623a03028d6e4467b27c077eaefc9c93,05/13/2021 15:46:44G,1620916109,1,0,0
+3054,1,7,1,7,13,545f4d9688b246b4881c9db84c37100f,44eae494c40c48c2ba78990d55c55a1e,09/10/2021 23:45:06G,1631317205,1,0,0
+723,38,2,1,0,0,fcaca4a8a27d481abbcc4cc2e40d163c,47626548cbd84664a129e9da0717f8ec,05/13/2021 15:46:44G,1620916109,1,0,0
+3055,1,7,1,14,13,b3a457e121e84ec58aacc1d6e8402d45,d8c7271a9d3841348add7477f85f022d,09/10/2021 23:45:06G,1631317205,1,0,0
+724,38,2,1,0,0,3f39bcd0de5b4b749656669bd87367bb,faa3aeb597db47c8ab65728cab6ceb5e,05/13/2021 15:46:44G,1620916109,1,0,0
+3056,1,7,1,15,13,bbda860c7f9747d681211356cd3178cc,087c372da6f8459db790d493dc97e4ce,09/10/2021 23:45:06G,1631317205,1,0,0
+725,38,2,1,0,0,34f82774f631409696d60d0bdbf239c5,d22d0523dfff4244915968f92827ef70,05/13/2021 15:46:44G,1620916109,1,0,0
+3057,1,7,1,19,13,4177d8ebea3f4c1cba2da37a86460798,beea6ce342bb4d5ba07fbe2c08fa5c82,09/10/2021 23:45:06G,1631317205,1,0,0
+726,38,2,1,0,0,46441ebabef741fb948a667d077aee0d,b261c15abbeb4c4f891b1abefd38dc5c,05/13/2021 15:46:44G,1620916109,1,0,0
+3058,1,7,1,20,13,5cb6d0ff3bdc446f98c6c805bc8e8095,1f50ea6552db4e4d8fd103f1d8843a2f,09/10/2021 23:45:06G,1631317205,1,0,0
+727,38,2,1,0,0,b54f00791e25404c9fe2a391a5141629,7cfa1496721a4bbb9efbe74a9c965ebb,05/13/2021 15:46:44G,1620916109,1,0,0
+3059,1,7,1,21,13,0569f639de64423883c21bd94bb73f4c,e91cafdbf33b4f278895224398f75783,09/10/2021 23:45:06G,1631317205,1,0,0
+728,38,2,1,0,0,546ef287caa14e8584b8ed9be210a355,b3744681174448c5b74674322bca0c4b,05/13/2021 15:46:44G,1620916109,1,0,0
+3060,6,7,1,1,13,7e168e48bfbf403e93134c5026840cad,10e7eb1cb468488aaa56673a8ff4e4b7,09/10/2021 23:45:06G,1631317205,1,0,0
+729,38,2,1,0,0,9559d0fcc60b4cc98aa7117dcd5c1a1e,a3227032b7714f9182f8445679e46592,05/13/2021 15:46:44G,1620916109,1,0,0
+3061,40,7,1,0,0,df2e2b067ee64fc5b31c0787732f041d,672d7348c21947bdaf6202c4b12783fe,09/10/2021 23:45:06G,1631317205,1,0,0
+730,38,2,1,0,0,3e8e50068b004b7682f6023fe2263316,12f0ce2e43304ef9b9e8ff486cc67f2a,05/13/2021 15:46:44G,1620916109,1,0,0
+3062,28,7,1,0,0,a8f0433c79cb410193decc7297c2cabf,7a13748568ca4bba90f64d59ddc6a2a6,09/10/2021 23:45:06G,1631317205,1,0,0
+731,37,2,1,0,0,0a3e2133c26e4be5b3b1c57a6d0b3608,c7e19fdbdd71440b8522d1b1e3e8a221,05/13/2021 15:46:44G,1620916109,1,0,0
+3063,6,7,1,2,13,fe0b55a0261646c5aeac7fbc738e6b7e,5d3c6d035d8b4aeaae05d0eae77102ff,09/10/2021 23:45:06G,1631317205,1,0,0
+732,37,2,1,0,0,49d21cac03644eda82dee9749a1166d2,769bca127c3e4e70bd034d6018ca5872,05/13/2021 15:46:44G,1620916109,1,0,0
+3064,40,7,1,0,0,379d066b05d6497bb76bdb25aee23c68,46ad3d91e53f4bdbada2c3866f27f08d,09/10/2021 23:45:06G,1631317205,1,0,0
+733,37,2,1,0,0,22f01d79d5624cdca83d2de955580732,c12441490ca84f5e8e4f70dc90c9c208,05/13/2021 15:46:44G,1620916109,1,0,0
+3065,28,7,1,0,0,8dd14b2b275f4a4a9e7638f305eae86f,613648eb8b6b4970a597df5015d4b598,09/10/2021 23:45:06G,1631317205,1,0,0
+734,37,2,1,0,0,b35d15e2916a4b57915d51ffb718e20a,d5c0eaa7658f4c948e2288aa49bf48f7,05/13/2021 15:46:44G,1620916109,1,0,0
+3066,28,7,1,0,0,c339d36d3c6b4674a1abec69b116242f,a6ce313eac274452b0328d7f65bc5cae,09/10/2021 23:45:06G,1631317205,1,0,0
+735,37,2,1,0,0,06f5e0fdc7294427bf0388f69a9831bd,d7f842b8b979492c8917ad83ad08468f,05/13/2021 15:46:44G,1620916109,1,0,0
+3067,28,7,1,0,0,960ffa661657462ea17cc7ce9e7a4fc2,c8e6ed0c0f534a419e6fec84bc2f8bbc,09/10/2021 23:45:06G,1631317205,1,0,0
+3068,50,0,1,0,0,db3d0beaa2d34f4585325e6f98218b5f,2d73b9d2d9054dc594fc026378b32f52,09/10/2021 23:45:06G,1631317205,1,0,0
+3069,51,0,1,0,0,043810f8b7ff40159cc57f76541750d3,a15c4b7fe324420ba947fb3f0bb92ddc,09/10/2021 23:45:06G,1631317205,1,0,0
+3070,52,0,1,0,0,35b4df0155f4497b9b959356d51c57c5,881948c313364d95a45774868177edbc,09/10/2021 23:45:06G,1631317205,1,0,0
+3071,27,0,1,13,0,a05835ff063f4be9896b9202549bbe31,473b0d45c49c4e4b8ae3d4cc844ed1b7,09/10/2021 23:45:06G,1631317205,1,0,0
+3072,5,7,1,14,0,09f22b54d5bb4dbc98db330134efeb29,876bc6a9e60149e293733a3af75aad8e,09/10/2021 23:45:06G,1631317205,1,0,0
+3073,41,7,1,0,0,02f08da087754d98998ad440fdf6b411,b6757e56a9b444eda740497ec071d8af,09/10/2021 23:45:06G,1631317205,1,0,0
+3074,1,7,1,9,14,0724ddcdf9b5478fa5a8ca707410e31c,23b667cecc86400daae365b48250e9ce,09/10/2021 23:45:06G,1631317205,1,0,0
+3075,1,7,1,10,14,dff590a5497c4fdabe2de50e51d34372,fac3b3038a1244bfa2a6aedc9fe34af4,09/10/2021 23:45:06G,1631317205,1,0,0
+3076,1,7,1,14,14,f14558ea187b4314a5ddbd1bc5b8c602,d3cf1f5b911349ebbdcb8ce998fcd8c4,09/10/2021 23:45:06G,1631317205,1,0,0
+3077,1,7,1,15,14,7463f02b6c104db8b3e9e31df33ecc96,6319d94fd45d449e998afcc9ee54c2e8,09/10/2021 23:45:06G,1631317205,1,0,0
+3078,1,7,1,16,14,4556d88841fd400fb3bf35e9e3601fe6,01fd617028644de2903fc0994dabf9c8,09/10/2021 23:45:06G,1631317205,1,0,0
+3079,6,7,1,1,14,93cdefaaa3f3402c8bc87dbeff750638,ff213bdabf774ea3b259705f5a15b93a,09/10/2021 23:45:06G,1631317205,1,0,0
+3080,40,7,1,0,0,5ea134cab41d4d979ae080d654d8e5ff,a7485e42c8c94be39f5d6275ee08a16a,09/10/2021 23:45:06G,1631317205,1,0,0
+3081,28,7,1,0,0,f17470e8c45d458785fc09794d9a959f,981ac25288dc44ab8a01cdfd3da2dc2b,09/10/2021 23:45:06G,1631317205,1,0,0
+3082,6,7,1,2,14,d0b6d1e19ef14a0f9ab4e2132da9c4bd,c2c9399b95c84b1ab30a213fbef83245,09/10/2021 23:45:06G,1631317205,1,0,0
+3083,40,7,1,0,0,9301234d26294c8e903a497ab7776b25,fb7c2d685cd648739438e0d13e7f0fb8,09/10/2021 23:45:06G,1631317205,1,0,0
+3084,28,7,1,0,0,dafd53849f0a462989b2e8297c390547,73dd6f7b45954df9bc4d3d125f245f71,09/10/2021 23:45:06G,1631317205,1,0,0
+3085,28,7,1,0,0,e00d6a4e451e4f30959a5b0ad5d177bb,f30d1b5c384147a0be336e61e697b3aa,09/10/2021 23:45:06G,1631317205,1,0,0
+3086,50,0,1,0,0,991f2e80ea7a4bcb8bea5e3769229956,eff3c81a8ec34f8fb742ab1e8700e979,09/10/2021 23:45:06G,1631317205,1,0,0
+3087,51,0,1,0,0,09510942383c424dbd639274d774a73e,30a7e7377e2d4e579f3f519fa1b8695f,09/10/2021 23:45:06G,1631317205,1,0,0
+3088,52,0,1,0,0,c711b8efa46e4105836ab8d20649f51a,ded3240b38a748879d39cd646ccf86a7,09/10/2021 23:45:06G,1631317205,1,0,0
+3089,27,0,1,14,0,6fc2854bfe004c02ae98cce0c5f7e73d,62c9c95b34e94dd8bd7a9defd5b0ce7a,09/10/2021 23:45:06G,1631317205,1,0,0
+3090,5,7,1,17,0,9085497811e441358daba84c21759e55,a48878c6b3df45c99831933d7b3217a7,09/10/2021 23:45:06G,1631317205,1,0,0
+3091,41,7,1,0,0,54499150c9f44fcba88febe9d61c3294,3fb2e91f778e46fcb173b29eff7b9c14,09/10/2021 23:45:06G,1631317205,1,0,0
+3092,1,7,1,1,17,8006609fd01d4ad4bb348fa683645ed8,e86da1660a9e48a1ae8d32753a15c39d,09/10/2021 23:45:06G,1631317205,1,0,0
+3093,1,7,1,2,17,ef5f2decff42428abe232f8a855488e3,907ac07772d34e218d9d1b02fe90c633,09/10/2021 23:45:06G,1631317205,1,0,0
+3094,1,7,1,3,17,6fb726ff8bd8471589290274d4ec45ac,05e47bcdf3ea4614afca247913f28c61,09/10/2021 23:45:06G,1631317205,1,0,0
+3095,1,7,1,6,17,f716d3deb32441b09fb4bf8a563d8527,14ddc6d25c6d4a0f8cc8d4eee21b8cda,09/10/2021 23:45:06G,1631317205,1,0,0
+3096,1,7,1,7,17,8c201629be784e78b9c2a469a5579159,c2c2d9aad53146e0890a34af8798396b,09/10/2021 23:45:06G,1631317205,1,0,0
+3097,6,7,1,1,17,66a9a0a37f90438db132c4df6f1a9f7d,0e58455d0a61436284c56f9054a5332e,09/10/2021 23:45:06G,1631317205,1,0,0
+3098,40,7,1,0,0,5cd8442dd0d94319ba807e7f96196627,0df9d05b5dee42c8805af3ce475622d1,09/10/2021 23:45:06G,1631317205,1,0,0
+3099,28,7,1,0,0,1ab4f346a9ee499da6a8c84f9846ec6f,3f4c563bfcda41eb8991016e9898189b,09/10/2021 23:45:06G,1631317205,1,0,0
+3100,50,0,1,0,0,c6068f567d43400d8282a671689bc25a,f0e2632b20244e1cadefac37ba4c84a9,09/10/2021 23:45:06G,1631317205,1,0,0
+3101,51,0,1,0,0,45658ee4817145aa9d372476275e9518,67258c4023db47bca93ed20e9033ce40,09/10/2021 23:45:06G,1631317205,1,0,0
+3102,52,0,1,0,0,c242c315729a4bd283304d430eb688eb,08f712f93cfc4d1bb8a879c82cebab26,09/10/2021 23:45:06G,1631317205,1,0,0
+3103,27,0,1,17,0,c56876044d754764814c9616e1cdb5f2,7aa97f055d194631ac1458fce9f0ef72,09/10/2021 23:45:06G,1631317205,1,0,0
+3104,5,7,1,24,0,c21ea2dee32a477f956a5fc0fbc4834a,01bb4481b475447b8683d43e6df623d9,09/10/2021 23:45:06G,1631317205,1,0,0
+3105,41,7,1,0,0,1359372095e946d0a5f72cfd07c1170d,0183ef880cea4b2c996ee01e174e09e2,09/10/2021 23:45:06G,1631317205,1,0,0
+3106,1,7,1,12,24,55533204f9de413db4e39a7bc328c3d4,2f5987ee6ea94a49b1d852b7834e087b,09/10/2021 23:45:06G,1631317205,1,0,0
+3107,1,7,1,13,24,40773cedc14b40b08b9f56075543befb,e65c257f0de74f7d917fe60ef77743e5,09/10/2021 23:45:06G,1631317205,1,0,0
+3108,1,7,1,8,24,39845a1b5ca64154a4a5a6d69ceb529e,92bdc7addb334445b4c4d4c1677e4dba,09/10/2021 23:45:06G,1631317205,1,0,0
+3109,1,7,1,9,24,1d182665062a4b0b81337511a1b930b0,37089cfe54cf4a0b99e7bc89b089cf61,09/10/2021 23:45:06G,1631317205,1,0,0
+3110,1,7,1,10,24,afb82ce681ba4333afe31768e223aed0,6dedf0bc3b204568915b1904ca022bd5,09/10/2021 23:45:06G,1631317205,1,0,0
+3111,1,7,1,11,24,be3e0181f9f34089aefad013714f4f99,ee5a99c120e04c7484798ba9eb51ea11,09/10/2021 23:45:06G,1631317205,1,0,0
+3112,1,7,1,17,24,badbea261e6c4d3cacd3bf94bf611e35,a815cde557d64af7ae7c4a9feef66679,09/10/2021 23:45:06G,1631317205,1,0,0
+3113,1,7,1,18,24,14e8ec8b7b1e4e05bb6ba361c2629e7c,b8ffa3f474f54f49a36801c6cc9d5d95,09/10/2021 23:45:06G,1631317205,1,0,0
+3114,1,7,1,19,24,01e01077035c4b6e8c5d236ed97fa0d4,a311e82632234720b1a239f346274915,09/10/2021 23:45:06G,1631317205,1,0,0
+3115,6,7,1,1,24,d0bbe25e93e64a938867fa21d3564da2,bb857a28d9354a808f40afeb744a0dc7,09/10/2021 23:45:06G,1631317205,1,0,0
+3116,40,7,1,0,0,8b42228c91ff43e88613cebeb139c9f5,ef8ff895e02843688f23a922610017b6,09/10/2021 23:45:06G,1631317205,1,0,0
+3117,28,7,1,0,0,e3197fec6cbe4873acce7853ff84bb7d,2f42009f06984e1b91c0bf1fbe12669f,09/10/2021 23:45:06G,1631317205,1,0,0
+3118,50,0,1,0,0,7c76a99313264e4ab736b6745b4bb55e,ed07924c46094af08b081f3affb79d88,09/10/2021 23:45:06G,1631317205,1,0,0
+3119,51,0,1,0,0,639a88b5c9a74afdaba63bbef68f092d,bf38649ab0354b7182a6cb9ba6907e4a,09/10/2021 23:45:06G,1631317205,1,0,0
+3120,52,0,1,0,0,cfcface8cc5b4f6a939c5d4199a9982f,3cf4acc4d18c48fe86a989b6d9d05da4,09/10/2021 23:45:06G,1631317205,1,0,0
+3121,27,0,1,24,0,ed51c634c85743b9bd73f83b05e17918,3f51b43c77a4443aa95bb0c21b3379d4,09/10/2021 23:45:06G,1631317205,1,0,0
+3122,8,7,1,4,0,9627f3244f2841d2a687ccfcb0afe32c,167d95ebdfac41d481bdad6f901cc0ac,09/10/2021 23:45:06G,1631317205,1,0,0
+3123,26,7,1,258,0,a5a13846a4254ee984c1321d63c4626b,16c529f6a0514b6d92615f175b374365,09/10/2021 23:45:06G,1631317205,1,0,0
+3124,29,7,1,4,0,6c4781ee499f414d8e480fd8b5f0740e,62375aa6fd284351b705279d79609f2e,09/10/2021 23:45:06G,1631317205,1,0,0
+3125,8,7,1,5,0,c38b006ec1d249d8a1cb97e190806d57,3e086f8d5ec04957bc1a05392975cbac,09/10/2021 23:45:06G,1631317205,1,0,0
+3126,26,7,1,259,0,ee8cc50655f14165a902b725bc173e82,649915f36b754bbc858440cadb266c6a,09/10/2021 23:45:06G,1631317205,1,0,0
+3127,29,7,1,5,0,52a33b6dcd74429291396e5f020ac442,6f44c7d673814102b0828099461bec17,09/10/2021 23:45:06G,1631317205,1,0,0
+3128,8,7,1,12,0,a3be89819500426da50d6dc6be9708bb,f34caab00b1345e999c5d6d4a160d741,09/10/2021 23:45:06G,1631317205,1,0,0
+3129,26,7,1,260,0,53995b03a9e04b86b12482b6285f6a19,5af06db709ba441bb6b0c243e10f4ea1,09/10/2021 23:45:06G,1631317205,1,0,0
+3130,29,7,1,12,0,cc31aee303be4271a2fd0a6fa3ec133f,2e420fce3cd54016be81fd62574909cb,09/10/2021 23:45:06G,1631317205,1,0,0
+3131,8,7,1,51,0,d1b220ea875d49b7830b4bdfcb84d873,ebd5b4658d7e40f7924afa18f679b3b9,09/10/2021 23:45:06G,1631317205,1,0,0
+3132,26,7,1,261,0,560c5b5b6f6e4956aecf05f532ae69e6,836048caf8f442518b7a45349ca12a1e,09/10/2021 23:45:06G,1631317205,1,0,0
+3133,29,7,1,51,0,b529410fb1194edbab43c43b5be8186c,b77a9ad4ad764043aa1f7be8fb0fd8c6,09/10/2021 23:45:06G,1631317205,1,0,0
+3134,8,7,1,53,0,08a0f1def40243e7bb21d8a956591ff7,871bb09696bb4a868a3c230455034a04,09/10/2021 23:45:06G,1631317205,1,0,0
+3135,26,7,1,262,0,c35dcdac2eee45df8e5d52f30629d3eb,c0b25c0bcc6349dcbee45465ec173632,09/10/2021 23:45:06G,1631317205,1,0,0
+3136,29,7,1,53,0,10f26b0d12ac4fbfb1a0d4a6f26140d4,28be494fa0ac4a7b9eb3c87189e8bd13,09/10/2021 23:45:06G,1631317205,1,0,0
+3137,8,7,1,57,0,76527baaac0741f8ba3a79f3cb4678ed,d425a9bc56fb47f9be837e3cd8856620,09/10/2021 23:45:06G,1631317205,1,0,0
+3138,26,7,1,263,0,c2074a90b78d4da6aff6247a4b2d6a37,90cb3041e87d4883bd396c2120339aec,09/10/2021 23:45:06G,1631317205,1,0,0
+3139,29,7,1,57,0,ee8cc067b27443ae87471d81d4cf6dc5,b735f3a7d8ec41869e615b6c79c74979,09/10/2021 23:45:06G,1631317205,1,0,0
+3140,8,7,1,58,0,26e632090abd44ca918762901f1e4ea2,591526b7c6d749d58f9bdbfcfcdb167d,09/10/2021 23:45:06G,1631317205,1,0,0
+3141,26,7,1,264,0,6f0266fed6fd42fa924908f4d2b67193,4dd0ea68e4e043a58d73220325b04c92,09/10/2021 23:45:06G,1631317205,1,0,0
+3142,29,7,1,58,0,d60e700f2de1484195f6ec10cf71a392,33570b77d6a54f42bf68c6f39285b6d1,09/10/2021 23:45:06G,1631317205,1,0,0
+3143,8,7,1,59,0,480e9ff182db4f93b824d4ba343d8407,e16a5af9d28542a5add89f7fdfbd28cf,09/10/2021 23:45:06G,1631317205,1,0,0
+3144,26,7,1,265,0,ea5322af97704db6b471c260923e44e6,cdea464db41948b5a2998bd88859e632,09/10/2021 23:45:06G,1631317205,1,0,0
+3145,29,7,1,59,0,8c084708dce84076b0ba2d44bce9a44e,0fca1625119449ffacc8e85d3639cb24,09/10/2021 23:45:06G,1631317205,1,0,0
+3146,8,7,1,60,0,207bae56cf774f50a6d7b185288f7b10,f17e7baf26cc4c7eb1dd6f94e96ee781,09/10/2021 23:45:06G,1631317205,1,0,0
+3147,26,7,1,266,0,9bdac62fdd86482cb464f15a7f43d7b8,e711fdd70af44adf8444adb3d38c3ce8,09/10/2021 23:45:06G,1631317205,1,0,0
+3148,29,7,1,60,0,6dc5bb95a8394e3bb9eb9bfccff34931,7d308340a1504081b5b7e010448682ad,09/10/2021 23:45:06G,1631317205,1,0,0
+3149,8,7,1,61,0,96e3f4ee581245f581be025d3c970844,d9f71cd4890f4ae78f0b3e897923c47c,09/10/2021 23:45:06G,1631317205,1,0,0
+3150,26,7,1,267,0,f130c6263ae248d7b2fb236ee2c5f23e,3974123eca384c8a818959f8a63608ca,09/10/2021 23:45:06G,1631317205,1,0,0
+3151,29,7,1,61,0,a94ac8d036c54d9997e049390b4678ba,994cbcb4b4304110b586589d941ab954,09/10/2021 23:45:06G,1631317205,1,0,0
+3152,8,7,1,62,0,f637383efc424fd99ab37c70554de561,7ee77886955c4a9a9ea71bd68a79d87a,09/10/2021 23:45:06G,1631317205,1,0,0
+3153,26,7,1,268,0,2d4d78472db24ec3870dcbe2bb6202f1,12a4574e9f754635ad9cd0f3bd7ae881,09/10/2021 23:45:06G,1631317205,1,0,0
+3154,29,7,1,62,0,11b7fa21cb3c4635a10c651b47d1271f,27a39b606ec24ec98ec398c308312b0f,09/10/2021 23:45:06G,1631317205,1,0,0
+3155,8,7,1,63,0,166cabef6bd9496f948b247f70753a9e,b0b8f5b5422e4befac284b8c8dc972cb,09/10/2021 23:45:06G,1631317205,1,0,0
+3156,26,7,1,269,0,dec91a2385d340f088beb6adf43facbd,c1accf8a5ae94b71936f71ae7e1d2a94,09/10/2021 23:45:06G,1631317205,1,0,0
+3157,29,7,1,63,0,535ac4e3c1164fe38c96eb14767c3a31,1a32b0e013244d64ab889fc40fd9ca0b,09/10/2021 23:45:06G,1631317205,1,0,0
+3158,8,7,1,67,0,dab400c2984b4d2eb5cd445e98585b98,b4c020df3ce64b9c9633e1113e7f19d2,09/10/2021 23:45:06G,1631317205,1,0,0
+3159,26,7,1,270,0,c07d67bad6414fea8d2f4ed365098e74,4398fbf8f9ed45ae9fa52e96a67245ea,09/10/2021 23:45:06G,1631317205,1,0,0
+3160,29,7,1,67,0,b377755cc2394b5b990876a806760d2c,9fb267ace5b84ff49b4c11a82e107826,09/10/2021 23:45:06G,1631317205,1,0,0
+3161,8,7,1,70,0,75da2b52b2c24c2fbfd2deb9809e6535,a31677cfcbff4cbdb94c1eb9b831197e,09/10/2021 23:45:06G,1631317205,1,0,0
+3162,26,7,1,271,0,7a0c73199fbf4fe1a93a21cd80cbd9b0,3ac0a7477b494c4e814549218dbaa892,09/10/2021 23:45:06G,1631317205,1,0,0
+3163,29,7,1,70,0,c71422d96f334b1fb5c424aa53a17a92,0b47fb0b7b1146b3b1e81d8f7a62c7c9,09/10/2021 23:45:06G,1631317205,1,0,0
+3164,8,7,1,71,0,2b680979a7b54d069c32fbc7ab2854fb,5f15052fe4b845f0a7825a1bd4a808a8,09/10/2021 23:45:06G,1631317205,1,0,0
+3165,26,7,1,272,0,fe7f802f96f14531920cf3834f3cd885,9845599f49d246438f13e8f2c0cf583f,09/10/2021 23:45:06G,1631317205,1,0,0
+3166,29,7,1,71,0,094a4fcdd1474027867fa566eb7d335f,1a6e427d7f2e4f8e84302cacdaf984b2,09/10/2021 23:45:06G,1631317205,1,0,0
+3167,6,7,1,3,1,39bf431aaed44ee889987f45ab4cded1,a136d09e42c04003b7a19a1e2c85ad85,09/10/2021 23:45:06G,1631317205,1,0,0
+3168,40,7,1,0,0,cd68f855d75744b08eda800fbd566705,d3053550a7114eee969fb8ab1e14284b,09/10/2021 23:45:06G,1631317205,1,0,0
+3169,28,7,1,0,0,460bddbc3bbc4987b540f1f19eabe23a,e2d4c6899db84bbbaad981313a0f406e,09/10/2021 23:45:06G,1631317205,1,0,0
+3170,6,7,1,3,3,5bd32de50d714f3b86879d656684584d,f3799f7cb94c49f0b74c82e9527d4dd2,09/10/2021 23:45:06G,1631317205,1,0,0
+3171,40,7,1,0,0,a7ff85bffda64487b56d5ebbe720c935,fa1f5008097543f68f934ef90df63ffc,09/10/2021 23:45:06G,1631317205,1,0,0
+3172,28,7,1,0,0,7ddf4d31f15a4fc8884c7481b6367200,b2ce017a549c46babb3bc28ef4955217,09/10/2021 23:45:06G,1631317205,1,0,0
+3173,6,7,1,4,10,bfa918d8a91c401da3ea0aa87ab8fd50,4ffceb16cc734d6dbf95a2e97798bfba,09/10/2021 23:45:06G,1631317205,1,0,0
+3174,40,7,1,0,0,c44e746c49ed4e039c908e21448acba3,8186c73eb5ef4f3991d2488fa39a1305,09/10/2021 23:45:06G,1631317205,1,0,0
+3175,28,7,1,0,0,5258828e67bb45c3be341b01077840bd,4afb3cc75d0b4196b15c2fe8b813ab6c,09/10/2021 23:45:06G,1631317205,1,0,0
+3176,6,7,1,4,11,158dd72ae92f497e8c89700567c4bc6b,2a93713d9a04469f89adb03d085291c6,09/10/2021 23:45:06G,1631317205,1,0,0
+3177,40,7,1,0,0,e2bf6807f15943b68a7f39975864d603,0b5156d5835145aebe577847f5c8bce7,09/10/2021 23:45:06G,1631317205,1,0,0
+3178,28,7,1,0,0,b211b8a1ad3d4785ade7f963e6172f62,8e30f77f7aa34a0cb4ca7150f22ce2f1,09/10/2021 23:45:06G,1631317205,1,0,0
+3179,6,7,1,3,12,8673c254bc504c44831fea2bd47cf6c5,10af6956f9424091938828b466f2c0ad,09/10/2021 23:45:06G,1631317205,1,0,0
+3180,40,7,1,0,0,79a27a7a16e34a59b6731c8508fac676,213b87229de64dd097c84d8880ce20cd,09/10/2021 23:45:06G,1631317205,1,0,0
+3181,28,7,1,0,0,a77656a1ef6f438db8ff6ad8e3c14c81,0ab7aa5c8c5d45439e5a66f60f6b89fe,09/10/2021 23:45:06G,1631317205,1,0,0
+3182,6,7,1,6,13,5426126aed8448c98a677e1bca5459f7,0d8ac5c8df4d4884887b7b3310111e97,09/10/2021 23:45:06G,1631317205,1,0,0
+3183,40,7,1,0,0,5a10f5ff016049ae850d3cd11a2e034c,2c88feb3d71240338765d9b27dc7d21a,09/10/2021 23:45:06G,1631317205,1,0,0
+3184,28,7,1,0,0,012edf5a84d5406dac774b8f95c35810,27b2b6af942d49bd913b4f1d04a656e0,09/10/2021 23:45:06G,1631317205,1,0,0
+3185,6,7,1,7,13,fd62948d411c4b79a1245d3416929f97,b8bf5e6e83d8457f942196dcca778509,09/10/2021 23:45:06G,1631317205,1,0,0
+3186,40,7,1,0,0,87910b22d7e54b829e7ee9c33276b80a,a0add4948528462d8d7453c55d35c73b,09/10/2021 23:45:06G,1631317205,1,0,0
+3187,28,7,1,0,0,dd33255e3e3c4b428ce6bb07f8f70a68,d8e59c0f396841ebbbf3fbb2e6ad5bdd,09/10/2021 23:45:06G,1631317205,1,0,0
+3188,6,7,1,8,13,02a60ea5625d4d548a272258f3b2b2b9,1e323d8d30de4b4193bc46a650b22dcb,09/10/2021 23:45:06G,1631317205,1,0,0
+3189,40,7,1,0,0,771ad1954a1946ed82ba9e2c94a3054e,c5868841e3f443f284b9a537b52bf3b0,09/10/2021 23:45:06G,1631317205,1,0,0
+3190,28,7,1,0,0,d256196487b34d04a1ec6c332ef3d6e3,ff905e0b6d2144f6b6533d6042b281c0,09/10/2021 23:45:06G,1631317205,1,0,0
+3191,6,7,1,5,14,4717b10552124a8284f06deee9827bc4,2fbc17edff86491990976ff55bfc5c88,09/10/2021 23:45:06G,1631317205,1,0,0
+3192,40,7,1,0,0,2e95b125d9864ef7b6c41fdcda3a2ae7,db55ea83bc6f492a8a4ae7e1cc60aeac,09/10/2021 23:45:06G,1631317205,1,0,0
+3193,28,7,1,0,0,daa1c7cec01d47aab79b7f81639593fa,1a75f79a532145d0af91d74bc133a122,09/10/2021 23:45:06G,1631317205,1,0,0
+3194,6,7,1,6,14,245fd4a1577542c5a4a6047886690842,2e59f2745bd646b89b2a9982d84bb6f5,09/10/2021 23:45:06G,1631317205,1,0,0
+3195,40,7,1,0,0,7d4d559b52ff44f9ba6e339941c87b23,0c8b40421dc641699191d5b4e25e25ec,09/10/2021 23:45:06G,1631317205,1,0,0
+3196,28,7,1,0,0,f34dfd4775594a68aeedbfd1bead7c2d,eca2658649ce4996a78dca2858f48acc,09/10/2021 23:45:06G,1631317205,1,0,0
+3197,6,7,1,5,17,f0e4a17a6e774c018168645ef9c0178e,16994e776a4d43d9b0d7275d7229246b,09/10/2021 23:45:06G,1631317205,1,0,0
+3198,40,7,1,0,0,c2c7a15849b54c988868b81caeb28668,f9816398008145f396cd82079393d4b0,09/10/2021 23:45:06G,1631317205,1,0,0
+3199,28,7,1,0,0,118fc45876694228b6528a234580c23f,741ea14367f2416f9a0d112ffa7ce35d,09/10/2021 23:45:06G,1631317205,1,0,0
+3200,6,7,1,6,17,5693e7c01dc84018af2647ed8d035026,a1b7b61034be4536bdc5631fc6b90f58,09/10/2021 23:45:06G,1631317205,1,0,0
+3201,40,7,1,0,0,2f4b62dca30747f499d426f6f10b5d1f,88ebcc7b5aa8469b8d97f10a8fb0da9d,09/10/2021 23:45:06G,1631317205,1,0,0
+3202,28,7,1,0,0,37613d097cb145078ab1022259b27aa1,2c513c95aa5047bb99b379eae96faeec,09/10/2021 23:45:06G,1631317205,1,0,0
+3203,6,7,1,7,17,0d518e8953b644a2bade15c712651891,8866cacb1d4548eca5a10810d9384e07,09/10/2021 23:45:06G,1631317205,1,0,0
+3204,40,7,1,0,0,67a8618f2ab340ea8ad42e080fb3fec9,dc50d992635441a5b1dd4b5fd12f9fde,09/10/2021 23:45:06G,1631317205,1,0,0
+3205,28,7,1,0,0,b9142f6f5fa44f32941ec478015a1b2e,c0754576dcda4607929a5ef2775210cc,09/10/2021 23:45:06G,1631317205,1,0,0
+3206,6,7,1,5,24,9eeaa00910ff43f395e4dac40accabb7,a0e78d5611ee4c379a5b8ea5e888cf51,09/10/2021 23:45:06G,1631317205,1,0,0
+3207,40,7,1,0,0,7cda8024ef8f482eb26f6b98e6d9b334,5735c88c557941e0a3bc0e4f6be517ec,09/10/2021 23:45:06G,1631317205,1,0,0
+3208,28,7,1,0,0,6719c50d8e134b6ab5cb2e69c15f7555,e97b47243c734e71b017a44b6b2e4cd1,09/10/2021 23:45:06G,1631317205,1,0,0
+3209,6,7,1,6,24,11b7fc96e0ad45738d254cfb33e4e560,44ab53267f204680a3e62c595d9ae236,09/10/2021 23:45:06G,1631317205,1,0,0
+3210,40,7,1,0,0,d953677f2d2b48cdb66d5d94c4e84f86,5645728a67b54bc6af5ed826c60e6c78,09/10/2021 23:45:06G,1631317205,1,0,0
+3211,28,7,1,0,0,60d95d6c6254470c907fad3e151af140,2e14bbd8a9654e668be9ca14959ede41,09/10/2021 23:45:06G,1631317205,1,0,0
+3212,67,7,1,5,0,3e82c68c949944d9a98cabfb8d45c9ad,accc48b573e244c99caa8f33d093cc23,09/10/2021 23:45:06G,1631317505,1,0,0
+3213,68,7,1,5,0,b3c9b939aca948c9afe7bf79f2ff801b,e38d627d0ed64fa2b3f272ebf29a53a1,09/10/2021 23:45:06G,1631317505,1,0,0
+3214,69,7,1,5,0,8c707e49d8b341faacbcaa795e0d8bc3,eff6f212d49d4328a6becdc9403efa34,09/10/2021 23:45:06G,1631317505,1,0,0
+3215,70,7,1,5,0,9820bf33fa24406ab952a4ee717753dc,d4a2d311647d41e1b6175af9e9705692,09/10/2021 23:45:06G,1631317505,1,0,0
+3216,71,7,1,5,0,54af27587b224005a0c118383e41b095,20b9a1bdaa504691b7933a1a36a3c83b,09/10/2021 23:45:06G,1631317505,1,0,0
+3217,72,7,1,5,0,9a30f2a9fe96426d905b7cca99484117,4b5c453e6ca54db592611000d199fc1b,09/10/2021 23:45:06G,1631317505,1,0,0
+3218,73,7,1,5,0,d9ce26a019cf47dfbbe7d9e8a98f9ee0,8d9c801f16ea40ed85ba77179d3f2bf3,09/10/2021 23:45:06G,1631317505,1,0,0
+3219,74,7,1,5,0,4cd8a3fafee54da1b5d609684104f20a,56fb18686e994c63bc20466b71b8b34b,09/10/2021 23:45:06G,1631317505,1,0,0
+2176,1,1,1,21,1,29397a7361aa40a594f0778573f46efe,cfab9c8b98fd487b8a0c4b3d30ff5686,05/13/2021 16:40:26G,1620923690,1,0,0
+2177,1,1,1,22,1,2ac5094e775349968dc1379ba56d9ea6,7fb84511e35a4cae85c019f60a7a08ac,05/13/2021 16:40:26G,1620923690,1,0,0
+2192,53,0,1,0,0,48cdc0e893a841c4a6bf0cb1609053a9,b6c7e1b5e2874795bfbe365ca8e0da5b,05/13/2021 16:40:26G,1620923769,1,0,0
+2195,53,0,1,0,0,9ecfb09d599048409b15f0885572cb7c,dbec7886f9154accae5fc2d8204c709c,05/13/2021 16:40:26G,1620923769,1,0,0
+2206,37,5,1,0,0,f198f51ab9094b27a0ba476f9e65b357,e6482701861340849ffaee0d74ef9c54,05/13/2021 16:40:26G,1620923769,1,0,0
+2207,37,5,1,0,0,a4f9989f61374aec92c37740377bca31,c03ca19401b141f2b0283abcb990b06b,05/13/2021 16:40:26G,1620923769,1,0,0
+2208,37,5,1,0,0,04a8624303f2459d97de89f0cee82fa6,21227bfc962b4ef6be12f5195566497c,05/13/2021 16:40:26G,1620923769,1,0,0
+2209,37,5,1,0,0,e68861f5531445afbd17885e30a7dc92,0b366d898692426eb7a06b97c0d9257a,05/13/2021 16:40:26G,1620923769,1,0,0
+2210,37,5,1,0,0,8ed3bb9179ae46c4981e2e456324132d,e9782a57046741caae27c72d21bf25ea,05/13/2021 16:40:26G,1620923769,1,0,0
+2211,37,5,1,0,0,896637dfafe04085b7f8836f44802982,6bc9d22ffb7845dd8e8f9a1e0efc41a4,05/13/2021 16:40:26G,1620923769,1,0,0
+2212,37,5,1,0,0,ce74608421044daebca8021a7065edf4,f2301506d103427a8aabf0638ba67a0d,05/13/2021 16:40:26G,1620923769,1,0,0
+2213,37,5,1,0,0,d8dba54ed72d4a99ab22aaa33a8c4ad0,4a2de29e433647afa74b1bb87a675c17,05/13/2021 16:40:26G,1620923769,1,0,0
+2214,37,5,1,0,0,cce63d811b8940dfa07e28a0a3b77e1e,dd19a14ab1a24ab8a1c00279df6526f3,05/13/2021 16:40:26G,1620923769,1,0,0
+2218,37,5,1,0,0,abdefb2c873849379c6d49a4229c4824,23dec006667641ad99249a5f88526891,05/13/2021 16:40:26G,1620923769,1,0,0
+2219,37,5,1,0,0,a8ffd5c5cc11495c902cda4a3596aaef,358f8d4e46d847f1bc624020eff7f1f3,05/13/2021 16:40:26G,1620923769,1,0,0
+2222,38,5,1,0,0,678c9f18e78141feaf9a3ecee56e320b,50e1d8d8075046e8aed68cfe8e1795e1,05/13/2021 16:40:26G,1620923769,1,0,0
+2229,38,5,1,0,0,8580a7fd1d244f21a2723489099162bd,59fbc14de6f547abb1888ee2fe620d99,05/13/2021 16:40:26G,1620923769,1,0,0
+2230,38,5,1,0,0,8d7d1723b2b24fb580d4d7f503d3060e,bd68e5d6983044028cd18aea9a24a743,05/13/2021 16:40:26G,1620923769,1,0,0
+2231,38,5,1,0,0,338cb00b644d4915a81a7197c761ed4f,f5a159778c1c4ba5952829af2dfcb60c,05/13/2021 16:40:26G,1620923769,1,0,0
+2232,38,5,1,0,0,5d396e45b5034b85a619b22439bd1ae5,b95f390e07674c7c98edc2bf3ac2b3b3,05/13/2021 16:40:26G,1620923769,1,0,0
+2233,38,5,1,0,0,82581fa7e0d645b2be7f02207edbf4ee,df5bf0c05d7f4bf98e373e9fe8c38cac,05/13/2021 16:40:26G,1620923769,1,0,0
+2234,38,5,1,0,0,073bf6c97a8144c7a642f118df86cec6,b36412cad5fe4fe3b6f758cadc06db0a,05/13/2021 16:40:26G,1620923769,1,0,0
+2235,38,5,1,0,0,faccaa1b6ca949819dc8b10dd395f9d1,6e40a84ca0c44c2388d0c9bbc4258207,05/13/2021 16:40:26G,1620923769,1,0,0
+2236,38,5,1,0,0,e799ab1351e44ae3a14f06206ddfceae,70c20ee14f8041a094e55e89eee655e3,05/13/2021 16:40:26G,1620923769,1,0,0
+2237,38,5,1,0,0,e171d91061c24a7f8a1d2f270742ec37,01308735facd4bbab41805b6d083efbc,05/13/2021 16:40:26G,1620923769,1,0,0
+2240,37,5,1,0,0,df0e8dadc596428f8a4d1ddfaf132052,4d921fe4511d4098bffc8c9919f8cb25,05/13/2021 16:40:26G,1620923769,1,0,0
+2241,38,5,1,0,0,dfd8b350dac847f8a9ffa701a09c5b28,931d2f465cd14339bae53feab7c1a0f4,05/13/2021 16:40:26G,1620923769,1,0,0
+2242,38,5,1,0,0,93512d35c5d040368ef26059726007df,980468908bc740cab4fad2985860ae39,05/13/2021 16:40:26G,1620923769,1,0,0
+2243,38,5,1,0,0,8dc7c2f149b14a4ab424889f17aca266,13a902650c444c2c9fab1fd4bfc749da,05/13/2021 16:40:26G,1620923769,1,0,0
+2252,38,5,1,0,0,56c4a18b672e412481aa0eeb06d2c1fc,62d3e96cd81e45059046119f08d24b99,05/13/2021 16:40:26G,1620923769,1,0,0
+2257,38,5,1,0,0,20dac85562a2445bab4d137edc50bfb0,d5f0ac2556934c67919f50c29208b932,05/13/2021 16:40:26G,1620923769,1,0,0
+2258,38,5,1,0,0,a169b8421db74a91a1363d93cd367d3c,51dfaed0da5f4f45a39735a9709fdaaa,05/13/2021 16:40:26G,1620923769,1,0,0
+2263,38,5,1,0,0,7cb3767a208d4f6dafccb6f81e6e808c,18f81798de454b289da7484c62a8032e,05/13/2021 16:40:26G,1620923769,1,0,0
+2266,38,5,1,0,0,e451a15ce5b64b15ae5d9b1f793e2046,cf6a5d671d244c6785a2ea229b8bc985,05/13/2021 16:40:26G,1620923769,1,0,0
+2267,38,5,1,0,0,818f6b781ca442c4a5118eabd045d8a8,6385a93bf403401a8da143a48438c770,05/13/2021 16:40:26G,1620923769,1,0,0
+2268,38,5,1,0,0,a6919f5cf1754128b6a152387dfe3934,8f384158e30f479aa86ad94ff9633729,05/13/2021 16:40:26G,1620923769,1,0,0
+2269,38,5,1,0,0,b142147c38394ac4939709035132a6f3,afb943b3b5114cc9a69a4c3c190aad5e,05/13/2021 16:40:26G,1620923769,1,0,0
+2270,38,5,1,0,0,f1b5545c6f5b4123b88268f64c4f2a8a,75c3baad313f4d2293a2c149cee1b8c8,05/13/2021 16:40:26G,1620923769,1,0,0
+2271,37,5,1,0,0,91038034f7b44f73826ffdce86653155,9d9c79a557e84bf2a15da207f27b8233,05/13/2021 16:40:26G,1620923769,1,0,0
+2272,37,5,1,0,0,826d4850d5aa4a54a647e2214fa1b04f,3d91ee800a6e4b5ea41083b329526b3b,05/13/2021 16:40:26G,1620923769,1,0,0
+2273,38,5,1,0,0,eb829dd981d7425aa164bf9998a417c0,b94f60ffd146407da5cd18f69b6618fd,05/13/2021 16:40:26G,1620923769,1,0,0
+2274,38,5,1,0,0,d079b64888844a538f6ee485fa73ee9f,29ba94e43f4c479f9708858153ff85c7,05/13/2021 16:40:26G,1620923769,1,0,0
+2275,38,5,1,0,0,6e59ceb335004d1ca41b96c7e0954e60,49bd3892fce848b5964fe58c62787c54,05/13/2021 16:40:26G,1620923769,1,0,0
+2276,38,5,1,0,0,374c7b81901748049ed247a246a497cb,a17d635ce84240418791730dc84e9d19,05/13/2021 16:40:26G,1620923769,1,0,0
+2277,38,5,1,0,0,a2f27d074ffa46a8aa92b56da31c7446,944c7b851aa6486b8c7e5780b39a055d,05/13/2021 16:40:26G,1620923769,1,0,0
+2278,38,5,1,0,0,23665fc5e7ad48e59ecdc2184e272276,3218d426283a4edcb1de8d1bb70cb868,05/13/2021 16:40:26G,1620923769,1,0,0
+2279,38,5,1,0,0,738e2325cd0a4bc5973298a01afee156,6beceb9a14de4b618513f690cf303025,05/13/2021 16:40:26G,1620923769,1,0,0
+2280,38,5,1,0,0,5ceb3030f4ba44de8cf473db88d549e1,c4ebd742809d48d09e09c0d711648b16,05/13/2021 16:40:26G,1620923769,1,0,0
+2281,37,5,1,0,0,fdeab1c291414ceb9a4d153d7e8a9f10,5fcb2a61f8e14ab9a4ef60bb35a469c5,05/13/2021 16:40:26G,1620923769,1,0,0
+2282,37,5,1,0,0,7144ecaa0d0c4554a22fc6aacb2f6305,a25c023d666d46779ef71ef2e5f920a2,05/13/2021 16:40:26G,1620923769,1,0,0
+2283,37,5,1,0,0,8449e4aac406429ebd67faa8046c8017,c6401d7dedce4572bbdb3f5a8e5080e9,05/13/2021 16:40:26G,1620923769,1,0,0
+2284,37,5,1,0,0,ea3d0431ecd54936a70278f5e29163fb,4e8e909e45e54cbfb02cca302e6ba15d,05/13/2021 16:40:26G,1620923769,1,0,0
+2285,37,5,1,0,0,77f22d35fdd742ad91a1f35b435dc810,3c77765f7e974aa98bf8a3f4feb5ec31,05/13/2021 16:40:26G,1620923769,1,0,0
+2296,1,1,1,12,11,2bf38d3e4988423381136e40bcadc262,5df323cf86eb40c0b2f2f2f1dc8994d2,09/10/2021 22:10:36G,1631311806,1,0,0
+2307,8,1,1,51,0,7d2eb81c2a73480f8688ec26693cc2e8,0412aec7d7444812bb11589b2f930506,09/10/2021 22:10:36G,1631311815,1,0,0
+2308,29,1,1,51,0,7f3ca9372fe34193b0edf529d7a84852,e35c82a1e80f49398101f3b8a573e98f,09/10/2021 22:10:36G,1631311815,1,0,0
+2309,1,1,1,13,11,225e19e73b864cdab0c1edc097a7e300,e19deedf3f5048db841dcf11dba69058,09/10/2021 22:10:36G,1631311831,1,0,0
+2310,26,1,1,219,0,d7a9ab2b32b8491b9dd01937acb454c1,5e0a6ca8c4404dd88631a49b6aeeb890,09/10/2021 22:10:36G,1631311831,1,0,0
+2311,6,1,1,2,11,57c91c434d094e8f9be6b2ec0325eb6f,9cc4b80ab2604f50934ec8e80533cc59,09/10/2021 22:51:45G,1631312015,1,0,0
+2312,40,1,1,0,0,67cc320e0e8348c7a35504f33ece17d3,8292b4055b304e108f479ce370e402bf,09/10/2021 22:51:45G,1631312015,1,0,0
+2313,28,1,1,0,0,2ee5a6e81a754e6da82bad791a309ff7,cf5913723de5445f9453b0762e2a7b66,09/10/2021 22:51:45G,1631312015,1,0,0
+2314,28,1,1,0,0,61811f81ae684e93915f472cfd78518c,1104b3bca1064221ad2a9dc76df2b814,09/10/2021 22:51:45G,1631312015,1,0,0
+2320,1,1,1,6,10,b6c0261069a34fe795aadb8cec9e4708,e33548bc9e2640e3b870f57863953c2c,09/10/2021 22:51:45G,1631312095,1,0,0
+2330,8,1,1,53,0,4862ef8908464ef39be349c0084a3814,012d305525eb48ecad0962a474e59f08,09/10/2021 22:51:45G,1631312102,1,0,0
+2331,29,1,1,53,0,2ae690dea49a49128b8280f6f60a4b38,e0616710425b403185af2904e5d37727,09/10/2021 22:51:45G,1631312102,1,0,0
+
+ObjectDefinition
+ObjectType_Id,Description,ObjectName,Global_User_ID,Row_Time_Stamp
+1,"",Attribute,0,0
+2,"",Check Constraint,0,0
+3,"",Domain,0,0
+4,"",Diagram,0,0
+5,"",Entity,0,0
+6,"",Index,0,0
+7,"",Model,0,0
+8,"",Relationship,0,0
+9,"",User Data Type,0,0
+10,"",Default,0,0
+11,"",Rule,0,0
+12,"",View,0,0
+13,"",View Table,0,0
+14,"",View Field,0,0
+15,"",Parent Field Column,0,0
+16,"",View Column,0,0
+17,"",Column Usage,0,0
+18,"",View Component,0,0
+19,"",Trigger,0,0
+20,"",Procedure,0,0
+21,"",Package,0,0
+22,"",Dictionary Object,0,0
+23,"",Reusable Procedure,0,0
+24,"",Templated Procedure,0,0
+25,"",SubModel,0,0
+26,"",ParentChildPair,0,0
+27,"",Entity Display,0,0
+28,"",IndexColumn,0,0
+29,"",Relation Display,0,0
+30,"",Graphic Display,0,0
+31,"",View Display,0,0
+32,"",View Relation Display,0,0
+33,"",Supertype,0,0
+34,"",Supertype Display,0,0
+35,"",Subtype,0,0
+36,"",Diagram Display,0,0
+37,"",Font Default,0,0
+38,"",Color Default,0,0
+39,"",Grid Display,0,0
+40,"",Index Storage,0,0
+41,"",Table Storage,0,0
+42,"",Algorithm Property,0,0
+43,"",Docking Position,0,0
+44,"",Dock Pos Disp Level,0,0
+45,"",Submodel Algorithm,0,0
+46,"",Dictionary Trigger,0,0
+47,"",Dictionary Library,0,0
+48,"",Bound Dictionary Object,0,0
+49,"",Referenced Object,0,0
+50,"",MetaClass Member,0,0
+51,"",Property Usage,0,0
+52,"",Property Value Usage,0,0
+53,"",Model Option,0,0
+54,"",InterModelRelationship,0,0
+55,"",Data Dictionary,0,0
+56,"",Storage Object,0,0
+57,"",Reference Value,0,0
+58,"",Attachment Type,0,0
+59,"",Valid Attachment Type,0,0
+60,"",Attachment,0,0
+61,"",Submodel Link,0,0
+62,"",Dictionary Object Link,0,0
+63,"",Object Font Override,0,0
+64,"",Object Color Override,0,0
+65,"",Connector,0,0
+66,"",Path Node,0,0
+67,"",Graph Geometry,0,0
+68,"",Disconnected Nodes Layout,0,0
+69,"",Components Layout,0,0
+70,"",Circular Layout,0,0
+71,"",Hierarchical Layout,0,0
+72,"",Orthogonal Layout,0,0
+73,"",Symmetric Layout,0,0
+74,"",Tree Layout,0,0
+75,"",Default Constraint,0,0
+76,"",Submodel Schema Obj Link,0,0
+77,"",Schema Obj Edge,0,0
+78,"",Transform Member,0,0
+79,"",Object Transform,0,0
+80,"",Shape,0,0
+81,"",Shape Edge,0,0
+82,"",Shape Display,0,0
+83,"",Shape Edge Display,0,0
+84,"",User Object Match,0,0
+85,"",Database User,0,0
+86,"",Database Role,0,0
+87,"",Object Permission,0,0
+88,"",User Role Member,0,0
+89,"",Naming Standards Template,0,0
+90,"",Transformation,0,0
+91,"",Transformation Display,0,0
+92,"",Lineage Component,0,0
+93,"",Lineage Component Display,0,0
+94,"",Lineage Stream,0,0
+95,"",Lineage Stream Display,0,0
+96,"",Lineage Stream Member,0,0
+97,"",Object Tracking,0,0
+98,"",Attribute Display Override,0,0
+
+Object_Domain
+Object_Domain_ID,Name,Type,GUID
+1,dominoAPI CI4.DM1,DIAGRAM,86737afbcb7e4c22a98881ba11c4ba70
+2,dominoAPI CI4_DD,DATA_DICTIONARY,23658e1f6edd465a9e20328846f8d0b7
+
diff --git a/app/Models/SQL/dominoAPI CI4v1.sql b/app/Models/SQL/dominoAPI CI4v1.sql
new file mode 100644
index 0000000..c9eb9e1
--- /dev/null
+++ b/app/Models/SQL/dominoAPI CI4v1.sql	
@@ -0,0 +1,419 @@
+--
+-- ER/Studio 8.0 SQL Code Generation
+-- Company :      CASA
+-- Project :      dominoAPI CI4.DM1
+-- Author :       Dayron
+--
+-- Date Created : Friday, September 10, 2021 19:42:34
+-- Target DBMS : MySQL 5.x
+--
+
+-- 
+-- TABLE: boleta 
+--
+
+CREATE TABLE boleta(
+    id                INT         AUTO_INCREMENT,
+    evento_id         INT         NOT NULL,
+    ronda_id          INT         NOT NULL,
+    mesa_id           INT         NOT NULL,
+    es_valida         BIT(1)      DEFAULT TRUE NOT NULL,
+    fecha_registro    CHAR(10),
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: boleta_pareja 
+--
+
+CREATE TABLE boleta_pareja(
+    id           INT         AUTO_INCREMENT,
+    boleta_id    INT         NOT NULL,
+    pareja_id    INT         NOT NULL,
+    salidor      BIT(1)      DEFAULT FALSE NOT NULL,
+    tantos       INT         NOT NULL,
+    resultado    INT         DEFAULT 0 NOT NULL,
+    ganador      BIT(1)      DEFAULT FALSE NOT NULL,
+    inicio       DATETIME    NOT NULL,
+    duracion     DATETIME,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: ciudad 
+--
+
+CREATE TABLE ciudad(
+    id         INT             AUTO_INCREMENT,
+    pais       VARCHAR(120)    NOT NULL,
+    pais_id    INT             NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: data 
+--
+
+CREATE TABLE data(
+    id                 INT         AUTO_INCREMENT,
+    numero             SMALLINT    NOT NULL,
+    boleta_id          INT         NOT NULL,
+    pareja_ganadora    INT         NOT NULL,
+    puntos             INT         NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: evento 
+--
+
+CREATE TABLE evento(
+    id              INT             AUTO_INCREMENT,
+    ciudad_id       INT             NOT NULL,
+    nombre          VARCHAR(120)    NOT NULL,
+    comentario      VARCHAR(255),
+    cerrado         BIT(1)          DEFAULT FALSE NOT NULL,
+    fecha_inicio    DATETIME,
+    fecha_cierre    DATETIME,
+    creado          DATETIME        NOT NULL,
+    actualizado     DATETIME        NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: jugador 
+--
+
+CREATE TABLE jugador(
+    id                  INT             AUTO_INCREMENT,
+    telefono            VARCHAR(15),
+    nombre              VARCHAR(120)    NOT NULL,
+    sexo                CHAR(1)         DEFAULT 'M' NOT NULL,
+    correo              VARCHAR(120)    NOT NULL,
+    nro_identidad       VARCHAR(30)     NOT NULL,
+    fecha_nacimiento    DATE            NOT NULL,
+    alias               VARCHAR(30),
+    ocupacion           VARCHAR(120),
+    comentario          VARCHAR(255),
+    nivel               VARCHAR(30)     NOT NULL,
+    elo                 INT             DEFAULT 0 NOT NULL,
+    ranking             CHAR(2),
+    tipo                CHAR(1),
+    ciudad_id           INT             NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: mesa 
+--
+
+CREATE TABLE mesa(
+    id           INT         AUTO_INCREMENT,
+    evento_id    INT         NOT NULL,
+    numero       SMALLINT    NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: pais 
+--
+
+CREATE TABLE pais(
+    id        INT             AUTO_INCREMENT,
+    nombre    VARCHAR(120)    NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: pareja 
+--
+
+CREATE TABLE pareja(
+    id             INT            AUTO_INCREMENT,
+    nombre         VARCHAR(60)    NOT NULL,
+    evento_id      INT            NOT NULL,
+    jugador1_id    INT            NOT NULL,
+    jugador2_id    INT            NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: ronda 
+--
+
+CREATE TABLE ronda(
+    id            INT             AUTO_INCREMENT,
+    evento_id     INT             NOT NULL,
+    numero        SMALLINT        NOT NULL,
+    inicio        DATETIME,
+    cierre        DATETIME,
+    dia           SMALLINT        NOT NULL,
+    cerrada       BIT(1)          DEFAULT FALSE NOT NULL,
+    comentario    VARCHAR(255),
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- INDEX: PK_ALT13 
+--
+
+CREATE UNIQUE INDEX PK_ALT13 ON boleta(evento_id, mesa_id, ronda_id)
+;
+-- 
+-- INDEX: Ref157 
+--
+
+CREATE INDEX Ref157 ON boleta(evento_id)
+;
+-- 
+-- INDEX: Ref1158 
+--
+
+CREATE INDEX Ref1158 ON boleta(ronda_id)
+;
+-- 
+-- INDEX: Ref1059 
+--
+
+CREATE INDEX Ref1059 ON boleta(mesa_id)
+;
+-- 
+-- INDEX: Ref1360 
+--
+
+CREATE INDEX Ref1360 ON boleta_pareja(boleta_id)
+;
+-- 
+-- INDEX: Ref1761 
+--
+
+CREATE INDEX Ref1761 ON boleta_pareja(pareja_id)
+;
+-- 
+-- INDEX: Ref24 
+--
+
+CREATE INDEX Ref24 ON ciudad(pais_id)
+;
+-- 
+-- INDEX: PK_ALT14 
+--
+
+CREATE UNIQUE INDEX PK_ALT14 ON data(boleta_id, numero)
+;
+-- 
+-- INDEX: Ref1362 
+--
+
+CREATE INDEX Ref1362 ON data(boleta_id)
+;
+-- 
+-- INDEX: Ref1763 
+--
+
+CREATE INDEX Ref1763 ON data(pareja_ganadora)
+;
+-- 
+-- INDEX: Ref35 
+--
+
+CREATE INDEX Ref35 ON evento(ciudad_id)
+;
+-- 
+-- INDEX: Ref312 
+--
+
+CREATE INDEX Ref312 ON jugador(ciudad_id)
+;
+-- 
+-- INDEX: K_ALT10 
+--
+
+CREATE UNIQUE INDEX K_ALT10 ON mesa(evento_id, numero)
+;
+-- 
+-- INDEX: Ref153 
+--
+
+CREATE INDEX Ref153 ON mesa(evento_id)
+;
+-- 
+-- INDEX: Ref167 
+--
+
+CREATE INDEX Ref167 ON pareja(evento_id)
+;
+-- 
+-- INDEX: Ref1270 
+--
+
+CREATE INDEX Ref1270 ON pareja(jugador1_id)
+;
+-- 
+-- INDEX: Ref1271 
+--
+
+CREATE INDEX Ref1271 ON pareja(jugador2_id)
+;
+-- 
+-- INDEX: PK_ALT11 
+--
+
+CREATE UNIQUE INDEX PK_ALT11 ON ronda(evento_id, numero)
+;
+-- 
+-- INDEX: Ref151 
+--
+
+CREATE INDEX Ref151 ON ronda(evento_id)
+;
+-- 
+-- TABLE: boleta 
+--
+
+ALTER TABLE boleta ADD CONSTRAINT Refevento57 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+ALTER TABLE boleta ADD CONSTRAINT Refronda58 
+    FOREIGN KEY (ronda_id)
+    REFERENCES ronda(id)
+;
+
+ALTER TABLE boleta ADD CONSTRAINT Refmesa59 
+    FOREIGN KEY (mesa_id)
+    REFERENCES mesa(id)
+;
+
+
+-- 
+-- TABLE: boleta_pareja 
+--
+
+ALTER TABLE boleta_pareja ADD CONSTRAINT Refboleta60 
+    FOREIGN KEY (boleta_id)
+    REFERENCES boleta(id)
+;
+
+ALTER TABLE boleta_pareja ADD CONSTRAINT Refpareja61 
+    FOREIGN KEY (pareja_id)
+    REFERENCES pareja(id)
+;
+
+
+-- 
+-- TABLE: ciudad 
+--
+
+ALTER TABLE ciudad ADD CONSTRAINT Refpais4 
+    FOREIGN KEY (pais_id)
+    REFERENCES pais(id)
+;
+
+
+-- 
+-- TABLE: data 
+--
+
+ALTER TABLE data ADD CONSTRAINT Refboleta62 
+    FOREIGN KEY (boleta_id)
+    REFERENCES boleta(id)
+;
+
+ALTER TABLE data ADD CONSTRAINT Refpareja63 
+    FOREIGN KEY (pareja_ganadora)
+    REFERENCES pareja(id)
+;
+
+
+-- 
+-- TABLE: evento 
+--
+
+ALTER TABLE evento ADD CONSTRAINT Refciudad5 
+    FOREIGN KEY (ciudad_id)
+    REFERENCES ciudad(id)
+;
+
+
+-- 
+-- TABLE: jugador 
+--
+
+ALTER TABLE jugador ADD CONSTRAINT Refciudad12 
+    FOREIGN KEY (ciudad_id)
+    REFERENCES ciudad(id)
+;
+
+
+-- 
+-- TABLE: mesa 
+--
+
+ALTER TABLE mesa ADD CONSTRAINT Refevento53 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+
+-- 
+-- TABLE: pareja 
+--
+
+ALTER TABLE pareja ADD CONSTRAINT Refevento67 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+ALTER TABLE pareja ADD CONSTRAINT Refjugador70 
+    FOREIGN KEY (jugador1_id)
+    REFERENCES jugador(id)
+;
+
+ALTER TABLE pareja ADD CONSTRAINT Refjugador71 
+    FOREIGN KEY (jugador2_id)
+    REFERENCES jugador(id)
+;
+
+
+-- 
+-- TABLE: ronda 
+--
+
+ALTER TABLE ronda ADD CONSTRAINT Refevento51 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+
diff --git a/app/Models/SQL/dominoAPI CI4v1_mySql.sql b/app/Models/SQL/dominoAPI CI4v1_mySql.sql
new file mode 100644
index 0000000..cecc1a0
--- /dev/null
+++ b/app/Models/SQL/dominoAPI CI4v1_mySql.sql	
@@ -0,0 +1,329 @@
+-- phpMyAdmin SQL Dump
+-- version 5.1.0
+-- https://www.phpmyadmin.net/
+--
+-- Servidor: 127.0.0.1
+-- Tiempo de generaciĆ³n: 11-09-2021 a las 01:44:02
+-- VersiĆ³n del servidor: 10.4.18-MariaDB
+-- VersiĆ³n de PHP: 8.0.3
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Base de datos: `domino`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `boleta`
+--
+
+CREATE TABLE `boleta` (
+  `id` int(11) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `ronda_id` int(11) NOT NULL,
+  `mesa_id` int(11) NOT NULL,
+  `es_valida` bit(1) NOT NULL DEFAULT b'1',
+  `fecha_registro` char(10) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `boleta_pareja`
+--
+
+CREATE TABLE `boleta_pareja` (
+  `id` int(11) NOT NULL,
+  `boleta_id` int(11) NOT NULL,
+  `pareja_id` int(11) NOT NULL,
+  `salidor` bit(1) NOT NULL DEFAULT b'0',
+  `tantos` int(11) NOT NULL,
+  `resultado` int(11) NOT NULL DEFAULT 0,
+  `ganador` bit(1) NOT NULL DEFAULT b'0',
+  `inicio` datetime NOT NULL,
+  `duracion` datetime DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `ciudad`
+--
+
+CREATE TABLE `ciudad` (
+  `id` int(11) NOT NULL,
+  `pais` varchar(120) NOT NULL,
+  `pais_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `data`
+--
+
+CREATE TABLE `data` (
+  `id` int(11) NOT NULL,
+  `numero` smallint(6) NOT NULL,
+  `boleta_id` int(11) NOT NULL,
+  `pareja_ganadora` int(11) NOT NULL,
+  `puntos` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `evento`
+--
+
+CREATE TABLE `evento` (
+  `id` int(11) NOT NULL,
+  `ciudad_id` int(11) NOT NULL,
+  `nombre` varchar(120) NOT NULL,
+  `comentario` varchar(255) DEFAULT NULL,
+  `cerrado` bit(1) NOT NULL DEFAULT b'0',
+  `fecha_inicio` datetime DEFAULT NULL,
+  `fecha_cierre` datetime DEFAULT NULL,
+  `creado` datetime NOT NULL,
+  `actualizado` datetime NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `jugador`
+--
+
+CREATE TABLE `jugador` (
+  `id` int(11) NOT NULL,
+  `telefono` varchar(15) DEFAULT NULL,
+  `nombre` varchar(120) NOT NULL,
+  `sexo` char(1) NOT NULL DEFAULT 'M',
+  `correo` varchar(120) NOT NULL,
+  `nro_identidad` varchar(30) NOT NULL,
+  `fecha_nacimiento` date NOT NULL,
+  `alias` varchar(30) DEFAULT NULL,
+  `ocupacion` varchar(120) DEFAULT NULL,
+  `comentario` varchar(255) DEFAULT NULL,
+  `nivel` varchar(30) NOT NULL,
+  `elo` int(11) NOT NULL DEFAULT 0,
+  `ranking` char(2) DEFAULT NULL,
+  `tipo` char(1) DEFAULT NULL,
+  `ciudad_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `mesa`
+--
+
+CREATE TABLE `mesa` (
+  `id` int(11) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `numero` smallint(6) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `pais`
+--
+
+CREATE TABLE `pais` (
+  `id` int(11) NOT NULL,
+  `nombre` varchar(120) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `pareja`
+--
+
+CREATE TABLE `pareja` (
+  `id` int(11) NOT NULL,
+  `nombre` varchar(60) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `jugador1_id` int(11) NOT NULL,
+  `jugador2_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Estructura de tabla para la tabla `ronda`
+--
+
+CREATE TABLE `ronda` (
+  `id` int(11) NOT NULL,
+  `evento_id` int(11) NOT NULL,
+  `numero` smallint(6) NOT NULL,
+  `inicio` datetime DEFAULT NULL,
+  `cierre` datetime DEFAULT NULL,
+  `dia` smallint(6) NOT NULL,
+  `cerrada` bit(1) NOT NULL DEFAULT b'0',
+  `comentario` varchar(255) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+--
+-- ƍndices para tablas volcadas
+--
+
+--
+-- Indices de la tabla `boleta`
+--
+ALTER TABLE `boleta`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `PK_ALT13` (`evento_id`,`mesa_id`,`ronda_id`),
+  ADD KEY `Ref157` (`evento_id`),
+  ADD KEY `Ref1158` (`ronda_id`),
+  ADD KEY `Ref1059` (`mesa_id`);
+
+--
+-- Indices de la tabla `boleta_pareja`
+--
+ALTER TABLE `boleta_pareja`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref1360` (`boleta_id`),
+  ADD KEY `Ref1761` (`pareja_id`);
+
+--
+-- Indices de la tabla `ciudad`
+--
+ALTER TABLE `ciudad`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref24` (`pais_id`);
+
+--
+-- Indices de la tabla `data`
+--
+ALTER TABLE `data`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `PK_ALT14` (`boleta_id`,`numero`),
+  ADD KEY `Ref1362` (`boleta_id`),
+  ADD KEY `Ref1763` (`pareja_ganadora`);
+
+--
+-- Indices de la tabla `evento`
+--
+ALTER TABLE `evento`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref35` (`ciudad_id`);
+
+--
+-- Indices de la tabla `jugador`
+--
+ALTER TABLE `jugador`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref312` (`ciudad_id`);
+
+--
+-- Indices de la tabla `mesa`
+--
+ALTER TABLE `mesa`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `K_ALT10` (`evento_id`,`numero`),
+  ADD KEY `Ref153` (`evento_id`);
+
+--
+-- Indices de la tabla `pais`
+--
+ALTER TABLE `pais`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Indices de la tabla `pareja`
+--
+ALTER TABLE `pareja`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Ref167` (`evento_id`),
+  ADD KEY `Ref1270` (`jugador1_id`),
+  ADD KEY `Ref1271` (`jugador2_id`);
+
+--
+-- Indices de la tabla `ronda`
+--
+ALTER TABLE `ronda`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `PK_ALT11` (`evento_id`,`numero`),
+  ADD KEY `Ref151` (`evento_id`);
+
+--
+-- AUTO_INCREMENT de las tablas volcadas
+--
+
+--
+-- AUTO_INCREMENT de la tabla `boleta`
+--
+ALTER TABLE `boleta`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `boleta_pareja`
+--
+ALTER TABLE `boleta_pareja`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `ciudad`
+--
+ALTER TABLE `ciudad`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `data`
+--
+ALTER TABLE `data`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `evento`
+--
+ALTER TABLE `evento`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `jugador`
+--
+ALTER TABLE `jugador`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `mesa`
+--
+ALTER TABLE `mesa`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `pais`
+--
+ALTER TABLE `pais`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `pareja`
+--
+ALTER TABLE `pareja`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT de la tabla `ronda`
+--
+ALTER TABLE `ronda`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/app/Models/SQL/dominoAPI.DM1 b/app/Models/SQL/dominoAPI.DM1
new file mode 100644
index 0000000..0bf3a51
--- /dev/null
+++ b/app/Models/SQL/dominoAPI.DM1
@@ -0,0 +1,3999 @@
+Repository_Object_Role
+Repository_Object_Role_ID,Repository_Role_ID,Object_Type,Object_GUID,Object_ID,Save_Date
+
+Repository_Role_Privilege
+Repository_Role_Privilege_ID,Repository_Role_ID,Privilege_Name
+
+Repository_Role
+Repository_Role_ID,Role_Name
+
+Repository_User_Info
+Repository_User_Info_ID,User_Name,Machine_Name,User_ID,Machine_ID,Flags
+
+Project_Link
+Project_Link_ID,Parent_Project_ID,Child_Project_ID,Ultimate_Parent_Project_ID,RootNode
+
+Defaults
+DefaultId,Dictionary_Object_ID,DefaultNameId,DefaultTextId,NSTFlag,Global_User_ID,Row_Time_Stamp
+
+Rules
+RuleId,Dictionary_Object_ID,RuleNameId,RuleTextId,Global_User_ID,NSTFlag,Row_Time_Stamp
+
+UserDatatype
+UserDatatypeId,Dictionary_Object_ID,Length,Scale,Nullable,CheckConstraintId,DeclaredDefaultId,UserDatatype,DatatypeId,DefaultId,RuleId,Global_User_ID,Row_Time_Stamp
+
+Domain
+DomainId,Dictionary_Object_ID,Length,Scale,Nullable,IdentityColumn,IdentitySeed,IdentityIncrement,DeclaredDefaultId,CheckConstraintId,DomainNameId,ColumnNameId,DatatypeId,UserDatatype,DefaultId,RuleId,UserDatatypeId,Reference_Value_ID,Naming_Standards_Template_ID,AttributeName_ID,Description_ID,Notes_ID,NSTFlag,IsCategory,Global_User_ID,Row_Time_Stamp
+
+Version
+VersionId,Version_ID,Copyright,Global_User_ID,Row_Time_Stamp
+800,1,"Copyright (c) Embarcadero Technologies, Inc. 1995-2003",0,0
+
+Diagram
+DiagramId,Version_ID,VersionId,LastUpdate,CreateDate,ActiveModel,ActiveSubmodel,VSplitterPosition,X,Y,Width,Height,DiagramNameId,AuthorId,CompanyId,VersionNoId,CopyrightStringId,DefinitionId,UnificationOptionId,FileNameId,CopyrightYearStringId,DiagramName,CodePage,SignatureGUID,ReleaseName,Flags,Global_User_ID,Row_Time_Stamp
+1,1,800,05/13/2021 14:09:23G,05/12/2021 20:08:10G,1,1,180,0,0,0,0,76,77,78,79,78,0,80,76,0,dominoAPI.DM1,1252,NULL,NULL,0,1,0
+
+Model
+DiagramId,ModelId,Model_ID,ModelType,PlatformId,NamePrefix,SpaceHandling,CaseHandling,GenPrimaryKey,GenAlternateKey,GenInversionEntry,GenForeignKey,Notation,ModelNameId,RowOverhead,TableOverhead,IndexOverhead,BlobOverhead,BlobBlockSize,Global_User_ID,Row_Time_Stamp
+1,1,1,1,0,NULL,P,P,0,0,0,0,DASHED_IE,3,0,NULL,0,NULL,0,3,0
+
+ModelOption
+DiagramId,ModelId,OptionType,ModelOption_ID,Model_ID,OptionValue,Global_User_ID,Row_Time_Stamp
+1,1,Display,8,1,0,11,0
+1,1,RoleNmPref,10,1,"",13,0
+1,1,Edit LogNames,14,1,0,18,0
+1,1,Width,5,1,10,8,0
+1,1,Datatype,4,1,CH,7,0
+1,1,NameMax,1,1,65,4,0
+1,1,Scale,6,1,0,9,0
+1,1,Logical View Parser Platform,17,1,1,20,0
+1,1,NameSync,2,1,1,5,0
+1,1,NotNull,7,1,0,10,0
+1,1,BkgColor,11,1,16777215,14,0
+1,1,Attr/Column NameSync,3,1,2,6,0
+1,1,CaseShift,12,1,0,15,0
+1,1,ColmOrd,13,1,0,16,0
+1,1,PK Indexes Sequencing,16,1,1,17,0
+1,1,Zoom,9,1,0,12,0
+1,1,FK Definition Note Synchronization,15,1,1,21,0
+
+Submodel
+DiagramId,ModelId,SubmodelId,Submodel_ID,Model_ID,SubmodelName,DescendantUpdateFlags,DefinitionId,NoteId,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,Main Model,0,0,0,22,0
+
+SubmodelLink
+SubmodelLink_ID,Model_ID,Parent_ID,Child_ID,UltimateParent_ID,NodeLevel,IsBottomLevel,Global_User_ID
+
+DiagramDisplay
+DiagramId,ModelId,SubmodelId,DiagramDisplay_ID,Submodel_ID,PlatformId,Animate,ZoomFactor,HviewSize,VviewSize,HorizontalScrollPosition,VerticalScrollPosition,PageOrientation,PageSize,DisplayFormat,EntityDisplayInfo,ViewDisplayFormat,ViewDisplayInfo,Shadow,CompleteRoleName,ShowVerbs,ShowCardinality,MethodologyId,StraightRelLine,PageBoundary,ShowViewRelationship,ShowView,HideTrigger,Global_User_ID,Row_Time_Stamp,ShowSchemaObjEdge,ShowSchemaObj,SchemaObjDisplayFormat,ShowRelationshipName,ShowLogicalRelationshipName,ShowTriggerLabel,ShowShape,ShowShapeEdge,ShowShapeName,ShowShapeEdgeName,ShowShapeEdgeVerbs,TransformationDisplayFormat
+1,1,1,1,1,0,0,7672,0,0,86,721,1,1,8,3264,1,0,1,0,1,1,0,0,0,0,0,1,23,0,1,6,7,0,0,0,0,0,1,0,1,10
+
+GridDisplay
+DiagramId,ModelId,SubmodelId,GridDisplay_ID,Submodel_ID,Show,Snap,HorizontalSpacing,VerticalSpacing,HorizontalGridsPerLine,VericalGridsPerLine,Units,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,0,0,2500,2500,1,1,0,24,0
+
+Graph_Geometry
+Graph_Geometry_ID,Submodel_ID,Undirected,ProportionalLeftSpacing,ProportionalRightSpacing,ProportionalBottomSpacing,ProportionalTopSpacing,ConstantLeftSpacing,ConstantRightSpacing,ConstantBottomSpacing,ConstantTopSpacing,LayoutStyle,HasCircularLayout,HasHierarchicalLayout,HasOrthogonalLayout,HasSymmetricLayout,HasTreeLayout,Global_User_ID
+1,1,0,0,0,0,0,20,20,20,20,4,0,0,0,0,0,296
+
+Disconnected_Nodes_Layout
+Disconnected_Nodes_Layout_ID,Submodel_ID,Detect,ProportionalRowSpacing,ProportionalColumnSpacing,ConstantRowSpacing,ConstantColumnSpacing,LayoutStyle,PackingStyle,TilingStyle,TileByName,Stagger,StaggerBy,Global_User_ID
+1,1,1,70,70,20,20,1,0,0,1,0,12,297
+
+Components_Layout
+Components_Layout_ID,Submodel_ID,Detect,ProportionalRowSpacing,ProportionalColumnSpacing,ConstantRowSpacing,ConstantColumnSpacing,LayoutStyle,PackingStyle,TilingStyle,Stagger,StaggerBy,Global_User_ID
+1,1,1,70,70,20,20,0,0,1,0,12,298
+
+Circular_Layout
+Circular_Layout_ID,Submodel_ID,Degree,ClusterByGroupID,ClusterByIPAddress,ClusterByBiConnectivity,AutomateGroupIDs,MinNumberOfNodesInCluster,MaxNumberOfNodesInCluster,DisableMinNumberOfNodesInCluster,DisableMaxNumberOfNodesInCluster,ProportionalNodeSpacing,ConstantNodeSpacing,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,AccumulatedInternalGroupID,ProportionalRadialSpacing,ProportionalTangentialSpacing,ConstantRadialSpacing,ConstantTangentialSpacing,RadialAlignment,Global_User_ID
+1,1,5,1,1,1,0,4,20,0,0,500,0,0,0,0,0,600,600,0,0,0,299
+
+Hierarchical_Layout
+Hierarchical_Layout_ID,Submodel_ID,DiscardLevels,DisableMinSlopePerMil,MinSlopePerMil,KeepLevelPositionInIncrementalLayout,RespectFlowInIncrementalLayout,OrthogonalRouting,VariableLevelSpacing,HorizontalEdgeSpacing,VerticalEdgeSpacing,LevelOrientation,LevelAlignment,Quality,ConstantLevelSpacing,ProportionalLevelSpacing,ConstantNodeSpacing,ProportionalNodeSpacing,UsePorts,MergeEdgeChannels,CalculatedSize,PortSharingMaximization,ReduceCrossingsInIncrementalLayout,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,1,0,200,0,0,1,1,12,12,3,0,1,50,0,20,100,1,0,1,1,0,0,0,0,300
+
+Orthogonal_Layout
+Orthogonal_Layout_ID,Submodel_ID,UpwardDrawing,NumberOfCompactions,HorizontalNodeSpacing,VerticalNodeSpacing,HorizontalEdgeSpacing,VerticalEdgeSpacing,UsePorts,SideOffsetPerMil,KeepNodeSizes,RespectNodePositionsInIncrementalLayout,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,0,1,20,20,60,60,0,250,0,1,0,0,0,301
+
+Symmetric_Layout
+Symmetric_Layout_ID,Submodel_ID,NodeSpacing,RandomSeed,RouteEdges,DegreeSpacing,PreventNodeOverlaping,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,75,1,0,1,0,0,0,0,302
+
+Tree_Layout
+Tree_Layout_ID,Submodel_ID,RouteNonTreeEdgesWithinLevels,RouteNonTreeEdgesBetweenLevels,ConstantSiblingSpacing,ProportionalSiblingSpacing,ConstantBranchSpacing,ProportionalBranchSpacing,ConstantLevelSpacing,ProportionalLevelSpacing,HorizontalEdgeSpacing,LevelAlignment,IncrementalWithinComponentLayout,IncrementalDisconnectedNodesLayout,IncrementalComponentsLayout,Global_User_ID
+1,1,1,0,40,0,0,0,40,0,12,0,0,0,0,303
+
+FontProperty
+PropertyId,FontProperty_ID,Description,Global_User_ID,Row_Time_Stamp
+0,0,"",0,0
+1750,5,Foreign Keys,0,0
+32801,56,Primary Key Index,0,0
+1751,6,Foreign Non-Keys,0,0
+4303,0,Relationship Name,0,0
+32803,57,Unique Indexes,0,0
+4305,0,Relationship Business Name,0,0
+35757,63,Transformation Name,0,0
+5359,1,Individual Attribute Font,0,0
+35759,69,Transformation Inputs,0,0
+5360,8,Individual View Field Font,0,0
+35761,70,Transformation Outputs,0,0
+32762,33,Indexes,0,0
+32764,37,Attachments,0,0
+1765,7,View Name,0,0
+1665,2,Entity Name,0,0
+35116,59,Data Security,0,0
+32766,35,Triggers,0,0
+1666,3,Primary Keys,0,0
+1667,4,Attributes,0,0
+1668,0,Verbs,0,0
+32768,38,Dimensional Type Label,0,0
+1669,0,Text Blocks,0,0
+1670,0,Page Number,0,0
+35771,75,Transformation Definition,0,0
+35772,76,Transformation Code,0,0
+5374,0,Schema Object,0,0
+1778,0,Title Block Font,0,0
+5432,0,Shape,0,0
+32833,58,Non-unique Indexes,0,0
+5435,50,Shape Text,0,0
+1787,9,View Fields,0,0
+
+FontDefault
+DiagramId,ModelId,SubmodelId,PropertyId,FontDefault_ID,FontProperty_ID,Submodel_ID,Face,Size,Bold,Italic,Underline,Strikeout,Escapement,Orientation,CharacterSet,OutputPrecision,ClipPrecision,Quality,Pitch,Family,Global_User_ID,Row_Time_Stamp
+1,1,1,1750,3,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,27,0
+1,1,1,32801,9,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,33,0
+1,1,1,1751,4,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,28,0
+1,1,1,4303,64,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,43,0
+1,1,1,32803,10,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,34,0
+1,1,1,4305,65,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,44,0
+1,1,1,35757,23,0,1,Arial,-12.000000,700,0,0,0,0.000000,0.000000,0,3,2,1,2,32,106,0
+1,1,1,35759,24,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,107,0
+1,1,1,35761,25,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,108,0
+1,1,1,32762,8,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,32,0
+1,1,1,32764,12,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,38,0
+1,1,1,1765,16,0,1,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,40,0
+1,1,1,1665,2,0,1,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,26,0
+1,1,1,35116,13,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,39,0
+1,1,1,32766,14,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,36,0
+1,1,1,1666,5,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,29,0
+1,1,1,1667,6,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,30,0
+1,1,1,1668,18,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,42,0
+1,1,1,32768,7,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,37,0
+1,1,1,1669,19,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,45,0
+1,1,1,1670,1,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,25,0
+1,1,1,35771,26,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,109,0
+1,1,1,35772,27,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,110,0
+1,1,1,5374,66,0,1,Arial,-12.000000,800,0,0,0,0.000000,0.000000,0,3,2,1,2,32,65,0
+1,1,1,1778,20,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,46,0
+1,1,1,5432,21,0,1,Arial,-12.000000,700,0,0,0,0.000000,0.000000,0,3,2,1,2,32,96,0
+1,1,1,32833,11,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,35,0
+1,1,1,5435,22,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,97,0
+1,1,1,1787,17,0,1,Arial,-12.000000,400,0,0,0,0.000000,0.000000,0,3,2,1,2,32,41,0
+
+ColorProperty
+PropertyId,ColorProperty_ID,Description,Global_User_ID,Row_Time_Stamp
+5372,30,Schema Object Background,0,0
+0,0,"",0,0
+5373,0,Schema Object Title,0,0
+5375,31,Schema Object Relationship,0,0
+35773,74,Transformation Code,0,0
+35774,73,Transformation Definition,0,0
+1775,0,Title Block Background,0,0
+1776,0,Title Block Border,0,0
+5449,46,Shape Foreground,0,0
+1777,0,Title Block Text Color,0,0
+5450,47,Shape Background,0,0
+1786,22,View Field Text,0,0
+35724,65,Data Stream,0,0
+32802,53,Primary Key Index,0,0
+35115,60,Data Security,0,0
+5335,12,Entity Foreground,0,0
+5336,13,Entity Background,0,0
+5337,11,Entity Title,0,0
+5338,17,Inherited Primary Keys,0,0
+5339,15,Non-Inherited Primary Keys,0,0
+5340,18,Inherited Non-Keys,0,0
+5341,16,Non-Inherited Non-Keys,0,0
+5342,24,Relationships,0,0
+5343,19,View Foreground,0,0
+5344,20,View Background,0,0
+5345,23,View Title,0,0
+1741,0,Page Foreground,0,0
+1742,0,Page Number,0,0
+5347,26,View Relationships,0,0
+1743,0,Off Page Foreground,0,0
+1744,0,Off Page Background,0,0
+1676,0,Diagram Background,0,0
+1748,0,Verb Text,0,0
+1749,0,Text Block Border,0,0
+1682,0,Shadow,0,0
+1683,0,Text Background,0,0
+32759,45,Dimensional Type Label,0,0
+1684,0,Text Foreground,0,0
+32763,40,Indexes,0,0
+32832,54,Unique Indexes,0,0
+5361,25,Supertypes,0,0
+32765,44,Attachments,0,0
+5362,10,Individual Attribute Color,0,0
+35758,68,Transformation Name,0,0
+32834,55,Non-unique Indexes,0,0
+5363,21,Individual View Field Color,0,0
+5431,0,Shape Title,0,0
+35760,71,Transformation Inputs,0,0
+35762,72,Transformation Outputs,0,0
+5434,52,Line,0,0
+35763,66,Transformation Background,0,0
+35764,67,Transformation Foreground,0,0
+5436,51,Shape Text,0,0
+5371,29,Schema Object Foreground,0,0
+
+ColorDefault
+DiagramId,ModelId,SubmodelId,PropertyId,ColorDefault_ID,ColorProperty_ID,Submodel_ID,Red,Green,Blue,Global_User_ID,Row_Time_Stamp
+1,1,1,1749,38,0,1,0,0,0,89,0
+1,1,1,5340,5,0,1,0,0,255,51,0
+1,1,1,5341,7,0,1,0,0,0,53,0
+1,1,1,5342,22,0,1,0,0,0,72,0
+1,1,1,5343,23,0,1,0,0,0,73,0
+1,1,1,35773,51,0,1,0,0,0,104,0
+1,1,1,5344,24,0,1,192,192,192,74,0
+1,1,1,35774,50,0,1,0,0,0,103,0
+1,1,1,5345,17,0,1,0,0,0,63,0
+1,1,1,5347,27,0,1,0,0,0,78,0
+1,1,1,32759,12,0,1,0,0,0,61,0
+1,1,1,35724,52,0,1,0,0,0,105,0
+1,1,1,32763,8,0,1,0,0,0,54,0
+1,1,1,32765,13,0,1,0,0,0,59,0
+1,1,1,32832,10,0,1,0,0,0,56,0
+1,1,1,1775,25,0,1,255,255,255,75,0
+1,1,1,32834,11,0,1,0,0,0,57,0
+1,1,1,1776,26,0,1,0,0,0,76,0
+1,1,1,5431,42,0,1,0,0,0,93,0
+1,1,1,1777,21,0,1,0,0,0,71,0
+1,1,1,5434,44,0,1,0,0,0,95,0
+1,1,1,5371,102,0,1,0,0,0,66,0
+1,1,1,5372,101,0,1,255,255,255,67,0
+1,1,1,5436,43,0,1,0,0,0,94,0
+1,1,1,5373,103,0,1,0,0,0,68,0
+1,1,1,5375,104,0,1,0,0,0,77,0
+1,1,1,1786,18,0,1,0,0,0,64,0
+1,1,1,35115,14,0,1,0,0,0,60,0
+1,1,1,5449,40,0,1,0,0,0,91,0
+1,1,1,5450,41,0,1,255,255,255,92,0
+1,1,1,35758,47,0,1,0,0,0,100,0
+1,1,1,1676,30,0,1,128,255,255,81,0
+1,1,1,35760,48,0,1,0,0,0,101,0
+1,1,1,1741,33,0,1,0,0,0,84,0
+1,1,1,35762,49,0,1,0,0,0,102,0
+1,1,1,1742,2,0,1,0,0,0,48,0
+1,1,1,35763,46,0,1,255,255,255,99,0
+1,1,1,32802,9,0,1,0,0,0,55,0
+1,1,1,1743,28,0,1,0,0,0,79,0
+1,1,1,35764,45,0,1,0,0,0,98,0
+1,1,1,5335,34,0,1,0,0,0,85,0
+1,1,1,1744,29,0,1,128,128,128,80,0
+1,1,1,1682,36,0,1,64,127,127,87,0
+1,1,1,5336,35,0,1,255,255,255,86,0
+1,1,1,1683,39,0,1,255,255,255,90,0
+1,1,1,5337,3,0,1,0,0,0,49,0
+1,1,1,1684,20,0,1,0,0,0,70,0
+1,1,1,5338,4,0,1,255,0,0,50,0
+1,1,1,1748,19,0,1,0,0,0,69,0
+1,1,1,5339,6,0,1,0,0,0,52,0
+
+Entity
+DiagramId,ModelId,EntityId,Entity_ID,Model_ID,EntityNameId,TableNameId,DefinitionId,NoteId,OwnerId,EntityTypeId,Flags,DataWhseSettings,NSTFlag,CompareFlags,PhysicalCompareFlags,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,8,8,0,0,0,0,0,0,0,0,0,116,0
+1,1,2,2,1,20,20,0,0,0,0,0,0,0,0,0,132,0
+1,1,3,3,1,22,22,0,0,0,0,0,0,0,0,0,142,0
+1,1,4,4,1,14,14,0,0,0,0,0,0,0,0,0,152,0
+1,1,5,5,1,13,13,0,0,0,0,0,0,0,0,0,161,0
+1,1,6,6,1,15,15,0,0,0,0,0,0,0,0,0,170,0
+1,1,7,7,1,131,131,0,0,0,0,0,0,0,0,0,179,0
+1,1,8,8,1,58,58,0,0,0,0,0,0,0,0,0,184,0
+1,1,10,10,1,33,33,0,0,0,0,0,0,0,0,0,194,0
+1,1,11,11,1,31,31,0,0,0,0,0,0,0,0,0,199,0
+1,1,12,12,1,139,139,0,0,0,0,0,0,0,0,0,206,0
+1,1,13,13,1,38,38,0,0,0,0,0,0,0,0,0,211,0
+1,1,14,14,1,40,40,0,0,0,0,0,0,0,0,0,216,0
+1,1,16,16,1,59,59,0,0,0,0,0,0,0,0,0,262,0
+1,1,17,17,1,97,97,0,0,0,0,0,0,0,0,0,304,0
+1,1,20,20,1,36,36,0,0,0,0,0,0,0,0,0,452,0
+1,1,21,21,1,126,126,0,0,0,0,0,0,0,0,0,465,0
+1,1,22,22,1,128,128,0,0,0,0,0,0,0,0,0,480,0
+1,1,23,23,1,141,141,0,0,0,0,0,0,0,0,0,513,0
+1,1,24,24,1,151,151,0,0,0,0,0,0,0,0,0,590,0
+
+TableStorage
+DiagramId,ModelId,EntityId,TableStorage_ID,Entity_ID,Location,FillfactorPercent,MaximumRowsPerPage,PercentFree,PercentUsed,MinimumExtents,MaximumExtents,InitialExtentSize,NextExtentSize,ExtentGrowthFactor,MinimumTransactions,MaximumTransactions,LockModeSetting,RowCount,DataGrowth,GrowthRate,GrowthType,GrowthPeriod,MaximumSize,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,117,0
+1,1,2,2,2,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,133,0
+1,1,3,3,3,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,143,0
+1,1,4,4,4,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,153,0
+1,1,5,5,5,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,162,0
+1,1,6,6,6,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,171,0
+1,1,7,7,7,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,180,0
+1,1,8,8,8,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,185,0
+1,1,10,10,10,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,195,0
+1,1,11,11,11,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,200,0
+1,1,12,12,12,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,207,0
+1,1,13,13,13,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,212,0
+1,1,14,14,14,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,217,0
+1,1,16,16,16,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,263,0
+1,1,17,17,17,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,305,0
+1,1,20,20,20,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,453,0
+1,1,21,21,21,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,466,0
+1,1,22,22,22,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,481,0
+1,1,23,23,23,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,514,0
+1,1,24,24,24,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",0,0,0,"","",0,591,0
+
+Attribute
+DiagramId,ModelId,EntityId,AttributeId,Attribute_ID,Entity_ID,UserDatatypeId,RuleId,DomainId,DefaultId,AttributeNameId,ColumnNameId,DefinitionId,NoteId,RoleNameId,LogicalRoleNameId,DatatypeId,Nullable,Length,Scale,IdentityColumn,IdentitySeed,IdentityIncrement,SequenceNo,CheckConstraintId,DefaultTextId,ColumnNameSet,RoleNameSet,LogicalRoleNameSet,GlobalId,UserDatatype,OverrideDataBits,DefaultNameId,AverageWidth,PercentNull,Flags,UnifiedToId,NSTFlag,CompareFlags,PhysicalCompareFlags,Global_User_ID,Row_Time_Stamp
+1,1,24,12,142,24,0,0,0,0,156,156,0,0,0,0,103,0,-2,-1,N,1,1,10,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,622,0
+1,1,24,13,143,24,0,0,0,0,158,158,0,0,0,0,157,1,-2,0,N,1,1,11,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,623,0
+1,1,1,1,1,1,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,121,0
+1,1,1,2,2,1,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,123,0
+1,1,5,1,20,5,0,0,0,0,10,10,0,0,0,0,64,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,166,0
+1,1,1,3,3,1,0,0,0,0,10,12,0,0,0,0,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,124,0
+1,1,5,2,21,5,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,168,0
+1,1,5,3,22,5,0,0,0,0,24,24,0,0,0,0,50,1,255,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,169,0
+1,1,1,7,7,1,0,0,0,0,116,116,0,0,0,0,63,0,-2,-1,N,1,1,7,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0
+1,1,17,1,53,17,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,309,0
+1,1,17,2,54,17,0,0,0,0,11,11,0,0,0,0,50,0,60,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,311,0
+1,1,21,1,96,21,0,0,0,0,10,10,0,0,10,10,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,473,0
+1,1,1,11,27,1,0,0,0,0,10,45,0,0,45,45,64,0,-2,-1,N,0,0,5,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,223,0
+1,1,21,2,106,21,0,0,0,0,116,116,0,0,0,0,63,0,-2,-1,N,1,1,3,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0
+1,1,13,6,80,13,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,397,0
+1,1,1,12,28,1,0,0,0,0,10,46,0,0,46,46,64,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,227,0
+1,1,13,7,81,13,0,0,0,0,106,106,0,0,0,0,49,0,-2,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,400,0
+1,1,1,13,29,1,0,0,0,0,10,47,0,0,47,47,64,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,231,0
+1,1,21,4,108,21,0,0,0,0,70,70,0,0,0,0,50,0,30,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,509,0
+1,1,13,8,82,13,0,0,0,0,106,110,0,0,110,110,64,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,406,0
+1,1,1,14,31,1,0,0,0,0,10,12,0,0,12,12,49,0,-2,-1,N,0,0,6,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,239,0
+1,1,13,9,83,13,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,6,0,0,0,408,0
+1,1,1,15,58,1,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,332,0
+1,1,1,16,59,1,0,0,0,0,102,102,0,0,0,0,63,0,-2,-1,N,1,1,10,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,333,0
+1,1,1,17,60,1,0,0,0,0,104,104,0,0,0,0,103,1,-2,-1,N,1,1,11,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,334,0
+1,1,13,12,86,13,0,0,0,0,106,111,0,0,111,111,64,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,421,0
+1,1,1,18,61,1,0,0,0,0,105,105,0,0,0,0,103,1,-2,-1,N,1,1,12,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0
+1,1,13,13,87,13,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,6,0,0,0,423,0
+1,1,1,19,90,1,0,0,0,0,115,115,0,0,0,0,63,0,-2,-1,N,1,1,8,0,113,1,0,0,0,0,0,0,0,0,0,0,0,0,0,428,0
+1,1,13,14,88,13,0,0,0,0,112,112,0,0,0,0,9,1,10,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,426,0
+1,1,1,20,91,1,0,0,0,0,120,120,0,0,0,0,64,0,-2,-1,N,1,1,13,0,118,1,0,0,0,0,0,0,0,0,0,0,0,0,0,429,0
+1,1,13,15,89,13,0,0,0,0,114,114,0,0,0,0,63,0,-2,-1,N,1,1,6,0,113,1,0,0,0,0,0,0,0,0,0,0,0,0,0,427,0
+1,1,1,21,449,1,0,0,0,0,166,166,0,0,0,0,103,0,-2,-1,N,1,1,14,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2176,0
+1,1,1,22,450,1,0,0,0,0,167,167,0,0,0,0,103,0,-2,-1,N,1,1,15,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2177,0
+1,1,2,1,11,2,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,137,0
+1,1,6,1,23,6,0,0,0,0,10,10,0,0,0,0,64,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0
+1,1,2,3,13,2,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,141,0
+1,1,6,2,24,6,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,177,0
+1,1,10,1,62,10,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,336,0
+1,1,6,3,25,6,0,0,0,0,27,27,0,0,0,0,64,0,-2,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,178,0
+1,1,14,2,118,14,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,540,0
+1,1,10,4,74,10,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,373,0
+1,1,14,3,119,14,0,0,0,0,106,145,0,0,145,145,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,542,0
+1,1,14,4,120,14,0,0,0,0,106,110,0,0,110,110,64,0,-2,-1,N,0,0,4,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,544,0
+1,1,14,5,121,14,0,0,0,0,106,111,0,0,111,111,64,0,-2,-1,N,0,0,5,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,546,0
+1,1,22,2,102,22,0,0,0,0,10,10,0,0,10,10,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,490,0
+1,1,14,6,122,14,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,2,0,0,0,548,0
+1,1,22,3,109,22,0,0,0,0,136,136,0,0,0,0,50,1,60,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0
+1,1,14,7,123,14,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,2,0,0,0,550,0
+1,1,22,4,110,22,0,0,0,0,137,137,0,0,0,0,50,0,120,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,511,0
+1,1,14,8,124,14,0,0,0,0,10,144,0,0,144,144,49,0,-2,-1,N,0,0,6,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,558,0
+1,1,14,9,126,14,0,0,0,0,147,147,0,0,0,0,49,0,-2,-1,N,1,1,7,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,562,0
+1,1,14,10,125,14,0,0,0,0,146,146,0,0,0,0,64,0,-2,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,561,0
+1,1,3,1,14,3,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0
+1,1,3,3,16,3,0,0,0,0,11,20,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,151,0
+1,1,7,2,33,7,0,0,0,0,132,132,0,0,0,0,50,0,120,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,242,0
+1,1,3,4,30,3,0,0,0,0,10,48,0,0,48,48,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,235,0
+1,1,7,3,103,7,0,0,0,0,10,130,0,0,130,130,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,495,0
+1,1,7,4,105,7,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,504,0
+1,1,11,3,65,11,0,0,0,0,106,106,0,0,0,0,64,0,-2,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,346,0
+1,1,11,6,69,11,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,364,0
+1,1,11,7,70,11,0,0,0,0,104,104,0,0,0,0,103,1,-2,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,367,0
+1,1,11,8,71,11,0,0,0,0,105,105,0,0,0,0,103,1,-2,-1,N,1,1,4,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,368,0
+1,1,11,9,72,11,0,0,0,0,109,109,0,0,0,0,63,0,-2,-1,N,1,1,5,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,369,0
+1,1,11,10,73,11,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,370,0
+1,1,23,5,128,23,0,0,0,0,10,149,0,0,149,149,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,578,0
+1,1,23,6,129,23,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,583,0
+1,1,23,7,130,23,0,0,0,0,10,144,0,0,144,144,49,0,-2,-1,N,0,0,3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,588,0
+1,1,4,1,17,4,0,0,0,0,10,10,0,0,0,0,64,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,157,0
+1,1,4,2,18,4,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,159,0
+1,1,8,1,37,8,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,274,0
+1,1,4,3,19,4,0,0,0,0,24,24,0,0,0,0,50,1,255,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,160,0
+1,1,8,2,38,8,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0
+1,1,12,1,41,12,0,0,0,0,10,10,0,0,0,0,49,0,-2,-1,Y,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,280,0
+1,1,8,3,39,8,0,0,0,0,57,57,0,0,0,0,50,1,255,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0
+1,1,12,2,42,12,0,0,0,0,11,11,0,0,0,0,50,0,120,-1,N,1,1,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,281,0
+1,1,16,1,36,16,0,0,0,0,10,10,0,0,10,10,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,271,0
+1,1,12,3,43,12,0,0,0,0,65,65,0,0,0,0,50,0,30,-1,N,1,1,6,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,282,0
+1,1,16,2,40,16,0,0,0,0,10,10,0,0,10,10,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,278,0
+1,1,12,4,44,12,0,0,0,0,66,66,0,0,0,0,50,0,30,-1,N,1,1,7,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,283,0
+1,1,20,1,95,20,0,0,0,0,10,10,0,0,10,10,49,0,-2,-1,N,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0
+1,1,12,5,45,12,0,0,0,0,68,68,0,0,0,0,67,0,-2,-1,N,1,1,8,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,284,0
+1,1,20,2,97,20,0,0,0,0,70,70,0,0,0,0,50,0,30,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,476,0
+1,1,12,6,46,12,0,0,0,0,69,69,0,0,0,0,50,1,30,-1,N,1,1,9,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,285,0
+1,1,24,1,131,24,0,0,0,0,10,144,0,0,144,144,49,0,-2,-1,N,0,0,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,597,0
+1,1,20,3,98,20,0,0,0,0,72,72,0,0,0,0,49,0,-2,-1,N,1,1,3,0,71,1,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0
+1,1,24,2,132,24,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,602,0
+1,1,20,4,99,20,0,0,0,0,117,117,0,0,0,0,9,1,2,-1,N,1,1,4,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,478,0
+1,1,24,3,133,24,0,0,0,0,106,106,0,0,106,106,49,0,-2,-1,N,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0
+1,1,20,5,100,20,0,0,0,0,13,13,0,0,0,0,9,1,1,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,479,0
+1,1,24,4,134,24,0,0,0,0,106,110,0,0,110,110,64,0,-2,-1,N,0,0,4,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,606,0
+1,1,24,5,135,24,0,0,0,0,106,111,0,0,111,111,64,0,-2,-1,N,0,0,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,608,0
+1,1,12,11,51,12,0,0,0,0,74,74,0,0,0,0,50,1,255,-1,N,1,1,10,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,290,0
+1,1,24,6,136,24,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,610,0
+1,1,12,12,52,12,0,0,0,0,10,12,0,0,12,12,49,0,-2,-1,N,0,0,11,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,294,0
+1,1,24,7,137,24,0,0,0,0,10,107,0,0,107,107,49,0,-2,-1,N,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,612,0
+1,1,12,13,111,12,0,0,0,0,138,138,0,0,0,0,50,0,120,-1,N,1,1,5,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,512,0
+1,1,24,8,138,24,0,0,0,0,152,152,0,0,0,0,63,0,-2,-1,N,1,1,6,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,618,0
+1,1,12,14,115,12,0,0,0,0,142,142,0,0,0,0,9,0,1,-1,N,1,1,4,0,165,1,0,0,0,0,0,0,0,0,0,0,0,0,0,531,0
+1,1,24,9,139,24,0,0,0,0,147,153,0,0,0,0,49,0,-2,-1,N,1,1,7,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,619,0
+1,1,12,15,116,12,0,0,0,0,143,143,0,0,0,0,50,1,15,-1,N,1,1,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,532,0
+1,1,24,10,140,24,0,0,0,0,154,154,0,0,0,0,49,0,-2,-1,N,1,1,8,0,71,1,0,0,0,0,0,0,0,0,0,0,0,0,0,620,0
+1,1,24,11,141,24,0,0,0,0,155,155,0,0,0,0,63,0,-2,-1,N,1,1,9,0,62,1,0,0,0,0,0,0,0,0,0,0,0,0,0,621,0
+
+PrimaryKey
+DiagramId,ModelId,EntityId,AttributeId,PrimaryKey_ID,Attribute_ID,SequenceNo,Global_User_ID,Row_Time_Stamp
+1,1,8,1,8,37,1,0,0
+1,1,3,1,3,14,1,0,0
+1,1,23,5,43,128,1,0,0
+1,1,23,6,44,129,2,0,0
+1,1,13,6,21,80,1,0,0
+1,1,13,7,22,81,2,0,0
+1,1,13,8,23,82,3,0,0
+1,1,13,9,24,83,1,0,0
+1,1,20,1,29,95,1,0,0
+1,1,13,12,25,86,4,0,0
+1,1,10,1,17,62,2,0,0
+1,1,5,1,5,20,1,0,0
+1,1,13,13,26,87,1,0,0
+1,1,10,4,18,74,1,0,0
+1,1,17,1,14,53,1,0,0
+1,1,12,1,9,41,1,0,0
+1,1,2,1,2,11,1,0,0
+1,1,22,2,31,102,1,0,0
+1,1,7,3,27,103,1,0,0
+1,1,7,4,28,105,2,0,0
+1,1,24,1,45,131,1,0,0
+1,1,4,1,4,17,1,0,0
+1,1,24,2,46,132,2,0,0
+1,1,14,2,32,118,1,0,0
+1,1,24,3,47,133,3,0,0
+1,1,14,3,33,119,3,0,0
+1,1,24,4,48,134,4,0,0
+1,1,14,4,34,120,4,0,0
+1,1,24,5,49,135,5,0,0
+1,1,14,5,35,121,5,0,0
+1,1,24,6,50,136,2,0,0
+1,1,14,6,36,122,1,0,0
+1,1,24,7,51,137,2,0,0
+1,1,14,7,37,123,1,0,0
+1,1,14,8,38,124,6,0,0
+1,1,14,10,39,125,2,0,0
+1,1,21,1,30,96,1,0,0
+1,1,16,1,12,36,1,0,0
+1,1,6,1,6,23,1,0,0
+1,1,1,1,1,1,1,0,0
+1,1,16,2,13,40,1,0,0
+1,1,11,3,19,65,2,0,0
+1,1,11,6,20,69,1,0,0
+
+Indexes
+DiagramId,ModelId,EntityId,IndexId,Indexes_ID,Entity_ID,IsUniqueId,IndexTypeId,KeyType,HashSize,HashSizeTypeId,IgnoreDupKeyId,DupRowId,NoSortId,SortOrderingId,IndexNameId,Flags,NSTFlag,CompareFlags,Global_User_ID,Row_Time_Stamp
+1,1,22,1,22,22,7,0,P,0,0,0,0,0,0,135,0,0,0,482,0
+1,1,16,1,16,16,7,0,P,0,0,0,0,0,0,95,0,0,0,264,0
+1,1,13,1,13,13,7,0,P,0,0,0,0,0,0,92,0,0,0,213,0
+1,1,10,1,10,10,7,0,P,0,0,0,0,0,0,89,0,0,0,196,0
+1,1,7,1,7,7,7,0,P,0,0,0,0,0,0,87,0,0,0,181,0
+1,1,4,1,4,4,7,0,P,0,0,0,0,0,0,84,0,0,0,154,0
+1,1,1,1,1,1,7,0,P,0,0,0,0,0,0,81,0,0,0,118,0
+1,1,24,1,24,24,7,0,P,0,0,0,0,0,0,159,0,0,0,592,0
+1,1,21,1,21,21,7,0,P,0,0,0,0,0,0,134,0,0,0,467,0
+1,1,12,1,12,12,7,0,P,0,0,0,0,0,0,91,0,0,0,208,0
+1,1,6,1,6,6,7,0,P,0,0,0,0,0,0,86,0,0,0,172,0
+1,1,3,1,3,3,7,0,P,0,0,0,0,0,0,83,0,0,0,144,0
+1,1,23,1,23,23,7,0,P,0,0,0,0,0,0,148,0,0,0,515,0
+1,1,20,1,20,20,7,0,P,0,0,0,0,0,0,133,0,0,0,454,0
+1,1,17,1,17,17,7,0,P,0,0,0,0,0,0,100,0,0,0,306,0
+1,1,14,1,14,14,7,0,P,0,0,0,0,0,0,93,0,0,0,218,0
+1,1,11,1,11,11,7,0,P,0,0,0,0,0,0,90,0,0,0,201,0
+1,1,8,1,8,8,7,0,P,0,0,0,0,0,0,88,0,0,0,186,0
+1,1,5,1,5,5,7,0,P,0,0,0,0,0,0,85,0,0,0,163,0
+1,1,2,1,2,2,7,0,P,0,0,0,0,0,0,82,0,0,0,134,0
+
+IndexStorage
+DiagramId,ModelId,EntityId,IndexId,IndexStorage_ID,Indexes_ID,Location,FillfactorPercent,MaximumRowsPerPage,PercentFree,PercentUsed,MinimumExtents,MaximumExtents,InitialExtentSize,NextExtentSize,ExtentGrowthFactor,MinimumTransactions,MaximumTransactions,LockModeSetting,Global_User_ID,Row_Time_Stamp
+1,1,22,1,22,22,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",483,0
+1,1,16,1,16,16,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",265,0
+1,1,13,1,13,13,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",214,0
+1,1,10,1,10,10,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",197,0
+1,1,7,1,7,7,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",182,0
+1,1,4,1,4,4,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",155,0
+1,1,1,1,1,1,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",119,0
+1,1,24,1,24,24,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",593,0
+1,1,21,1,21,21,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",468,0
+1,1,12,1,12,12,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",209,0
+1,1,6,1,6,6,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",173,0
+1,1,3,1,3,3,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",145,0
+1,1,23,1,23,23,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",516,0
+1,1,20,1,20,20,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",455,0
+1,1,17,1,17,17,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",307,0
+1,1,14,1,14,14,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",219,0
+1,1,11,1,11,11,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",202,0
+1,1,8,1,8,8,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",187,0
+1,1,5,1,5,5,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",164,0
+1,1,2,1,2,2,"",-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,"",135,0
+
+IndexColumn
+DiagramId,ModelId,EntityId,IndexId,AttributeId,IndexColumn_ID,Attribute_ID,Indexes_ID,SequenceNo,SortOrdering,Global_User_ID,Row_Time_Stamp
+1,1,22,1,2,43,102,22,1,A,492,0
+1,1,13,1,6,31,80,13,1,A,402,0
+1,1,8,1,1,13,37,8,1,A,277,0
+1,1,17,1,1,15,53,17,1,A,310,0
+1,1,13,1,7,32,81,13,2,A,403,0
+1,1,13,1,8,33,82,13,3,A,410,0
+1,1,3,1,1,4,14,3,1,A,148,0
+1,1,13,1,12,36,86,13,4,A,425,0
+1,1,12,1,1,14,41,12,1,A,291,0
+1,1,21,1,1,41,96,21,1,A,475,0
+1,1,16,1,1,12,36,16,1,A,273,0
+1,1,7,1,3,44,103,7,1,A,497,0
+1,1,7,1,4,47,105,7,2,A,506,0
+1,1,2,1,1,2,11,2,1,A,138,0
+1,1,20,1,1,40,95,20,1,A,464,0
+1,1,11,1,3,21,65,11,2,A,355,0
+1,1,11,1,6,24,69,11,1,A,366,0
+1,1,6,1,1,8,23,6,1,A,176,0
+1,1,24,1,1,66,131,24,1,A,599,0
+1,1,24,1,2,67,132,24,2,A,614,0
+1,1,24,1,3,68,133,24,3,A,615,0
+1,1,24,1,4,69,134,24,4,A,616,0
+1,1,1,1,1,1,1,1,1,A,122,0
+1,1,24,1,5,70,135,24,5,A,617,0
+1,1,10,1,1,17,62,10,2,A,337,0
+1,1,10,1,4,25,74,10,1,A,375,0
+1,1,5,1,1,7,20,5,1,A,167,0
+1,1,14,1,2,56,118,14,1,A,564,0
+1,1,14,1,3,57,119,14,3,A,565,0
+1,1,14,1,4,58,120,14,4,A,566,0
+1,1,14,1,5,59,121,14,5,A,567,0
+1,1,23,1,5,64,128,23,1,A,580,0
+1,1,23,1,6,65,129,23,2,A,585,0
+1,1,14,1,8,60,124,14,6,A,568,0
+1,1,14,1,10,61,125,14,2,A,569,0
+1,1,4,1,1,6,17,4,1,A,158,0
+
+CheckConstraints
+DiagramId,ModelId,EntityId,CheckId,CheckConstraints_ID,Entity_ID,Attribute_ID,AttributeId,ConstraintNameId,CheckTextId,NSTFlag,Global_User_ID,Row_Time_Stamp
+
+ForeignKey
+DiagramId,ModelId,RelationshipId,ForeignKey_ID,New_Child_Entity_ID,New_Parent_Entity_ID,ParentEntityId,ChildEntityId,Parent_Index_ID,RelationshipTypeId,ParentConstraintTypeId,ParentCardinalityId,ParentCardinalityNo,ChildCardinalityId,ChildCardinalityNo,ParentOptionalityId,ChildOptionalityId,ParentInsertId,ParentUpdateId,ParentDeleteId,ChildInsertId,ChildUpdateId,ChildDeleteId,DefinitionId,InversePhraseId,VerbPhraseId,NoteId,RelationshipNameId,Flags,LogicalRelationshipNameId,NSTFlag,CompareFlags,Global_User_ID,Row_Time_Stamp
+1,1,29,29,13,10,10,13,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,419,0
+1,1,34,34,20,12,12,20,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,459,0
+1,1,35,35,21,12,12,21,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,470,0
+1,1,36,36,22,12,12,22,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,487,0
+1,1,37,37,7,12,12,7,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,493,0
+1,1,38,38,7,1,1,7,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,502,0
+1,1,43,43,14,13,13,14,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,538,0
+1,1,44,44,14,17,17,14,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,556,0
+1,1,46,46,23,20,20,23,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,576,0
+1,1,47,47,23,1,1,23,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,581,0
+1,1,48,48,23,17,17,23,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,586,0
+1,1,49,49,24,17,17,24,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,595,0
+1,1,50,50,24,13,13,24,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,600,0
+1,1,1,1,1,4,4,1,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,221,0
+1,1,2,2,1,5,5,1,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,225,0
+1,1,3,3,1,6,6,1,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,229,0
+1,1,4,4,3,2,2,3,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,233,0
+1,1,5,5,1,3,3,1,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,237,0
+1,1,9,9,1,8,8,1,0,51,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,260,0
+1,1,10,10,16,8,8,16,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,267,0
+1,1,11,11,16,1,1,16,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,269,0
+1,1,12,12,12,3,3,12,0,41,0,42,0,44,0,43,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,292,0
+1,1,21,21,11,1,1,11,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,362,0
+1,1,22,22,10,1,1,10,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,371,0
+1,1,26,26,13,1,1,13,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,395,0
+1,1,27,27,13,11,11,13,0,54,0,42,0,0,0,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,404,0
+
+ForeignKeyColumn
+ForeignKeyColumn_Id,DiagramId,ModelId,RelationshipId,ForeignKey_ID,SequenceNo,ParentEntityId,ParentAttributeId,ChildEntityId,ChildAttributeId,OriginalParentId,OriginalAttributeId,Global_User_ID,Row_Time_Stamp
+35,1,1,34,34,1,12,1,20,1,12,1,463,0
+51,1,1,44,44,6,17,1,14,8,17,1,559,0
+10,1,1,12,12,11,3,1,12,12,3,1,295,0
+47,1,1,43,43,4,13,8,14,4,11,3,545,0
+59,1,1,50,50,4,13,8,24,4,11,3,607,0
+55,1,1,48,48,3,17,1,23,7,17,1,589,0
+18,1,1,21,21,1,1,1,11,6,1,1,365,0
+1,1,1,1,1,5,4,1,1,11,4,1,224,0
+26,1,1,27,27,3,11,3,13,8,11,3,407,0
+30,1,1,29,29,4,10,1,13,12,10,1,422,0
+5,1,1,5,5,6,3,1,1,14,3,1,240,0
+9,1,1,10,10,1,8,1,16,2,8,1,279,0
+50,1,1,43,43,1,13,13,14,7,1,1,551,0
+38,1,1,37,37,1,12,1,7,3,12,1,496,0
+62,1,1,50,50,2,13,13,24,7,1,1,613,0
+54,1,1,47,47,2,1,1,23,6,1,1,584,0
+46,1,1,43,43,3,13,7,14,3,13,7,543,0
+58,1,1,50,50,3,13,7,24,3,13,7,605,0
+25,1,1,26,26,1,1,1,13,6,1,1,398,0
+4,1,1,4,4,3,2,1,3,4,2,1,236,0
+37,1,1,36,36,1,12,1,22,2,12,1,491,0
+49,1,1,43,43,1,13,9,14,6,1,1,549,0
+8,1,1,11,11,1,1,1,16,1,1,1,272,0
+61,1,1,50,50,2,13,9,24,6,1,1,611,0
+53,1,1,46,46,1,20,1,23,5,12,1,579,0
+45,1,1,43,43,1,13,6,14,2,1,1,541,0
+57,1,1,50,50,2,13,6,24,2,1,1,603,0
+3,1,1,3,3,4,6,1,1,13,6,1,232,0
+36,1,1,35,35,1,12,1,21,1,12,1,474,0
+40,1,1,38,38,2,1,1,7,4,1,1,505,0
+48,1,1,43,43,5,13,12,14,5,10,1,547,0
+60,1,1,50,50,5,13,12,24,5,10,1,609,0
+56,1,1,49,49,1,17,1,24,1,17,1,598,0
+19,1,1,22,22,1,1,1,10,4,1,1,374,0
+27,1,1,27,27,1,11,6,13,9,1,1,409,0
+2,1,1,2,2,3,5,1,1,12,5,1,228,0
+31,1,1,29,29,1,10,4,13,13,1,1,424,0
+
+Supertype
+DiagramId,ModelId,SupertypeId,Supertype_ID,Entity_ID,EntityId,Type,Discriminator,CompareFlags,Global_User_ID,Row_Time_Stamp
+1,1,1,1,12,12,Y,0,0,457,0
+
+Subtype
+DiagramId,ModelId,SupertypeId,SubtypeId,Subtype_ID,Supertype_ID,ForeignKey_ID,EntityId,RelationshipId,Global_User_ID,Row_Time_Stamp
+1,1,1,20,1,1,34,12,34,460,0
+1,1,1,21,2,1,35,12,35,471,0
+1,1,1,22,3,1,36,12,36,488,0
+
+DbView
+DbView_ID,Model_ID,Inter_Model_View_ID,NameId,Is_User_Defined,DefinitionId,NotesId,OwnerId,NSTFlag,CompareFlags,Global_User_ID,Row_Time_Stamp
+
+View_Field
+View_Field_ID,DbView_ID,Alias,Inter_Model_View_Field_ID,Column_Expression,SequenceNo,Global_User_ID,Row_Time_Stamp
+
+View_Component
+View_Component_ID,DbView_ID,Component_Type,bIsCurrent,SQL,Global_User_ID,Row_Time_Stamp
+
+View_Table
+View_Table_ID,DbView_ID,Entity_ID,Parent_View_ID,Alias,Inter_Model_View_Table_ID,Type,SequenceNo,Global_User_ID,Row_Time_Stamp
+
+Field_Column
+Field_Column_ID,View_Column_ID,View_Field_ID,Global_User_ID,Row_Time_Stamp
+
+View_Column
+View_Column_ID,View_Table_ID,Attribute_ID,Parent_View_Field_ID,Inter_Model_View_Column_ID,Global_User_ID,Row_Time_Stamp
+
+Column_Usage
+Column_Usage_ID,View_Column_ID,Usage_Type,SequenceNo,Global_User_ID,Row_Time_Stamp
+
+EntityDisplay
+DiagramId,ModelId,SubmodelId,EntityId,EntityDisplay_ID,Submodel_ID,Entity_ID,HorizontalPosition,VerticalPosition,cxEntity,cyEntity,cxEntityNode,cyEntityNode,xEntityNode,yEntityNode,DisplayBkgColor,BackgroundColor,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,1,1,989,662,119,310,0,0,0,0,0,0,120,0
+1,1,1,2,2,1,2,678,865,64,67,0,0,0,0,0,0,136,0
+1,1,1,3,3,1,3,668,742,84,69,0,0,0,0,0,0,146,0
+1,1,1,4,4,1,4,1299,809,87,69,0,0,0,0,0,0,156,0
+1,1,1,5,5,1,5,1107,804,81,69,0,0,0,0,0,0,165,0
+1,1,1,6,6,1,6,873,814,127,69,0,0,0,0,0,0,174,0
+1,1,1,7,7,1,7,682,612,-1,-1,0,0,0,0,0,0,183,0
+1,1,1,8,8,1,8,1298,648,106,69,0,0,0,0,0,0,188,0
+1,1,1,10,10,1,10,1366,272,139,87,0,0,0,0,0,0,198,0
+1,1,1,11,11,1,11,1555,297,134,137,0,0,0,0,0,0,203,0
+1,1,1,12,12,1,12,307,598,130,227,0,0,0,0,0,0,210,0
+1,1,1,13,13,1,13,1184,289,132,121,0,0,0,0,0,0,215,0
+1,1,1,14,14,1,14,927,48,133,156,0,0,0,0,0,0,220,0
+1,1,1,16,16,1,16,-1,-1,-1,-1,0,0,0,0,0,0,266,0
+1,1,1,17,17,1,17,692,280,119,69,0,0,0,0,0,0,308,0
+1,1,1,20,20,1,20,457,275,76,103,0,0,0,0,0,0,456,0
+1,1,1,21,21,1,21,201,252,71,67,0,0,0,0,0,0,469,0
+1,1,1,22,22,1,22,317,242,83,67,0,0,0,0,0,0,484,0
+1,1,1,23,23,1,23,660,468,-1,-1,0,0,0,0,0,0,517,0
+1,1,1,24,24,1,24,925,312,-1,-1,0,0,0,0,0,0,594,0
+
+AttributeDisplayOverride
+AttributeDisplayOverride_ID,Attribute_ID,Submodel_ID,Flags,Global_User_ID
+
+View_Display
+View_Display_ID,Submodel_ID,DbView_ID,DisplayBkgColor,View_Background_Color,Default_Horz_Position,Default_Vert_Position,cxView,cyView,cxViewNode,cyViewNode,xViewNode,yViewNode,Global_User_ID,Row_Time_Stamp
+
+Submodel_SchemaObj_Link
+Submodel_SchemaObj_Link_ID,Submodel_ID,MetaTable_ID,Table_Row_ID,cxNode,cyNode,xNode,yNode,cxNodeBackup,cyNodeBackup,xNodeBackup,yNodeBackup,Flags,Global_User_ID
+
+RelationshipDisplay
+DiagramId,ModelId,SubmodelId,RelationshipId,RelationshipDisplay_ID,ForeignKey_ID,Submodel_ID,ElbowPosition,DisplayVerbs,DisplayCardinality,PhysicalEntityId,VerbOffsetX,VerbOffsetY,InverseVerbOffsetX,InverseVerbOffsetY,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,cxName,cyName,cxLogicalName,cyLogicalName,cxVerbPhrase,cyVerbPhrase,cxInverseVerbPhrase,cyInverseVerbPhrase,NameOffsetX,NameOffsetY,LogicalNameOffsetX,LogicalNameOffsetY,NameOrientation,LogicalNameOrientation,VerbPhraseOrientation,InverseVerbPhraseOrientation,Global_User_ID,Row_Time_Stamp
+1,1,1,43,43,43,1,5000,N,N,0,0,0,0,0,0,0,-71,0,0,0,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,539,0
+1,1,1,44,44,44,1,5000,N,N,0,0,0,0,0,0,0,65,0,0,0,-71,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,557,0
+1,1,1,46,46,46,1,5000,N,N,0,0,0,0,0,0,0,43,0,0,0,-28,-50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,0
+1,1,1,47,47,47,1,5000,N,N,0,0,0,0,0,0,0,-64,-81,0,0,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0
+1,1,1,48,48,48,1,5000,N,N,0,0,0,0,0,0,0,0,43,0,0,14,-50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,587,0
+1,1,1,49,49,49,1,5000,N,N,0,0,0,0,0,3,0,65,21,0,0,-67,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,596,0
+1,1,1,50,50,50,1,5000,N,N,0,0,0,0,0,3,0,-71,34,0,0,68,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,601,0
+1,1,1,1,1,1,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,222,0
+1,1,1,2,2,2,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,0
+1,1,1,3,3,3,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,0
+1,1,1,4,4,4,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,234,0
+1,1,1,5,5,5,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,0
+1,1,1,9,9,9,1,5000,N,N,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,261,0
+1,1,1,10,10,10,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,0
+1,1,1,11,11,11,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,270,0
+1,1,1,12,12,12,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,0
+1,1,1,21,21,21,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,363,0
+1,1,1,22,22,22,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,372,0
+1,1,1,26,26,26,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0
+1,1,1,27,27,27,1,5000,N,N,0,0,0,0,0,0,0,-24,-76,0,0,23,-68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,405,0
+1,1,1,29,29,29,1,5000,N,N,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,0
+1,1,1,34,34,34,1,5000,N,N,0,0,0,0,0,0,5,0,0,-65470964,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,461,0
+1,1,1,35,35,35,1,5000,N,N,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,472,0
+1,1,1,36,36,36,1,5000,N,N,0,0,0,0,0,0,5,0,0,-65470930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,489,0
+1,1,1,37,37,37,1,5000,N,N,0,0,0,0,0,0,0,70,0,0,0,-78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0
+1,1,1,38,38,38,1,5000,N,N,0,0,0,0,0,0,0,-64,0,0,0,79,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,503,0
+
+Docking_Position
+Docking_Position_ID,View_Relationship_Display_ID,Child_View_Display_ID,Parent_View_Display_ID,RelationshipDisplay_ID,Parent_Entity_Display,Child_Entity_Display,Parent_Supertype_Display,Child_Supertype_Display,Supertype_Display_ID,Docking_Type,Global_User_ID,Row_Time_Stamp
+
+Dock_Pos_Disp_Level
+Dock_Pos_Disp_Level_ID,Docking_Position_ID,Display_Level,Parent_Side,Child_Side,Parent_Relative_Position,Child_Relative_Position,Global_User_ID,Row_Time_Stamp
+
+Path_Node
+Path_Node_ID,RelationshipDisplay_ID,View_Relationship_Display_ID,SupertypeDisplay_ID,SchemaObj_Edge_ID,Shape_Edge_Display_ID,Lineage_Stream_Display_ID,X,Y,SequenceNo
+1,44,0,0,0,0,0,757,173,1
+2,44,0,0,0,0,0,781,167,2
+3,44,0,0,0,0,0,830,115,3
+4,46,0,0,0,0,0,683,231,1
+5,46,0,0,0,0,0,683,318,2
+6,46,0,0,0,0,0,688,318,3
+7,47,0,0,0,0,0,911,422,1
+8,47,0,0,0,0,0,911,434,2
+9,48,0,0,0,0,0,757,339,1
+10,48,0,0,0,0,0,730,339,2
+11,49,0,0,0,0,0,898,274,1
+12,49,0,0,0,0,0,898,300,2
+13,50,0,0,0,0,0,1124,270,1
+14,50,0,0,0,0,0,1124,273,2
+15,27,0,0,0,0,0,1603,148,1
+16,27,0,0,0,0,0,1278,148,2
+17,37,0,0,0,0,0,556,492,1
+18,37,0,0,0,0,0,556,528,2
+19,38,0,0,0,0,0,882,492,1
+20,38,0,0,0,0,0,882,528,2
+
+View_Relationship_Display
+View_Relationship_Display_ID,Entity_ID,Parent_View_ID,Submodel_ID,Child_View_ID,ElbowPosition,Inter_Model_View_Rel_Disp_ID,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,cxName,cyName,NameOffsetX,NameOffsetY,NameOrientation,Global_User_ID,Row_Time_Stamp
+
+SchemaObj_Edge
+SchemaObj_Edge_ID,Parent_Entity_Disp_ID,Parent_View_Disp_ID,Parent_SchemaObj_Link_ID,Child_SchemaObj_Link_ID,Submodel_ID,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,DockingType,Global_User_ID
+
+SupertypeDisplay
+DiagramId,ModelId,SubmodelId,SupertypeId,SupertypeDisplay_ID,Supertype_ID,Submodel_ID,EntityId,HorizontalPosition,VerticalPosition,ElbowPosition,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,xSupertypeSymbolNode,ySupertypeSymbolNode,cxSupertypeSymbolNode,cySupertypeSymbolNode,Global_User_ID,Row_Time_Stamp
+1,1,1,1,1,1,1,12,377,333,5000,0,0,0,0,0,1,0,0,65536000,0,0,0,0,458,0
+
+GraphicObject
+DiagramId,ModelId,SubmodelId,ObjectId,GraphicObject_ID,Submodel_ID,GraphicsType,LeftPosition,TopPosition,RightPosition,BottomPosition,RawData,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,Global_User_ID,Row_Time_Stamp
+
+Shape_Display
+Shape_Display_ID,Submodel_ID,Shape_ID,xNode,yNode,cxNode,cyNode,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,zOrder,IsContainer,HorizontalTextJustification,VerticalTextJustification,WrapText,FitShape,Global_User_ID
+
+Shape_Edge_Display
+Shape_Edge_Display_ID,Shape_Edge_ID,Submodel_ID,LineWidth,PenStyle,CurvatureStyle,SourceArrowHeadStyle,TargetArrowHeadStyle,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,DockingType,cxName,cyName,cxVerbPhrase,cyVerbPhrase,cxInverseVerbPhrase,cyInverseVerbPhrase,NameOffsetX,NameOffsetY,VerbOffsetX,VerbOffsetY,InverseVerbOffsetX,InverseVerbOffsetY,NameOrientation,VerbPhraseOrientation,InverseVerbPhraseOrientation,Global_User_ID
+
+Lineage_Component_Display
+Lineage_Component_Display_ID,Lineage_Component_ID,Submodel_ID,xNode,yNode,cxNode,cyNode,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,Global_User_ID
+
+Transformation_Display
+Transformation_Display_ID,Transformation_ID,Submodel_ID,xNode,yNode,cxNode,cyNode,xNodeBackup,yNodeBackup,cxNodeBackup,cyNodeBackup,Global_User_ID
+
+Lineage_Stream_Display
+Lineage_Stream_Display_ID,Lineage_Stream_ID,Submodel_ID,DesiredRoutingStyle,ParentConnectorFlags,ParentConnectorOffsetX,ParentConnectorOffsetY,ParentConnectorPerMils,ChildConnectorFlags,ChildConnectorOffsetX,ChildConnectorOffsetY,ChildConnectorPerMils,DockingType,cxName,cyName,NameOffsetX,NameOffsetY,NameOrientation,cxDescription,cyDescription,DescriptionOffsetX,DescriptionOffsetY,DescriptionOrientation,Global_User_ID
+
+SmallString
+String_Id,Data,Overflow,ConstantString,Row_Time_Stamp
+1,Main,0,0,0
+162,Z,0,0,0
+2,Diagram specific data dictionary.,0,0,0
+3,Logical,0,0,0
+164,pk16,0,0,0
+4,Main Model,0,0,0
+165,'M',0,0,0
+5,Data Movement Rules,0,0,0
+166,creado,0,0,0
+167,actualizado,0,0,0
+7,Y,0,0,0
+8,evento,0,0,0
+9,CH,0,0,0
+10,id,0,0,0
+11,nombre,0,0,0
+12,ciudad_id,0,0,0
+13,tipo,0,0,0
+14,categoria,0,0,0
+15,modalidad,0,0,0
+20,pais,0,0,0
+22,ciudad,0,0,0
+24,descripcion,0,0,0
+27,cantidad_jugadores,0,0,0
+31,ronda,0,0,0
+33,mesa,0,0,0
+36,jugador,0,0,0
+38,boleta,0,0,0
+40,data,0,0,0
+41,N,0,0,0
+42,P,0,0,0
+43,M,0,0,0
+44,O,0,0,0
+45,categoria_id,0,0,0
+46,tipo_id,0,0,0
+47,modalidad_id,0,0,0
+48,pais_id,0,0,0
+49,INT,0,0,0
+50,VAR,0,0,0
+51,S,0,0,0
+54,I,0,0,0
+57,organizacion,0,0,0
+58,patrocinador,0,0,0
+59,patrocinador evento,0,0,0
+62,FALSE,0,0,0
+63,BIT,0,0,0
+64,SI,0,0,0
+65,nro_identidad,0,0,0
+66,tipo_identidad,0,0,0
+67,D,0,0,0
+68,fecha_nacimiento,0,0,0
+69,alias,0,0,0
+70,nivel,0,0,0
+71,0,0,0,0
+72,elo,0,0,0
+74,comentario,0,0,0
+75,dominoAPI_DD,0,0,0
+76,dominoAPI.DM1,0,0,0
+77,Dayron,0,0,0
+78,CASA,0,0,0
+79,1.0,0,0,0
+80,NameOnly,0,0,0
+81,PK1,0,0,0
+82,PK2,0,0,0
+83,PK3,0,0,0
+84,PK4,0,0,0
+85,PK5,0,0,0
+86,PK6,0,0,0
+87,PK7,0,0,0
+88,PK8,0,0,0
+89,PK10,0,0,0
+90,PK11,0,0,0
+91,PK12,0,0,0
+92,PK13,0,0,0
+93,PK14,0,0,0
+94,PK15,0,0,0
+95,PK16,0,0,0
+97,equipo,0,0,0
+100,PK17,0,0,0
+101,PK18,0,0,0
+102,cerrado,0,0,0
+103,DT,0,0,0
+104,fecha_inicio,0,0,0
+105,fecha_cierre,0,0,0
+106,numero,0,0,0
+107,evento_id,0,0,0
+109,cerrada,0,0,0
+110,numero_ronda,0,0,0
+111,numero_mesa,0,0,0
+112,fecha_registro,0,0,0
+113,TRUE,0,0,0
+114,es_valida,0,0,0
+115,es_presencial,0,0,0
+116,es_internacional,0,0,0
+117,ranking,0,0,0
+118,28,0,0,0
+119,SDT,0,0,0
+120,cantidad_fichas,0,0,0
+126,arbitro,0,0,0
+128,narrador,0,0,0
+129,cargo,0,0,0
+130,persona_id,0,0,0
+131,comite_organizador,0,0,0
+132,funcion,0,0,0
+133,PK20,0,0,0
+134,PK21,0,0,0
+135,PK22,0,0,0
+136,tipo_medio,0,0,0
+137,medio,0,0,0
+138,correo,0,0,0
+139,participante,0,0,0
+141,participa,0,0,0
+142,sexo,0,0,0
+143,telefono,0,0,0
+144,equipo_id,0,0,0
+145,numero_boleta,0,0,0
+146,numero_data,0,0,0
+147,puntos,0,0,0
+148,PK23,0,0,0
+149,jugador_id,0,0,0
+151,boleta_equipo,0,0,0
+152,salidor,0,0,0
+153,tantos,0,0,0
+154,resultado,0,0,0
+155,ganador,0,0,0
+156,inicio,0,0,0
+157,DTO,0,0,0
+158,duracion,0,0,0
+159,PK24,0,0,0
+
+LargeString
+String_Id,Data,Row_Time_Stamp
+
+StringUsage
+StringUsage_Id,UniqueObject_Id,StringUsageType_Id,String_Id,Row_Time_Stamp
+463,604,15,106,0
+464,604,14,106,0
+1,2,99,75,0
+2,2,100,2,0
+465,604,11,106,0
+3,3,37,3,0
+466,604,95,106,0
+4,22,38,4,0
+467,606,15,110,0
+5,111,112,5,0
+468,606,14,106,0
+6,111,113,5,0
+469,606,11,110,0
+7,116,1,8,0
+470,606,95,110,0
+8,116,2,8,0
+471,608,15,111,0
+9,121,14,10,0
+472,608,14,106,0
+10,123,14,11,0
+473,608,11,111,0
+11,124,14,10,0
+474,608,95,111,0
+475,610,15,107,0
+476,610,14,10,0
+477,610,11,107,0
+15,128,14,116,0
+478,610,95,107,0
+479,612,15,107,0
+480,612,14,10,0
+18,132,1,20,0
+481,612,11,107,0
+19,132,2,20,0
+482,612,95,107,0
+20,137,14,10,0
+483,618,63,62,0
+21,141,14,11,0
+484,618,14,152,0
+22,142,1,22,0
+485,618,15,152,0
+23,142,2,22,0
+486,619,14,147,0
+24,147,14,10,0
+487,619,15,153,0
+25,151,14,11,0
+488,620,63,71,0
+26,152,1,14,0
+489,620,14,154,0
+27,152,2,14,0
+490,620,15,154,0
+28,157,14,10,0
+491,621,63,62,0
+29,159,14,11,0
+492,621,14,155,0
+30,160,14,24,0
+493,621,15,155,0
+31,161,1,13,0
+494,622,14,156,0
+32,161,2,13,0
+495,622,15,156,0
+33,166,14,10,0
+496,623,14,158,0
+34,168,14,11,0
+497,623,15,158,0
+35,169,14,24,0
+498,592,39,159,0
+36,170,1,15,0
+37,170,2,15,0
+38,175,14,10,0
+39,177,14,11,0
+40,178,14,27,0
+41,179,1,131,0
+42,179,2,131,0
+43,184,1,58,0
+44,184,2,58,0
+47,194,1,33,0
+48,194,2,33,0
+49,199,1,31,0
+50,199,2,31,0
+51,206,1,139,0
+52,206,2,139,0
+53,211,1,38,0
+54,211,2,38,0
+55,216,1,40,0
+56,216,2,40,0
+57,223,15,45,0
+58,223,14,10,0
+59,223,11,45,0
+60,223,95,45,0
+61,227,15,46,0
+62,227,14,10,0
+63,227,11,46,0
+64,227,95,46,0
+65,231,15,47,0
+66,231,14,10,0
+67,231,11,47,0
+68,231,95,47,0
+69,235,15,48,0
+70,235,14,10,0
+71,235,11,48,0
+72,235,95,48,0
+73,121,15,10,0
+74,123,15,11,0
+75,239,15,12,0
+76,239,14,10,0
+77,239,11,12,0
+78,239,95,12,0
+81,242,14,132,0
+82,242,15,132,0
+93,262,1,59,0
+94,262,2,59,0
+95,271,15,10,0
+96,271,14,10,0
+97,271,11,10,0
+98,271,95,10,0
+99,274,14,10,0
+100,274,15,10,0
+101,275,14,11,0
+102,275,15,11,0
+103,276,14,57,0
+104,276,15,57,0
+105,278,15,10,0
+106,278,14,10,0
+107,278,11,10,0
+108,278,95,10,0
+109,128,63,62,0
+110,128,15,116,0
+111,137,15,10,0
+112,141,15,11,0
+113,147,15,10,0
+114,151,15,20,0
+115,157,15,10,0
+116,159,15,11,0
+117,160,15,24,0
+118,175,15,10,0
+119,177,15,11,0
+120,178,15,27,0
+121,166,15,10,0
+122,168,15,11,0
+123,169,15,24,0
+124,280,14,10,0
+125,280,15,10,0
+126,281,14,11,0
+127,281,15,11,0
+128,282,14,65,0
+129,282,15,65,0
+130,283,14,66,0
+131,283,15,66,0
+132,284,14,68,0
+133,284,15,68,0
+1522,2176,14,166,0
+134,285,14,69,0
+1523,2176,15,166,0
+135,285,15,69,0
+1524,2177,14,167,0
+1525,2177,15,167,0
+145,290,14,74,0
+146,290,15,74,0
+147,294,15,12,0
+148,294,14,10,0
+149,294,11,12,0
+150,294,95,12,0
+151,1,58,76,0
+152,1,51,76,0
+153,1,52,77,0
+154,1,53,78,0
+155,1,54,79,0
+156,1,55,78,0
+157,1,57,80,0
+158,118,39,81,0
+159,134,39,82,0
+160,144,39,83,0
+161,154,39,84,0
+162,163,39,85,0
+163,172,39,86,0
+164,181,39,87,0
+165,186,39,88,0
+166,196,39,89,0
+167,201,39,90,0
+168,208,39,91,0
+169,213,39,92,0
+170,218,39,93,0
+172,264,39,95,0
+173,304,1,97,0
+174,304,2,97,0
+175,309,14,10,0
+176,311,14,11,0
+187,309,15,10,0
+188,311,15,11,0
+193,306,39,100,0
+195,124,15,12,0
+196,332,14,74,0
+197,332,15,74,0
+198,333,63,62,0
+199,333,14,102,0
+200,333,15,102,0
+201,334,14,104,0
+202,334,15,104,0
+203,335,14,105,0
+204,335,15,105,0
+205,336,14,106,0
+206,336,15,106,0
+215,346,14,106,0
+216,346,15,106,0
+227,364,15,107,0
+228,364,14,10,0
+229,364,11,107,0
+230,364,95,107,0
+231,367,14,104,0
+232,367,15,104,0
+233,368,14,105,0
+234,368,15,105,0
+235,369,63,62,0
+236,369,14,109,0
+237,369,15,109,0
+238,370,14,74,0
+239,370,15,74,0
+240,373,15,107,0
+241,373,14,10,0
+264,397,15,107,0
+265,397,14,10,0
+266,397,11,107,0
+267,397,95,107,0
+268,400,14,106,0
+269,400,15,106,0
+270,406,15,110,0
+271,406,14,106,0
+272,406,11,110,0
+273,406,95,110,0
+274,408,15,107,0
+275,408,14,10,0
+276,408,11,107,0
+277,408,95,107,0
+286,373,95,107,0
+287,373,11,107,0
+288,421,15,111,0
+289,421,14,106,0
+290,421,11,111,0
+291,421,95,111,0
+292,423,15,107,0
+293,423,14,10,0
+294,423,11,107,0
+295,423,95,107,0
+296,426,14,112,0
+297,426,15,112,0
+298,427,63,113,0
+299,427,14,114,0
+300,427,15,114,0
+301,428,63,113,0
+302,428,14,115,0
+303,428,15,115,0
+304,429,63,118,0
+305,429,14,120,0
+306,429,15,120,0
+321,452,1,36,0
+322,452,2,36,0
+323,462,15,10,0
+324,462,14,10,0
+325,462,11,10,0
+326,462,95,10,0
+327,465,1,126,0
+328,465,2,126,0
+329,473,15,10,0
+330,473,14,10,0
+331,473,11,10,0
+332,473,95,10,0
+333,476,14,70,0
+334,476,15,70,0
+335,476,62,50,0
+336,477,14,72,0
+337,477,15,72,0
+338,477,62,49,0
+339,477,63,71,0
+340,478,14,117,0
+341,478,15,117,0
+342,478,62,9,0
+343,479,14,13,0
+344,479,15,13,0
+345,479,62,9,0
+346,480,1,128,0
+347,480,2,128,0
+348,490,15,10,0
+349,490,14,10,0
+350,490,11,10,0
+351,490,95,10,0
+352,495,15,130,0
+353,495,14,10,0
+354,495,11,130,0
+355,495,95,130,0
+360,504,15,107,0
+361,504,14,10,0
+362,504,11,107,0
+363,504,95,107,0
+364,507,63,62,0
+365,507,14,116,0
+366,507,15,116,0
+369,509,14,70,0
+370,509,15,70,0
+833,1145,11,107,0
+371,509,62,50,0
+372,454,39,133,0
+373,467,39,134,0
+374,482,39,135,0
+375,510,14,136,0
+376,510,15,136,0
+377,511,14,137,0
+378,511,15,137,0
+379,512,14,138,0
+380,512,15,138,0
+381,513,1,141,0
+382,513,2,141,0
+395,531,63,165,0
+396,531,14,142,0
+397,531,15,142,0
+398,532,14,143,0
+399,532,15,143,0
+404,540,15,107,0
+405,540,14,10,0
+406,540,11,107,0
+407,540,95,107,0
+408,542,15,145,0
+409,542,14,106,0
+410,542,11,145,0
+411,542,95,145,0
+412,544,15,110,0
+413,544,14,106,0
+414,544,11,110,0
+415,544,95,110,0
+416,546,15,111,0
+417,546,14,106,0
+418,546,11,111,0
+419,546,95,111,0
+420,548,15,107,0
+421,548,14,10,0
+422,548,11,107,0
+423,548,95,107,0
+424,550,15,107,0
+425,550,14,10,0
+426,550,11,107,0
+427,550,95,107,0
+428,558,15,144,0
+429,558,14,10,0
+430,558,11,144,0
+431,558,95,144,0
+432,561,14,146,0
+433,561,15,146,0
+434,562,14,147,0
+435,562,15,147,0
+436,515,39,148,0
+441,578,15,149,0
+442,578,14,10,0
+443,578,11,149,0
+444,578,95,149,0
+445,583,15,107,0
+446,583,14,10,0
+447,583,11,107,0
+448,583,95,107,0
+449,588,15,144,0
+450,588,14,10,0
+451,588,11,144,0
+452,588,95,144,0
+453,590,1,151,0
+454,590,2,151,0
+455,597,15,144,0
+456,597,14,10,0
+457,597,11,144,0
+458,597,95,144,0
+459,602,15,107,0
+460,602,14,10,0
+461,602,11,107,0
+462,602,95,107,0
+
+StringUsageType
+StringUsageType_Id,UsageName,Description,Global_User_ID,Row_Time_Stamp
+1,Entity Name,"",0,0
+2,Table Name,"",0,0
+3,Entity Definition,"",0,0
+4,Entity Note,"",0,0
+5,Entity Owner,"",0,0
+6,Display Label Singular,"",0,0
+7,Display Label Plural,"",0,0
+8,Row Value Expression,"",0,0
+9,Entity Type,"",0,0
+10,Unique Rolename,"",0,0
+11,Rolename,"",0,0
+12,Attribute Note,"",0,0
+13,Attribute Definition,"",0,0
+14,Attribute Name,"",0,0
+15,Column Name,"",0,0
+16,Full Rolename,"",0,0
+17,Unique Column Name,"",0,0
+18,Relationship Name,"",0,0
+19,Verb Phrase,"",0,0
+20,Inverse Phrase,"",0,0
+21,Relationship Definition,"",0,0
+22,Relationship Note,"",0,0
+23,Relationship Type,"",0,0
+24,Parent Constraint Type,"",0,0
+25,Parent Cardinality,"",0,0
+26,Child Cardinality,"",0,0
+27,Parent Optionality,"",0,0
+28,Child Optionality,"",0,0
+29,Parent Insert,"",0,0
+30,Parent Update,"",0,0
+31,Parent Delete,"",0,0
+32,Child Insert,"",0,0
+33,Child Update,"",0,0
+34,Child Delete,"",0,0
+35,Insert Child Form Type,"",0,0
+36,Update Child Form Type,"",0,0
+37,Model Name,"",0,0
+38,View Model Name,"",0,0
+39,Index Name,"",0,0
+40,Index Default Name,"",0,0
+41,Is Unique,"",0,0
+42,Index Type,"",0,0
+43,Key Type,"",0,0
+44,Hash Size Type,"",0,0
+45,Ignore Duplicate Key,"",0,0
+46,Duplicate Row,"",0,0
+47,No Sort,"",0,0
+48,Sort Ordering,"",0,0
+49,Domain Name,"",0,0
+50,Domain Column Name,"",0,0
+51,Diagram Name,"",0,0
+52,Author,"",0,0
+53,Company,"",0,0
+54,Version No,"",0,0
+55,Copyright,"",0,0
+56,Diagram Definition,"",0,0
+57,Unification Option,"",0,0
+58,File Name,"",0,0
+59,Check Constraint Name,"",0,0
+60,Check Constraint Text,"",0,0
+61,User Data Type,"",0,0
+62,Data Type Id,"",0,0
+63,Default,"",0,0
+64,Rule,"",0,0
+65,Default Name,"",0,0
+66,Rule Name,"",0,0
+67,Default Base Name,"",0,0
+68,Default Base Text,"",0,0
+69,Rule Base Name,"",0,0
+70,Rule Base Text,"",0,0
+71,Copyright Year,"",0,0
+72,View Definition,"",0,0
+73,View Name,"",0,0
+74,View Note,"",0,0
+75,View Owner,"",0,0
+76,DbTrigger Name,"",0,0
+77,DbTrigger Owner,"",0,0
+78,DbTrigger Description,"",0,0
+79,DbTrigger Value,"",0,0
+80,Proc Name,"",0,0
+81,Proc Owner,"",0,0
+82,Proc Description,"",0,0
+83,Proc Value,"",0,0
+84,DbPackage Name,"",0,0
+85,DbPackage Owner,"",0,0
+86,DbPackage Description,"",0,0
+87,DbPackage Header Value,"",0,0
+88,DbPackage Body Value,"",0,0
+89,Dictionary Trigger Name,"",0,0
+90,Dictionary Trigger Description,"",0,0
+91,Dictionary Trigger Value,"",0,0
+92,Dictionary Library Name,"",0,0
+93,Dictionary Library Description,"",0,0
+94,Dictionary Library Value,"",0,0
+95,Logical Rolename,"",0,0
+96,Reusable Procedure Name,"",0,0
+97,Reusable Procedure Description,"",0,0
+98,Reusable Procedure Value,"",0,0
+99,Data Dictionary Name,"",0,0
+100,Data Dictionary Description,"",0,0
+101,Storage Object Name,"",0,0
+102,Storage Object Owner,"",0,0
+103,Storage Object Description,"",0,0
+104,Storage Object Value,"",0,0
+105,Domain Description,"",0,0
+106,Reference Value Name,"",0,0
+107,Reference Value Description,"",0,0
+108,Reference Value Value,"",0,0
+109,Reference Value Value Description,"",0,0
+110,Reference Value Min Value,"",0,0
+111,Reference Value Max Value,"",0,0
+112,Attachment Type Name,"",0,0
+113,Attachment Type Description,"",0,0
+114,Attachment Name,"",0,0
+115,Attachment Description,"",0,0
+116,Attachment Value Default,"",0,0
+117,Bound Dictionary Object Value Override,"",0,0
+118,Domain Note,"",0,0
+119,Domain Attribute Name,"",0,0
+120,Dictionary Object Link Node Name,"",0,0
+121,Default Constraint Name,"",0,0
+122,Object Transform Name,"",0,0
+123,Object Transform Description,"",0,0
+124,Logical Relationship Name,"",0,0
+125,Shape Name,"",0,0
+126,Shape Value,"",0,0
+127,Shape Edge Name,"",0,0
+128,DatabaseRole Name,"",0,0
+129,DatabaseRole Description,"",0,0
+130,DatabaseUser Name,"",0,0
+131,DatabaseUser Description,"",0,0
+132,DatabaseUser External Name,"",0,0
+133,Naming Standards Template Name,"",0,0
+134,Naming Standards Template Description,"",0,0
+135,Naming Standards Template Data,"",0,0
+136,Shape Verb Phrase,"",0,0
+137,Shape Inverse Verb Phrase,"",0,0
+138,Attribute Attachment Override,"",0,0
+139,Domain Attachment Override,"",0,0
+140,Index Attachment Override,"",0,0
+141,Model Attachment Override,"",0,0
+142,Relationship Attachment Override,"",0,0
+143,Entity Attachment Override,"",0,0
+144,View Attachment Override,"",0,0
+145,User Data Type Attachment Override,"",0,0
+146,Rule Base Attachment Override,"",0,0
+147,Default Base Attachment Override,"",0,0
+148,Proc Attachment Override,"",0,0
+149,DbTrigger Attachment Override,"",0,0
+150,DbPackage Attachment Override,"",0,0
+151,Reference Value Attachment Override,"",0,0
+152,Shape Attachment Override,"",0,0
+153,SubModel Definition,"",0,0
+154,SubModel Note,"",0,0
+155,UDM Definition Override,"",0,0
+156,Data Lineage Transformation Name,"",0,0
+157,Data Lineage Transformation Definition,"",0,0
+158,Data Lineage Transformation Code,"",0,0
+159,Created By ID,"",0,0
+160,Last Updated By ID,"",0,0
+161,Create Timestamp ID,"",0,0
+162,Last Update Timestamp ID,"",0,0
+163,Lineage Stream Name,"",0,0
+164,Lineage Stream Description,"",0,0
+165,User Object Match Definition,"",0,0
+166,Attribute Security Override,"",0,0
+167,Model Security Override,"",0,0
+168,Entity Security Override,"",0,0
+169,View Security Override,"",0,0
+170,Data Lineage Transformation Attachment Override,"",0,0
+171,SubModel Attachment Override,"",0,0
+172,SubModel Security Override,"",0,0
+
+Object_Color_Override
+Object_Color_Override_ID,ColorProperty_ID,MetaTable_ID,Table_Row_ID,Red,Green,Blue,Global_User_ID
+
+Object_Font_Override
+Object_Font_Override_ID,FontProperty_ID,MetaTable_ID,Table_Row_ID,Face,Size,Bold,Italic,Underline,Strikeout,Escapement,Orientation,CharacterSet,OutputPrecision,ClipPrecision,Quality,Pitch,Family,Global_User_ID
+
+Layout_Algorithm
+Layout_Algorithm_ID,Name,Description,Global_User_ID,Row_Time_Stamp
+1,Force,Force-Directed Layout Algorithm,0,0
+2,Layered,Layered Layout Algorithm,0,0
+3,Circle,Circle Layout Algorithm,0,0
+4,Random,Random Layout Algorithm,0,0
+
+Data_Type
+Data_Type_ID,Name,Description,Row_Time_Stamp
+1,Integer,Integer Data Type,0
+2,Float,Floating-Point Data Type,0
+
+Layout_Property_Name
+Layout_Property_Name_ID,Name,Description,Row_Time_Stamp
+1,FORCE_ALGORITHM,Force-Directed Layout Parameter,0
+2,FORCE_FLAGS,Force-Directed Layout Parameter,0
+3,FORCE_START_V_MIN,Force-Directed Layout Parameter,0
+4,FORCE_START_V_MAX,Force-Directed Layout Parameter,0
+5,FORCE_START_V,Force-Directed Layout Parameter,0
+6,FORCE_START_H_MIN,Force-Directed Layout Parameter,0
+7,FORCE_START_H_MAX,Force-Directed Layout Parameter,0
+8,FORCE_START_H,Force-Directed Layout Parameter,0
+9,FORCE_GRAPH_H_SEP_MIN,Force-Directed Layout Parameter,0
+10,FORCE_GRAPH_H_SEP_MAX,Force-Directed Layout Parameter,0
+11,FORCE_GRAPH_H_SEP,Force-Directed Layout Parameter,0
+12,FORCE_NODE_DIST_MIN,Force-Directed Layout Parameter,0
+13,FORCE_NODE_DIST_MAX,Force-Directed Layout Parameter,0
+14,FORCE_NODE_DIST,Force-Directed Layout Parameter,0
+15,FORCE_ARG1,Force-Directed Layout Parameter,0
+16,FORCE_ARG2,Force-Directed Layout Parameter,0
+17,LAYERED_ALGORITHM,Layered Layout Parameter,0
+18,LAYERED_TECHNIQUE,Layered Layout Parameter,0
+19,LAYERED_FLAGS,Layered Layout Parameter,0
+20,LAYERED_START_V_MIN,Layered Layout Parameter,0
+21,LAYERED_START_V_MAX,Layered Layout Parameter,0
+22,LAYERED_START_V,Layered Layout Parameter,0
+23,LAYERED_STEP_V_MIN,Layered Layout Parameter,0
+24,LAYERED_STEP_V_MAX,Layered Layout Parameter,0
+25,LAYERED_STEP_V,Layered Layout Parameter,0
+26,LAYERED_START_H_MIN,Layered Layout Parameter,0
+27,LAYERED_START_H_MAX,Layered Layout Parameter,0
+28,LAYERED_START_H,Layered Layout Parameter,0
+29,LAYERED_STEP_H_MIN,Layered Layout Parameter,0
+30,LAYERED_STEP_H_MAX,Layered Layout Parameter,0
+31,LAYERED_STEP_H,Layered Layout Parameter,0
+32,LAYERED_GRAPH_H_SEP_MIN,Layered Layout Parameter,0
+33,LAYERED_GRAPH_H_SEP_MAX,Layered Layout Parameter,0
+34,LAYERED_GRAPH_H_SEP,Layered Layout Parameter,0
+35,LAYERED_ARG1_MIN,Layered Layout Parameter,0
+36,LAYERED_ARG1_MAX,Layered Layout Parameter,0
+37,LAYERED_ARG1,Layered Layout Parameter,0
+38,LAYERED_ARG2,Layered Layout Parameter,0
+39,CIRCLE_FLAGS,Circle Layout Parameter,0
+40,CIRCLE_DENSITY_MIN,Circle Layout Parameter,0
+41,CIRCLE_DENSITY_MAX,Circle Layout Parameter,0
+42,CIRCLE_DENSITY,Circle Layout Parameter,0
+43,CIRCLE_GRAPH_H_SEP_MIN,Circle Layout Parameter,0
+44,CIRCLE_GRAPH_H_SEP_MAX,Circle Layout Parameter,0
+45,CIRCLE_GRAPH_H_SEP,Circle Layout Parameter,0
+46,RANDOM_FLAGS,Random Layout Parameter,0
+47,RANDOM_MAX_H_MIN,Random Layout Parameter,0
+48,RANDOM_MAX_H_MAX,Random Layout Parameter,0
+49,RANDOM_MAX_H,Random Layout Parameter,0
+50,RANDOM_MAX_V_MIN,Random Layout Parameter,0
+51,RANDOM_MAX_V_MAX,Random Layout Parameter,0
+52,RANDOM_MAX_V,Random Layout Parameter,0
+53,RANDOM_GRAPH_H_SEP_MIN,Random Layout Parameter,0
+54,RANDOM_GRAPH_H_SEP_MAX,Random Layout Parameter,0
+55,RANDOM_GRAPH_H_SEP,Random Layout Parameter,0
+
+Submodel_Algorithm
+Submodel_Algorithm_ID,Layout_Algorithm_ID,Submodel_ID,Global_User_ID,Row_Time_Stamp
+
+Algorithm_Property
+Algorithm_Property_ID,Layout_Property_Name_ID,Data_Type_ID,Submodel_Algorithm_ID,Value,Global_User_ID,Row_Time_Stamp
+
+Identity_Value
+Identity_Value_ID,Table_Name,Column_Name,Next_Valid_Value,Global_User_ID,Row_Time_Stamp
+1,Algorithm_Property,Algorithm_Property_ID,1,0,0
+2,AppGenAttribute,AppGenAttribute_ID,1,0,0
+3,AppGenEntity,AppGenEntity_ID,1,0,0
+4,AppGenField,AppGenField_ID,1,0,0
+5,AppGenFormField,AppGenFormField_ID,1,0,0
+6,AppGenFormLink,AppGenFormLink_ID,1,0,0
+7,AppGenModel,AppGenModel_ID,1,0,0
+8,AppGenRelationship,AppGenRelationship_ID,1,0,0
+9,AppGenSearchColumn,AppGenSearchColumn_ID,1,0,0
+10,Attachment,Attachment_ID,1,0,0
+11,Attachment_Type,Attachment_Type_ID,2,0,0
+12,Attribute,Attribute_ID,555,0,0
+13,AttributeDisplayOverride,AttributeDisplayOverride_ID,1,0,0
+14,Bound_Dictionary_Object,Bound_Dictionary_Object_ID,1,0,0
+15,CheckConstraints,CheckConstraints_ID,1,0,0
+16,Circular_Layout,Circular_Layout_ID,5,0,0
+17,ColorDefault,ColorDefault_ID,334,0,0
+18,Column_Usage,Column_Usage_ID,1,0,0
+19,Components_Layout,Components_Layout_ID,5,0,0
+20,Configuration_Option,Configuration_Option_ID,1,0,0
+21,Data_Dictionary,Data_Dictionary_ID,2,0,0
+22,Data_Flow,Data_Flow_ID,1,0,0
+23,Data_Flow_Property,Data_Flow_Property_ID,1,0,0
+24,Data_Type,Data_Type_ID,1,0,0
+25,DbTrigger,DbTrigger_ID,1,0,0
+26,DbPackage,DbPackage_ID,1,0,0
+27,DbView,DbView_ID,1,0,0
+28,Delayed_Checkout,Delayed_Checkout_ID,1,0,0
+29,DF_Component,DF_Component_ID,1,0,0
+30,DF_Component_Type,DF_Component_Type_ID,1,0,0
+31,DF_IO_Record_Set,DF_IO_Record_Set_ID,1,0,0
+32,DF_IO_Property,DF_IO_Property_ID,1,0,0
+33,DF_IO_Property_Data,DF_IO_Property_Data_ID,1,0,0
+34,DF_Property,DF_Property_ID,1,0,0
+35,DF_Property_Data,DF_Property_Data_ID,1,0,0
+36,DiagramDisplay,DiagramDisplay_ID,6,0,0
+37,Dictionary_Library,Dictionary_Library_ID,1,0,0
+38,Dictionary_Object,Dictionary_Object_ID,6,0,0
+39,Dictionary_Object_Link,Dictionary_Object_Link_ID,1,0,0
+40,Dictionary_Object_Type,Dictionary_Object_Type_ID,14,0,0
+41,Dictionary_Trigger,Dictionary_Trigger_ID,1,0,0
+42,Disconnected_Nodes_Layout,Disconnected_Nodes_Layout_ID,5,0,0
+43,Dock_Pos_Disp_Level,Dock_Pos_Disp_Level_ID,1,0,0
+44,Docking_Position,Docking_Position_ID,1,0,0
+45,Entity,Entity_ID,106,0,0
+46,Entity_Size_and_Position,Entity_Size_and_Position_ID,1,0,0
+47,EntityDisplay,EntityDisplay_ID,106,0,0
+48,Field,Field_ID,1,0,0
+49,Field_Column,Field_Column_ID,1,0,0
+50,Field_Data_Type,Field_Data_Type_ID,1,0,0
+51,FontDefault,FontDefault_ID,184,0,0
+52,ForeignKey,ForeignKey_ID,157,0,0
+53,ForeignKeyColumn,ForeignKeyColumn_Id,213,0,0
+54,Graph_Geometry,Graph_Geometry_ID,5,0,0
+55,GraphicObject,GraphicObject_ID,1,0,0
+56,GridDisplay,GridDisplay_ID,6,0,0
+57,Group,Group_ID,1,0,0
+58,Group_Member,Group_Member_ID,1,0,0
+59,Group_Meta_Table,Group_Meta_Table_ID,1,0,0
+60,Group_Type,Group_Type_ID,1,0,0
+61,Hierarchical_Layout,Hierarchical_Layout_ID,5,0,0
+62,IndexColumn,IndexColumn_ID,220,0,0
+63,Indexes,Indexes_ID,106,0,0
+64,IndexStorage,IndexStorage_ID,106,0,0
+65,InterModelObjectLink,InterModelObjectLink_ID,1,0,0
+66,InterModelRelationship,InterModelRelationship_ID,1,0,0
+67,Layout_Algorithm,Layout_Algorithm_ID,1,0,0
+68,Layout_Property_Name,Layout_Property_Name_ID,1,0,0
+69,Lineage_Component,Lineage_Component_ID,1,0,0
+70,Lineage_Component_Display,Lineage_Component_Display_ID,1,0,0
+71,Lineage_Stream,Lineage_Stream_ID,1,0,0
+72,Lineage_Stream_Display,Lineage_Stream_Display_ID,1,0,0
+73,Lineage_Stream_Member,Lineage_Stream_Member_ID,1,0,0
+74,Log_File,Log_File_ID,1,0,0
+75,Machine,Machine_ID,1,0,0
+76,MetaClass,MetaClass_ID,4,0,0
+77,MetaClass_Member,MetaClass_Member_ID,87,0,0
+78,MetaTable,MetaTable_ID,63,0,0
+79,MetaTableConfiguration,MetaTableConfiguration_ID,1,0,0
+80,Model,Model_ID,6,0,0
+81,ModelOption,ModelOption_ID,66,0,0
+82,Naming_Standards_Template,Naming_Standards_Template_ID,1,0,0
+83,Object_Color_Override,Object_Color_Override_ID,1,0,0
+84,Object_Domain,Object_Domain_ID,3,0,0
+85,Object_Font_Override,Object_Font_Override_ID,1,0,0
+86,Object_Tracking,Object_Tracking_ID,1,0,0
+87,Object_Transform,Object_Transform_ID,1,0,0
+88,ObjectModification,ObjectModification_ID,1,0,0
+89,Orthogonal_Layout,Orthogonal_Layout_ID,5,0,0
+90,PasteInfo,PasteInfo_ID,1,0,0
+91,Path_Node,Path_Node_ID,21,0,0
+92,Pipeline,Pipeline_ID,1,0,0
+93,Pipeline_Member,Pipeline_Member_ID,1,0,0
+94,Pipeline_Member_Property,Pipeline_Member_Property_ID,1,0,0
+95,PrimaryKey,PrimaryKey_ID,181,0,0
+96,Proc,Proc_ID,1,0,0
+97,Project,Project_ID,1,0,0
+98,Project_Link,Project_Link_ID,1,0,0
+99,Project_Member,Project_Member_ID,1,0,0
+100,Project_Property,Project_Property_ID,1,0,0
+101,Property,Property_ID,267,0,0
+102,Property_Type,Property_Type_ID,12,0,0
+103,Property_Usage,Property_Usage_ID,91,0,0
+104,Property_Value,Property_Value_ID,303,0,0
+105,Property_Value_Usage,Property_Value_Usage_ID,91,0,0
+106,Record_Set_Type,Record_Set_Type_ID,1,0,0
+107,Rejected_Record_File,Rejected_Record_File_ID,1,0,0
+108,Referenced_Object,Referenced_Object_ID,1,0,0
+109,Reference_Value,Reference_Value_ID,1,0,0
+110,RelationshipDisplay,RelationshipDisplay_ID,157,0,0
+111,Repository_User_Info,Repository_User_Info_ID,1,0,0
+112,Reusable_Procedure,Reusable_Procedure_ID,1,0,0
+113,SchemaObj_Edge,SchemaObj_Edge_ID,1,0,0
+114,Shape,Shape_ID,1,0,0
+115,Shape_Display,Shape_Display_ID,1,0,0
+116,Shape_Edge,Shape_Edge_ID,1,0,0
+117,Shape_Edge_Display,Shape_Edge_Display_ID,1,0,0
+118,Storage_Object,Storage_Object_ID,1,0,0
+119,Submodel,Submodel_ID,6,0,0
+120,Submodel_SchemaObj_Link,Submodel_SchemaObj_Link_ID,1,0,0
+121,SubmodelLink,SubmodelLink_ID,1,0,0
+122,Submodel_Algorithm,Submodel_Algorithm_ID,1,0,0
+123,Subproject,Subproject_ID,1,0,0
+124,Subtype,Subtype_ID,16,0,0
+125,Supertype,Supertype_ID,6,0,0
+126,SupertypeDisplay,SupertypeDisplay_ID,6,0,0
+127,Symmetric_Layout,Symmetric_Layout_ID,5,0,0
+128,TableStorage,TableStorage_ID,106,0,0
+129,TaskChain,TaskChain_ID,1,0,0
+130,TaskChainComponent,TaskChainComponent_ID,1,0,0
+131,TaskChainComponentDisplay,TaskChainComponentDisplay_ID,1,0,0
+132,TaskChainDisplay,TaskChainDisplay_ID,1,0,0
+133,TaskFlow,TASkFlow_ID,1,0,0
+134,Templated_Proc,Templated_Proc_ID,1,0,0
+135,Transformation,Transformation_ID,1,0,0
+136,Transformation_Display,Transformation_Display_ID,1,0,0
+137,Transform_Member,Transform_Member_ID,1,0,0
+138,Tree_Layout,Tree_Layout_ID,5,0,0
+139,User_Object_Match,User_Object_Match_ID,1,0,0
+140,Valid_Attachment_Type,Valid_Attachment_Type_ID,5,0,0
+141,Valid_Group,Valid_Group_ID,1,0,0
+142,Valid_MetaClass,Valid_MetaClass_ID,13,0,0
+143,Valid_Property,Valid_Property_ID,316,0,0
+144,Valid_Property_Value,Valid_Property_Value_ID,377,0,0
+145,View_Column,View_Column_ID,1,0,0
+146,View_Component,View_Component_ID,1,0,0
+147,View_Display,View_Display_ID,1,0,0
+148,View_Field,View_Field_ID,1,0,0
+149,View_Relationship_Display,View_Relationship_Display_ID,1,0,0
+150,View_Table,View_Table_ID,1,0,0
+151,Database_Role,Database_Role_ID,1,0,0
+152,Database_User,Database_User_ID,1,0,0
+153,Object_Permission,Object_Permission_ID,1,0,0
+154,User_Role_Member,User_Role_Member_ID,1,0,0
+
+MetaTable
+MetaTable_ID,Owner,Name,Description,Global_User_ID,Row_Time_Stamp
+1,NULL,Entity,NULL,0,0
+2,NULL,Indexes,NULL,0,0
+3,NULL,Attribute,NULL,0,0
+4,NULL,View,NULL,0,0
+5,NULL,Procedure,NULL,0,0
+6,NULL,Trigger,NULL,0,0
+7,NULL,Package,NULL,0,0
+8,NULL,Dictionary Trigger,NULL,0,0
+9,NULL,Storage Object,NULL,0,0
+10,NULL,Model,NULL,0,0
+11,NULL,Foreign Key,NULL,0,0
+12,NULL,Diagram,NULL,0,0
+13,NULL,Submodel,NULL,0,0
+14,NULL,Supertype,NULL,0,0
+15,NULL,Templated Procedure,NULL,0,0
+16,NULL,Default,NULL,0,0
+17,NULL,Rule,NULL,0,0
+18,NULL,User Datatype,NULL,0,0
+19,NULL,Domain,NULL,0,0
+20,NULL,Reference Value,NULL,0,0
+21,NULL,Data Dictionary,NULL,0,0
+22,NULL,Entity Display,NULL,0,0
+23,NULL,View Display,NULL,0,0
+24,NULL,View Field,NULL,0,0
+25,NULL,Relationship Display,NULL,0,0
+26,NULL,View Relationship Display,NULL,0,0
+27,NULL,Supertype Display,NULL,0,0
+28,NULL,Graphic Object,NULL,0,0
+29,NULL,Sto Group,NULL,0,0
+30,NULL,Node Group,NULL,0,0
+31,NULL,Materialized View,NULL,0,0
+32,NULL,Table Space,NULL,0,0
+33,NULL,Buffer Pool,NULL,0,0
+34,NULL,Database,NULL,0,0
+35,NULL,Auxiliary Table,NULL,0,0
+36,NULL,Synonym,NULL,0,0
+37,NULL,Sequence,NULL,0,0
+38,NULL,Rollback Segment,NULL,0,0
+39,NULL,Function,NULL,0,0
+40,NULL,SchemaObj Display,NULL,0,0
+41,NULL,SchemaObj Edge,NULL,0,0
+42,NULL,Object Type,NULL,0,0
+43,NULL,Alias,NULL,0,0
+44,NULL,Summary Table,NULL,0,0
+45,NULL,Bound Dictionary Object,NULL,0,0
+46,NULL,Shape,NULL,0,0
+47,NULL,Shape Edge,NULL,0,0
+48,NULL,Shape Display,NULL,0,0
+49,NULL,Shape Edge Display,NULL,0,0
+50,NULL,View Table,NULL,0,0
+51,NULL,Referenced Object,NULL,0,0
+52,NULL,Database User,NULL,0,0
+53,NULL,Database Role,NULL,0,0
+54,NULL,Naming Standards Template,NULL,0,0
+55,NULL,User Object Match,NULL,0,0
+56,NULL,User Defined Mapping,NULL,0,0
+57,NULL,Transformers,NULL,0,0
+58,NULL,Transformation Display,NULL,0,0
+59,NULL,Object Tracking,NULL,0,0
+60,NULL,Lineage Stream Display,NULL,0,0
+61,NULL,Lineage Component Display,NULL,0,0
+62,NULL,Attribute Display Override,NULL,0,0
+
+MetaClass
+MetaClass_ID,MetaClass_Name,Description,Global_User_ID,Row_Time_Stamp
+1,Property,NULL,0,0
+2,Partition,NULL,0,0
+3,DBConnection,NULL,0,0
+
+Property
+Property_ID,Name,Description,IsSystemRequired,Global_User_ID,Row_Time_Stamp
+1,Index Scope,NULL,0,0,0
+2,Index Type,NULL,0,0,0
+3,Byte Order,NULL,0,0,0
+4,Logged,NULL,0,0,0
+5,Parallel,NULL,0,0,0
+6,Degree,NULL,0,0,0
+7,Instances,NULL,0,0,0
+8,Partition Column Name,NULL,0,0,0
+9,Column Literal,NULL,0,0,0
+10,TableSpace Name,NULL,0,0,0
+11,Percent Free,NULL,0,0,0
+12,Percent Used,NULL,0,0,0
+13,Initial Extent,NULL,0,0,0
+14,Next Extent,NULL,0,0,0
+15,Percent Increase,NULL,0,0,0
+16,Min Extents,NULL,0,0,0
+17,Max Extents,NULL,0,0,0
+18,Organization,NULL,0,0,0
+19,Pct Threshold,NULL,0,0,0
+20,Include Column Name,NULL,0,0,0
+21,Initial Trans,NULL,0,0,0
+22,Max Trans,NULL,0,0,0
+23,FreeLists,NULL,0,0,0
+24,FreeList Groups,NULL,0,0,0
+25,Buffer Pool,NULL,0,0,0
+26,Cache,NULL,0,0,0
+27,Connect String,NULL,0,0,0
+28,Linked Table,NULL,0,0,0
+29,Use Hashing,NULL,0,0,0
+30,Data Capture,NULL,0,0,0
+31,Index TableSpace,NULL,0,0,0
+32,LONG TableSpace,NULL,0,0,0
+33,View Encrypted,NULL,0,0,0
+34,View Check Option,NULL,0,0,0
+35,For Bit Data,NULL,0,0,0
+36,System Default,NULL,0,0,0
+37,Compacted,NULL,0,0,0
+38,Pre SQL,NULL,0,0,0
+39,Post SQL,NULL,0,0,0
+40,Disable Pre SQL,NULL,0,0,0
+41,Disable Post SQL,NULL,0,0,0
+42,Row GUID Column,NULL,0,0,0
+43,ERX Logical-Physical,NULL,0,0,0
+44,Group BufPool Cache,NULL,0,0,0
+45,Erase DataSet,NULL,0,0,0
+46,No Close DataSet,NULL,0,0,0
+47,Allow Concurrent Copy,NULL,0,0,0
+48,ERX Physical Definition,NULL,0,0,0
+49,Generate Column,NULL,0,0,0
+50,Identity Cache Size,NULL,0,0,0
+51,Index Storage Type,NULL,0,0,0
+52,Table Storage Type,NULL,0,0,0
+53,PCTFREE String,NULL,0,0,0
+54,Unbalanced Split,NULL,0,0,0
+55,Empty Index,NULL,0,0,0
+56,Fix Table,NULL,0,0,0
+57,Auditing,NULL,0,0,0
+58,Encoding Scheme,NULL,0,0,0
+59,Drop Restriction,NULL,0,0,0
+60,Unique Qualifier,NULL,0,0,0
+61,Index Defer,NULL,0,0,0
+62,Object ID,NULL,0,0,0
+63,Collate,NULL,0,0,0
+64,Column Label,NULL,0,0,0
+65,Column Text,NULL,0,0,0
+66,System Name,NULL,0,0,0
+67,Hide Attribute,NULL,0,0,0
+68,Show Object Owner,NULL,0,0,0
+69,HiRDB Table Storage,NULL,0,0,0
+70,HiRDB Lob Storage,NULL,0,0,0
+71,Oracle 9i char used,NULL,0,0,0
+72,Oracle 9i timezone,NULL,0,0,0
+73,Oracle 9i interval,NULL,0,0,0
+74,DDLWizard_Settings,NULL,0,0,0
+75,Pad Index,NULL,0,0,0
+76,Sort In TempDb,NULL,0,0,0
+77,MSSQL IsComputed string,NULL,0,0,0
+78,Sybase Locking Scheme,NULL,0,0,0
+79,Sybase Reserve Page Gap,NULL,0,0,0
+80,Sybase Replacement Strategy,NULL,0,0,0
+81,Sybase Prefetch Strategy,NULL,0,0,0
+82,Sybase Identity Gap,NULL,0,0,0
+83,Teradata Journal Before,NULL,0,0,0
+84,Teradata Journal After,NULL,0,0,0
+85,Teradata Journal Name,NULL,0,0,0
+86,Teradata Fallback Protection,NULL,0,0,0
+87,Oracle Index Column Function,NULL,0,0,0
+88,Oracle Partition Type,NULL,0,0,0
+89,Teradata Datablock Size,NULL,0,0,0
+90,Teradata Compression,NULL,0,0,0
+91,Teradata Format,NULL,0,0,0
+92,Teradata Title,NULL,0,0,0
+93,Oracle Object Type,NULL,0,0,0
+94,Teradata Duplicate Row Control,NULL,0,0,0
+95,Cycle,NULL,0,0,0
+96,Minvalue,NULL,0,0,0
+97,Maxvalue,NULL,0,0,0
+98,Index Owner,NULL,0,0,0
+99,Include,NULL,0,0,0
+100,Reverse Scans,NULL,0,0,0
+101,PK Constraint Name,NULL,0,0,0
+102,MySQL Table Type,NULL,0,0,0
+103,LOB Unit,NULL,0,0,0
+104,Subparition Column Name,NULL,0,0,0
+105,Default Hash Subpartition Count,NULL,0,0,0
+106,Default Hash Subpartition Tablespaces,NULL,0,0,0
+107,Subpartition Template,NULL,0,0,0
+108,Parition Hash Subpartition Count,NULL,0,0,0
+109,Parition Hash Subpartition Tablespaces,NULL,0,0,0
+110,Generate Physical Model Table Suffix,NULL,0,0,0
+111,Generate Physical Model View Prefix,NULL,0,0,0
+112,Generate Physical Model View Suffix,NULL,0,0,0
+113,Generate Physical Model Table Owner,NULL,0,0,0
+114,Generate Physical Model View Owner,NULL,0,0,0
+115,Generate Physical Model Index Owner,NULL,0,0,0
+116,Gennerate Physical Wizard Settings,NULL,0,0,0
+117,Report Wizard Settings,NULL,0,0,0
+118,Compare Merge Wizard Settings,NULL,0,0,0
+119,LOB Segment,NULL,0,0,0
+120,Unsigned,NULL,0,0,0
+121,Sort View Columns Alphabetically,NULL,0,0,0
+122,Oracle Temporary Table,NULL,0,0,0
+123,Oracle Temporary Table Type,NULL,0,0,0
+124,Teradata Index Partitioning Expression,NULL,0,0,0
+125,Model Property Tech Key Conversion,NULL,0,0,0
+126,DB Name,NULL,0,0,0
+127,DB User ID,NULL,0,0,0
+128,DB User Password,NULL,0,0,0
+129,DB Owner Name,NULL,0,0,0
+130,DB Server Name,NULL,0,0,0
+131,DB Connection String,NULL,0,0,0
+132,Table Connection Info ID,NULL,0,0,0
+133,Connection Info Count,NULL,0,0,0
+134,FFTable file name,NULL,0,0,0
+135,FFTable Encode Type,NULL,0,0,0
+136,FFTable File Format Type,NULL,0,0,0
+137,FFTable Is Single Delimited,NULL,0,0,0
+138,FFTable Escape charactor,NULL,0,0,0
+139,FFTable Column Delimiter,NULL,0,0,0
+140,FFTable Null Value,NULL,0,0,0
+141,FFTable Is Using Null Value,NULL,0,0,0
+142,FFTable Text Delimiter Type,NULL,0,0,0
+143,FFTable Row Delimiter Type,NULL,0,0,0
+144,FFTable Is First Row Column Name,NULL,0,0,0
+145,FFColumn ID,NULL,0,0,0
+146,FFColumn Is Nullable,NULL,0,0,0
+147,FFColumn Is Skip Import,NULL,0,0,0
+148,FFColumn Is Using Default Value,NULL,0,0,0
+149,FFColumn Is Using Null Replace,NULL,0,0,0
+150,FFColumn Null Value,NULL,0,0,0
+151,FFColumn Null Replace String,NULL,0,0,0
+152,FFTable Domain Name,NULL,0,0,0
+153,FFTable Machine Name,NULL,0,0,0
+154,FFTable Edited,NULL,0,0,0
+155,FFTable TruncateData,NULL,0,0,0
+156,Oracle service name,NULL,0,0,0
+157,DBMS Port Number,NULL,0,0,0
+158,FFColumn DateFormat,NULL,0,0,0
+159,JMSTable Source Name,NULL,0,0,0
+160,JMSTable Destination name,NULL,0,0,0
+161,JMSTable Destination Type,NULL,0,0,0
+162,JMSTable Selector,NULL,0,0,0
+163,JMSTable Timeout,NULL,0,0,0
+164,JMSTable Msg Ack Mode,NULL,0,0,0
+165,JMSTable Target Destination name,NULL,0,0,0
+166,JMSTable Target Destination Type,NULL,0,0,0
+167,JMSTable Target Priority,NULL,0,0,0
+168,JMSTable Target Expiretime,NULL,0,0,0
+169,JMSTable Target Persistence,NULL,0,0,0
+170,JMSTable Target Generate ID,NULL,0,0,0
+171,JMSTable Target Generate Timestamp,NULL,0,0,0
+172,JMSColumn Msg Field Name,NULL,0,0,0
+173,JMSColumn Msg Field Type,NULL,0,0,0
+174,Table Type,NULL,0,0,0
+175,JMSColumn Column Format,NULL,0,0,0
+176,JMSTable Msg Type,NULL,0,0,0
+177,JMSTable Target Msg Type,NULL,0,0,0
+178,JMSTable Target Source name,NULL,0,0,0
+179,JMSTable XMLFORMAT,NULL,0,0,0
+180,JMSTable XML WITHDTD,NULL,0,0,0
+181,Attach Local File,NULL,0,0,0
+182,XML Column Recursive,NULL,0,0,0
+183,SAP BAPI Name,NULL,0,0,0
+184,SAP User Name,NULL,0,0,0
+185,SAP Password,NULL,0,0,0
+186,SAP Server,NULL,0,0,0
+187,SAP Sysname,NULL,0,0,0
+188,SAP Client,NULL,0,0,0
+189,SAP Language,NULL,0,0,0
+190,SAP RecordBase,NULL,0,0,0
+191,SAP XML Schema,NULL,0,0,0
+192,SAP Request Schema,NULL,0,0,0
+193,SAP Response Schema,NULL,0,0,0
+194,SAP Conditions,NULL,0,0,0
+195,SAP Catalog Name List,NULL,0,0,0
+196,SAP Category Name List,NULL,0,0,0
+197,SAP Category Name,NULL,0,0,0
+198,XML Schema Type,NULL,0,0,0
+199,Datasource Alias,NULL,0,0,0
+200,FFTable Header Format,NULL,0,0,0
+201,Src Tgt Type,NULL,0,0,0
+202,Src Tgt Description,NULL,0,0,0
+203,Src Tgt Host,NULL,0,0,0
+204,Src Tgt Service,NULL,0,0,0
+205,Src Tgt Port,NULL,0,0,0
+206,Src Tgt File Path,NULL,0,0,0
+207,Src Tgt File Type,NULL,0,0,0
+208,Src Tgt File Encoding,NULL,0,0,0
+209,Src Tgt DS Frequency,NULL,0,0,0
+210,Src Tgt DS LastUpdated,NULL,0,0,0
+211,Src Tgt Enabled,NULL,0,0,0
+212,Ora Password Expire,NULL,0,0,0
+213,Ora Password Lock,NULL,0,0,0
+214,Ora User-Role Identify,NULL,0,0,0
+215,Ora User Def Tbs,NULL,0,0,0
+216,Ora User Temp Tbs,NULL,0,0,0
+217,Ora User Profile,NULL,0,0,0
+218,Ora User Quota Clause,NULL,0,0,0
+219,Column Source Direct Translation Logic,NULL,0,0,0
+220,Column Source Direct Translation Description,NULL,0,0,0
+221,Column Source Secondary Translation Logic,NULL,0,0,0
+222,Column Source Secondary Translation Description,NULL,0,0,0
+223,Column Target Direct Translation Logic,NULL,0,0,0
+224,Column Target Direct Translation Description,NULL,0,0,0
+225,Column Target Secondary Translation Logic,NULL,0,0,0
+226,Column Target Secondary Translation Description,NULL,0,0,0
+227,Submodel Synchronization Utility Settings,NULL,0,0,0
+228,Sybase Table Partition Number,NULL,0,0,0
+229,Oracle Hash Partition Count,NULL,0,0,0
+230,Oracle Hash Partition Tablespace,NULL,0,0,0
+231,SQL Server Text Image File Group,NULL,0,0,0
+232,Sybase Col Encryption Key,NULL,0,0,0
+233,Oracle Col Encryption Algorithm,NULL,0,0,0
+234,Oracle Col Encryption With SALT,NULL,0,0,0
+235,DB2 OS/390 Volatile Table,NULL,0,0,0
+236,Sybase Col Encrypted,NULL,0,0,0
+237,EntityEditor DDL Options,NULL,0,0,0
+238,DB2 OS/390 Table Partition Inclusive,NULL,0,0,0
+239,Model Validation Utility Settings,NULL,0,0,0
+240,SQL Server 2005 Collection Name,NULL,0,0,0
+241,AS400 Table System Name,NULL,0,0,0
+242,AS400 Table Label,NULL,0,0,0
+243,MSSQL Is Persisted,NULL,0,0,0
+244,XML Schema Generation Wizard Settings,NULL,0,0,0
+245,DT Mapping XML,NULL,0,0,0
+246,Naming Standards Utility Settings,NULL,0,0,0
+247,DT Mapping Name,NULL,0,0,0
+248,Teradata LOB Char Set,NULL,0,0,0
+249,DB2 UDB Partition Inclusive,NULL,0,0,0
+250,DB2 UDB Partition Column Literal,NULL,0,0,0
+251,DB2 UDB Partition Duration,NULL,0,0,0
+252,DB2 UDB Partition Duration Label,NULL,0,0,0
+253,DB2 UDB Partition Tablespace,NULL,0,0,0
+254,DB2 UDB Partition Lob Tablespace,NULL,0,0,0
+255,Column Nulls Order,NULL,0,0,0
+256,Oracle Table Compression,NULL,0,0,0
+257,Oracle Index Compression,NULL,0,0,0
+258,Oracle Index Compression Prefix_Length,NULL,0,0,0
+259,Partition Column Nulls Order,NULL,0,0,0
+260,SQL Server 2008 Col SPARSE,NULL,0,0,0
+261,Sybase IQ Index Type,NULL,0,0,0
+262,Sybase IQ Delimited By,NULL,0,0,0
+263,Sybase ID Limit,NULL,0,0,0
+264,Import New Source Settings,NULL,0,0,0
+265,CASESPECIFIC,NULL,0,0,0
+266,Oracle Table Row Movement,NULL,0,0,0
+
+Property_Type
+Property_Type_ID,Name,Description,IsSystemRequired,Global_User_ID,Row_Time_Stamp
+1,Table,NULL,0,0,0
+2,Index,NULL,0,0,0
+3,Partition,NULL,0,0,0
+4,Overflow Segment,NULL,0,0,0
+5,Database View,NULL,0,0,0
+6,Attribute,NULL,0,0,0
+7,Storage Object,NULL,0,0,0
+8,Model,NULL,0,0,0
+9,Foreign Key,NULL,0,0,0
+10,Database User,NULL,0,0,0
+11,Database Role,NULL,0,0,0
+
+Property_Value
+Property_Value_ID,Name,Description,Value,IsSystemRequired,Global_User_ID,Row_Time_Stamp
+1,Local,NULL,Local,0,0,0
+2,Global,NULL,Global,0,0,0
+3,Normal,NULL,Normal,0,0,0
+4,Bitmap,NULL,Bitmap,0,0,0
+5,Forward,NULL,Forward,0,0,0
+6,Reverse,NULL,Reverse,0,0,0
+7,Logged,NULL,Logged,0,0,0
+8,NotLogged,NULL,NotLogged,0,0,0
+9,NoParallel,NULL,NoParallel,0,0,0
+10,Parallel,NULL,Parallel,0,0,0
+11,Parallel Degree,NULL,Parallel Degree,0,0,0
+12,Parallel Instances,NULL,Parallel Instances,0,0,0
+13,Partition Column,NULL,Partition Column,0,0,0
+14,Column Literal,NULL,Column Literal,0,0,0
+15,Tablespace Name,NULL,Tablespace Name,0,0,0
+16,Pct Free,NULL,Pct Free,0,0,0
+17,Pct Used,NULL,Pct Used,0,0,0
+18,Init Extent,NULL,Init Extent,0,0,0
+19,Next Extent,NULL,Next Extent,0,0,0
+20,Pct Increase,NULL,Pct Increase,0,0,0
+21,Min Extents,NULL,Min Extents,0,0,0
+22,Max Extents,NULL,Max Extents,0,0,0
+23,Heap,NULL,Heap,0,0,0
+24,Cluster,NULL,Cluster,0,0,0
+25,Index-Organized,NULL,Index-Organized,0,0,0
+26,Pct Threshold,NULL,Pct Threshold,0,0,0
+27,Include Column,NULL,Include Column,0,0,0
+28,Initial Trans,NULL,Initial Trans,0,0,0
+29,Max Trans,NULL,Max Trans,0,0,0
+30,FreeLists,NULL,FreeLists,0,0,0
+31,FreeList Groups,NULL,FreeList Groups,0,0,0
+32,DEFAULT,NULL,DEFAULT,0,0,0
+33,KEEP,NULL,KEEP,0,0,0
+34,RECYCLE,NULL,RECYCLE,0,0,0
+35,CACHE,NULL,CACHE,0,0,0
+36,NOCACHE,NULL,NOCACHE,0,0,0
+37,Connect String,NULL,Connect String,0,0,0
+38,Linked Table,NULL,Linked Table,0,0,0
+39,USING HASHING,NULL,USING HASHING,0,0,0
+40,DATA CAPTURE CHANGES,NULL,DATA CAPTURE CHANGES,0,0,0
+41,DATA CAPTURE NONE,NULL,DATA CAPTURE NONE,0,0,0
+42,Index Tablespace,NULL,Index Tablespace,0,0,0
+43,LONG Tablespace,NULL,LONG Tablespace,0,0,0
+44,WITH ENCRYPTION,NULL,WITH ENCRYPTION,0,0,0
+45,WITH CHECK OPTION,NULL,WITH CHECK OPTION,0,0,0
+46,FOR BIT DATA,NULL,FOR BIT DATA,0,0,0
+47,WITH DEFAULT,NULL,WITH DEFAULT,0,0,0
+48,COMPACT,NULL,COMPACT,0,0,0
+49,PRE SQL,NULL,PRE SQL,0,0,0
+50,POST SQL,NULL,POST SQL,0,0,0
+51,DISABLE PRE SQL,NULL,DISABLE PRE SQL,0,0,0
+52,DISABLE POST SQL,NULL,DISABLE POST SQL,0,0,0
+53,ROWGUIDCOL,NULL,ROWGUIDCOL,0,0,0
+54,LOGICAL ONLY,NULL,LOGICAL ONLY,0,0,0
+55,PHYSICAL ONLY,NULL,PHYSICAL ONLY,0,0,0
+56,GBPCACHE ALL,NULL,GBPCACHE ALL,0,0,0
+57,GBPCACHE CHANGE,NULL,GBPCACHE CHANGE,0,0,0
+58,GBPCACHE NONE,NULL,GBPCACHE NONE,0,0,0
+59,ERASE YES,NULL,ERASE YES,0,0,0
+60,CLOSE NO,NULL,CLOSE NO,0,0,0
+61,COPY YES,NULL,COPY YES,0,0,0
+62,Physical Definition,NULL,Physical Definition,0,0,0
+63,GENERATED ALWAYS,NULL,GENERATED ALWAYS,0,0,0
+64,GENERATED BY DEFAULT,NULL,GENERATED BY DEFAULT,0,0,0
+65,IDENTITY CACHE,NULL,IDENTITY CACHE,0,0,0
+66,VCAT,NULL,VCAT,0,0,0
+67,STOGROUP,NULL,STOGROUP,0,0,0
+68,DATABASE,NULL,DATABASE,0,0,0
+69,PCTFREE String Value,NULL,PCTFREE String Value,0,0,0
+70,UNBALANCED SPLIT,NULL,UNBALANCED SPLIT,0,0,0
+71,EMPTY,NULL,EMPTY,0,0,0
+72,FIX,NULL,FIX,0,0,0
+73,Auditing Type,NULL,Auditing Type,0,0,0
+74,Encoding Type,NULL,Encoding Type,0,0,0
+75,WITH RESTRICT ON DROP,NULL,WITH RESTRICT ON DROP,0,0,0
+76,WHERE NOT NULL,NULL,WHERE NOT NULL,0,0,0
+77,Defer Value,NULL,Defer Value,0,0,0
+78,OBID,NULL,OBID,0,0,0
+79,Collate String,NULL,Collate String,0,0,0
+80,Column Label,NULL,Column Label,0,0,0
+81,Column Text,NULL,Column Text,0,0,0
+82,System Name,NULL,System Name,0,0,0
+83,Hidden,NULL,Hidden,0,0,0
+84,Show Object Owner,NULL,Show Object Owner,0,0,0
+85,NOFIX,NULL,NOFIX,0,0,0
+86,"",NULL,"",0,0,0
+87,IN,NULL,IN,0,0,0
+88,PARTITIONED BY,NULL,PARTITIONED BY,0,0,0
+89,CHAR,NULL,CHAR,0,0,0
+90,WITH TIME ZONE,NULL,WITH TIME ZONE,0,0,0
+91,WITH LOCAL TIME ZONE,NULL,WITH LOCAL TIME ZONE,0,0,0
+92,YEAR TO MONTH,NULL,YEAR TO MONTH,0,0,0
+93,DDL Wizard Settings,NULL,DDL Wizard Settings,0,0,0
+94,PAD_INDEX,NULL,PAD_INDEX,0,0,0
+95,SORT_IN_TEMPDB,NULL,SORT_IN_TEMPDB,0,0,0
+96,COMPUTED,NULL,COMPUTED,0,0,0
+97,ALLPAGES,NULL,ALLPAGES,0,0,0
+98,DATAPAGES,NULL,DATAPAGES,0,0,0
+99,DATAROWS,NULL,DATAROWS,0,0,0
+100,Page Gap,NULL,Page Gap,0,0,0
+101,LRU,NULL,LRU,0,0,0
+102,off,NULL,off,0,0,0
+103,Identity Gap,NULL,Identity Gap,0,0,0
+104,NO,NULL,NO,0,0,0
+105,-- --,NULL,-- --,0,0,0
+106,DUAL,NULL,DUAL,0,0,0
+107,LOCAL,NULL,LOCAL,0,0,0
+108,Teradata Journal Name,NULL,Teradata Journal Name,0,0,0
+109,Fallback Protection,NULL,Fallback Protection,0,0,0
+110,Function Value,NULL,Function Value,0,0,0
+111,Partition Type String,NULL,Partition Type String,0,0,0
+112,MINIMUM,NULL,MINIMUM,0,0,0
+113,MAXIMUM,NULL,MAXIMUM,0,0,0
+114,"NULL",NULL,"NULL",0,0,0
+115,Format,NULL,Format,0,0,0
+116,Title,NULL,Title,0,0,0
+117,Object Type,NULL,Object Type,0,0,0
+118,SET,NULL,SET,0,0,0
+119,MULTISET,NULL,MULTISET,0,0,0
+120,NOT LOCAL,NULL,NOT LOCAL,0,0,0
+121,Cycle,NULL,Cycle,0,0,0
+122,Minvalue,NULL,Minvalue,0,0,0
+123,Maxvalue,NULL,Maxvalue,0,0,0
+124,Owner,NULL,Owner,0,0,0
+125,Include,NULL,Include,0,0,0
+126,ALLOW REVERSE SCANS,NULL,ALLOW REVERSE SCANS,0,0,0
+127,PK Name Constraint,NULL,PK Name Constraint,0,0,0
+128,Table Type,NULL,Table Type,0,0,0
+129,K,NULL,K,0,0,0
+130,G,NULL,G,0,0,0
+131,M,NULL,M,0,0,0
+132,Subpartition Column Name,NULL,Subpartition Column Name,0,0,0
+133,Default Hash Subpartition Count,NULL,Default Hash Subpartition Count,0,0,0
+134,Default Hash Subpartition Tablespaces,NULL,Default Hash Subpartition Tablespaces,0,0,0
+135,Subpartition Template,NULL,Subpartition Template,0,0,0
+136,Parition Hash Subpartition Count,NULL,Parition Hash Subpartition Count,0,0,0
+137,Parition Hash Subpartition Count Tablespaces,NULL,Parition Hash Subpartition Count Tablespaces,0,0,0
+138,Table Suffix,NULL,Table Suffix,0,0,0
+139,View Prefix,NULL,View Prefix,0,0,0
+140,View Suffix,NULL,View Suffix,0,0,0
+141,Table Owner,NULL,Table Owner,0,0,0
+142,View Owner,NULL,View Owner,0,0,0
+143,Index Owner,NULL,Index Owner,0,0,0
+144,GPM Wizard Settings,NULL,GPM Wizard Settings,0,0,0
+145,Report Wizard Settings,NULL,Report Wizard Settings,0,0,0
+146,Compare Merge Wizard Settings,NULL,Compare Merge Wizard Settings,0,0,0
+147,LOB Segment,NULL,LOB Segment,0,0,0
+148,Unsigned,NULL,Unsigned,0,0,0
+149,Sort View Columns Alphabetically,NULL,Sort View Columns Alphabetically,0,0,0
+150,Temporary Table Yes,NULL,Temporary Table Yes,0,0,0
+151,Temporary Table No,NULL,Temporary Table No,0,0,0
+152,Transaction Specific,NULL,Transaction Specific,0,0,0
+153,Session Specific,NULL,Session Specific,0,0,0
+154,Conversion Complete,NULL,Conversion Complete,0,0,0
+155,DB NAME,NULL,DB NAME,0,0,0
+156,DB USER ID,NULL,DB USER ID,0,0,0
+157,DB User Password,NULL,DB User Password,0,0,0
+158,DB Owner Name,NULL,DB Owner Name,0,0,0
+159,DB Server Name,NULL,DB Server Name,0,0,0
+160,DB Connection String,NULL,DB Connection String,0,0,0
+161,Table Connection Info ID,NULL,Table Connection Info ID,0,0,0
+162,Connection Info Count,NULL,Connection Info Count,0,0,0
+163,FFTable file name,NULL,FFTable file name,0,0,0
+164,FFTable Encode Type,NULL,FFTable Encode Type,0,0,0
+165,FFTable File Format Type,NULL,FFTable File Format Type,0,0,0
+166,FFTable Is Single Delimited,NULL,FFTable Is Single Delimited,0,0,0
+167,FFTable Escape charactor,NULL,FFTable Escape charactor,0,0,0
+168,FFTable Column Delimiter,NULL,FFTable Column Delimiter,0,0,0
+169,FFTable Null Value,NULL,FFTable Null Value,0,0,0
+170,FFTable Is Using Null Value,NULL,FFTable Is Using Null Value,0,0,0
+171,FFTable Text Delimiter Type,NULL,FFTable Text Delimiter Type,0,0,0
+172,FFTable Row Delimiter Type,NULL,FFTable Row Delimiter Type,0,0,0
+173,FFTable Is First Row Column Name,NULL,FFTable Is First Row Column Name,0,0,0
+174,FFColumn ID,NULL,FFColumn ID,0,0,0
+175,FFColumn Is Nullable,NULL,FFColumn Is Nullable,0,0,0
+176,FFColumn Is Skip Import,NULL,FFColumn Is Skip Import,0,0,0
+177,FFColumn Is Using Default Value,NULL,FFColumn Is Using Default Value,0,0,0
+178,FFColumn Is Using Null Replace,NULL,FFColumn Is Using Null Replace,0,0,0
+179,FFColumn Null Value,NULL,FFColumn Null Value,0,0,0
+180,FFColumn Null Replace String,NULL,FFColumn Null Replace String,0,0,0
+181,FFTable Domain Name,NULL,FFTable Domain Name,0,0,0
+182,FFTable Machine Name,NULL,FFTable Machine Name,0,0,0
+183,FFTable Edited,NULL,FFTable Edited,0,0,0
+184,FFTable TruncateData,NULL,FFTable TruncateData,0,0,0
+185,Oracle service name,NULL,Oracle service name,0,0,0
+186,DBMS Port Number,NULL,DBMS Port Number,0,0,0
+187,FFColumn DateFormat,NULL,FFColumn DateFormat,0,0,0
+188,JMSTable Source Name,NULL,JMSTable Source Name,0,0,0
+189,JMSTable Destination name,NULL,JMSTable Destination name,0,0,0
+190,JMSTable Destination Type,NULL,JMSTable Destination Type,0,0,0
+191,JMSTable Selector,NULL,JMSTable Selector,0,0,0
+192,JMSTable Timeout,NULL,JMSTable Timeout,0,0,0
+193,JMSTable Msg Ack Mode,NULL,JMSTable Msg Ack Mode,0,0,0
+194,JMSTable Target Destination name,NULL,JMSTable Target Destination name,0,0,0
+195,JMSTable Target Destination Type,NULL,JMSTable Target Destination Type,0,0,0
+196,JMSTable Target Priority,NULL,JMSTable Target Priority,0,0,0
+197,JMSTable Target Expiretime,NULL,JMSTable Target Expiretime,0,0,0
+198,JMSTable Target Persistence,NULL,JMSTable Target Persistence,0,0,0
+199,JMSTable Target Generate ID,NULL,JMSTable Target Generate ID,0,0,0
+200,JMSTable Target Generate Timestamp,NULL,JMSTable Target Generate Timestamp,0,0,0
+201,JMSColumn Msg Field Name,NULL,JMSColumn Msg Field Name,0,0,0
+202,JMSColumn Msg Field Type,NULL,JMSColumn Msg Field Type,0,0,0
+203,JMSColumn Column Format,NULL,JMSColumn Column Format,0,0,0
+204,JMSTable Msg Type,NULL,JMSTable Msg Type,0,0,0
+205,JMSTable Target Msg Type,NULL,JMSTable Target Msg Type,0,0,0
+206,JMSTable Target Source name,NULL,JMSTable Target Source name,0,0,0
+207,JMSTable XMLFORMAT,NULL,JMSTable XMLFORMAT,0,0,0
+208,JMSTable XML WITHDTD,NULL,JMSTable XML WITHDTD,0,0,0
+209,Attach Local File,NULL,Attach Local File,0,0,0
+210,XML Column Recursive,NULL,XML Column Recursive,0,0,0
+211,SAP BAPI Name,NULL,SAP BAPI Name,0,0,0
+212,SAP User Name,NULL,SAP User Name,0,0,0
+213,SAP Password,NULL,SAP Password,0,0,0
+214,SAP Server,NULL,SAP Server,0,0,0
+215,SAP Sysname,NULL,SAP Sysname,0,0,0
+216,SAP Client,NULL,SAP Client,0,0,0
+217,SAP Language,NULL,SAP Language,0,0,0
+218,SAP RecordBase,NULL,SAP RecordBase,0,0,0
+219,SAP XML Schema,NULL,SAP XML Schema,0,0,0
+220,SAP Request Schema,NULL,SAP Request Schema,0,0,0
+221,SAP Response Schema,NULL,SAP Response Schema,0,0,0
+222,SAP Conditions,NULL,SAP Conditions,0,0,0
+223,SAP Catalog Name List,NULL,SAP Catalog Name List,0,0,0
+224,SAP Category Name List,NULL,SAP Category Name List,0,0,0
+225,SAP Category Name,NULL,SAP Category Name,0,0,0
+226,XML Schema Type,NULL,XML Schema Type,0,0,0
+227,Datasource Alias,NULL,Datasource Alias,0,0,0
+228,FFTable Header Format,NULL,FFTable Header Format,0,0,0
+229,Src Tgt Type,NULL,Src Tgt Type,0,0,0
+230,Src Tgt Description,NULL,Src Tgt Description,0,0,0
+231,Src Tgt Host,NULL,Src Tgt Host,0,0,0
+232,Src Tgt Service,NULL,Src Tgt Service,0,0,0
+233,Src Tgt Port,NULL,Src Tgt Port,0,0,0
+234,Src Tgt File Path,NULL,Src Tgt File Path,0,0,0
+235,Src Tgt File Type,NULL,Src Tgt File Type,0,0,0
+236,Src Tgt File Encoding,NULL,Src Tgt File Encoding,0,0,0
+237,Src Tgt DS Frequency,NULL,Src Tgt DS Frequency,0,0,0
+238,Src Tgt DS LastUpdated,NULL,Src Tgt DS LastUpdated,0,0,0
+239,Src Tgt Enabled,NULL,Src Tgt Enabled,0,0,0
+240,Ora Password Expire,NULL,Ora Password Expire,0,0,0
+241,Ora Password Lock,NULL,Ora Password Lock,0,0,0
+242,Ora User-Role Identify,NULL,Ora User-Role Identify,0,0,0
+243,Ora User Def Tbs,NULL,Ora User Def Tbs,0,0,0
+244,Ora User Temp Tbs,NULL,Ora User Temp Tbs,0,0,0
+245,Ora User Profile,NULL,Ora User Profile,0,0,0
+246,Ora User Quota Clause,NULL,Ora User Quota Clause,0,0,0
+247,Column Source Direct Translation Logic,NULL,Column Source Direct Translation Logic,0,0,0
+248,Column Source Direct Translation Description,NULL,Column Source Direct Translation Description,0,0,0
+249,Column Source Secondary Translation Logic,NULL,Column Source Secondary Translation Logic,0,0,0
+250,Column Source Secondary Translation Description,NULL,Column Source Secondary Translation Description,0,0,0
+251,Column Target Direct Translation Logic,NULL,Column Target Direct Translation Logic,0,0,0
+252,Column Target Direct Translation Description,NULL,Column Target Direct Translation Description,0,0,0
+253,Column Target Secondary Translation Logic,NULL,Column Target Secondary Translation Logic,0,0,0
+254,Column Target Secondary Translation Description,NULL,Column Target Secondary Translation Description,0,0,0
+255,Submodel Synchronization Utility Settings,NULL,Submodel Synchronization Utility Settings,0,0,0
+256,Sybase Table Partition Number,NULL,Sybase Table Partition Number,0,0,0
+257,Oracle Hash Partition Count,NULL,Oracle Hash Partition Count,0,0,0
+258,Oracle Hash Partition Tablespace,NULL,Oracle Hash Partition Tablespace,0,0,0
+259,SQL Server Text Image File Group,NULL,SQL Server Text Image File Group,0,0,0
+260,Sybase Col Encryption Key,NULL,Sybase Col Encryption Key,0,0,0
+261,Oracle Col Encryption Algorithm,NULL,Oracle Col Encryption Algorithm,0,0,0
+262,Oracle Col Encryption With SALT,NULL,Oracle Col Encryption With SALT,0,0,0
+263,VOLATILE,NULL,VOLATILE,0,0,0
+264,Sybase Col Encrypted,NULL,Sybase Col Encrypted,0,0,0
+265,EntityEditor DDL Options,NULL,EntityEditor DDL Options,0,0,0
+266,INCLUSIVE,NULL,INCLUSIVE,0,0,0
+267,Model Validation Utility Settings,NULL,Model Validation Utility Settings,0,0,0
+268,SQL Server 2005 Collection Name,NULL,SQL Server 2005 Collection Name,0,0,0
+269,AS400 Table System Name,NULL,AS400 Table System Name,0,0,0
+270,AS400 Table Label,NULL,AS400 Table Label,0,0,0
+271,MSSQL Is Persisted,NULL,MSSQL Is Persisted,0,0,0
+272,XML Schema Generation Wizard Settings,NULL,XML Schema Generation Wizard Settings,0,0,0
+273,DT Mapping XML,NULL,DT Mapping XML,0,0,0
+274,Naming Standards Utility Settings,NULL,Naming Standards Utility Settings,0,0,0
+275,DT Mapping Name,NULL,DT Mapping Name,0,0,0
+276,DB2 UDB Partition Column Literal,NULL,DB2 UDB Partition Column Literal,0,0,0
+277,DB2 UDB Partition Duration,NULL,DB2 UDB Partition Duration,0,0,0
+278,DB2 UDB Partition Duration Label,NULL,DB2 UDB Partition Duration Label,0,0,0
+279,DB2 UDB Partition Tablesapce,NULL,DB2 UDB Partition Tablesapce,0,0,0
+280,DB2 UDB Partition Lob Tablespace,NULL,DB2 UDB Partition Lob Tablespace,0,0,0
+281,NULLS FIRST,NULL,NULLS FIRST,0,0,0
+282,NULLS LAST,NULL,NULLS LAST,0,0,0
+283,Table Compression Yes,NULL,Table Compression Yes,0,0,0
+284,Table Compression No,NULL,Table Compression No,0,0,0
+285,Index Compression Yes,NULL,Index Compression Yes,0,0,0
+286,Index Compression No,NULL,Index Compression No,0,0,0
+287,Index Compression Prefix Length,NULL,Index Compression Prefix Length,0,0,0
+288,SQL Server 2008 Col SPARSE,NULL,SQL Server 2008 Col SPARSE,0,0,0
+289,HG,NULL,HG,0,0,0
+290,LF,NULL,LF,0,0,0
+291,HNG,NULL,HNG,0,0,0
+292,CMP,NULL,CMP,0,0,0
+293,DATE,NULL,DATE,0,0,0
+294,TIME,NULL,TIME,0,0,0
+295,DTTM,NULL,DTTM,0,0,0
+296,WD,NULL,WD,0,0,0
+297,Sybase IQ Delimited By,NULL,Sybase IQ Delimited By,0,0,0
+298,Sybase IQ Limit,NULL,Sybase IQ Limit,0,0,0
+299,Import New Source Settings,NULL,Import New Source Settings,0,0,0
+300,CASESPECIFIC,NULL,CASESPECIFIC,0,0,0
+301,Table Row Movement Yes,NULL,Table Row Movement Yes,0,0,0
+302,Table Row Movement No,NULL,Table Row Movement No,0,0,0
+
+Valid_MetaClass
+Valid_MetaClass_ID,MetaClass_ID,MetaTable_ID,Global_User_ID,Row_Time_Stamp
+1,1,1,0,0
+2,1,2,0,0
+3,2,1,0,0
+4,2,2,0,0
+5,1,3,0,0
+6,1,9,0,0
+7,1,10,0,0
+8,1,11,0,0
+9,1,4,0,0
+10,3,10,0,0
+11,1,52,0,0
+12,1,53,0,0
+
+Valid_Property
+Valid_Property_ID,Property_Type_ID,Property_ID,Label,IsMandatory,Global_User_ID,Row_Time_Stamp
+1,2,1,NULL,0,0,0
+2,2,2,NULL,0,0,0
+3,2,3,NULL,0,0,0
+4,2,4,NULL,0,0,0
+5,2,5,NULL,0,0,0
+6,2,6,NULL,0,0,0
+7,2,7,NULL,0,0,0
+8,2,8,NULL,0,0,0
+9,1,4,NULL,0,0,0
+10,1,5,NULL,0,0,0
+11,1,6,NULL,0,0,0
+12,1,7,NULL,0,0,0
+13,1,8,NULL,0,0,0
+14,1,18,NULL,0,0,0
+15,1,19,NULL,0,0,0
+16,1,20,NULL,0,0,0
+17,3,4,NULL,0,0,0
+18,3,9,NULL,0,0,0
+19,3,10,NULL,0,0,0
+20,3,11,NULL,0,0,0
+21,3,12,NULL,0,0,0
+22,3,13,NULL,0,0,0
+23,3,14,NULL,0,0,0
+24,3,15,NULL,0,0,0
+25,3,16,NULL,0,0,0
+26,3,17,NULL,0,0,0
+27,1,23,NULL,0,0,0
+28,1,24,NULL,0,0,0
+29,1,25,NULL,0,0,0
+30,1,26,NULL,0,0,0
+31,3,21,NULL,0,0,0
+32,3,22,NULL,0,0,0
+33,3,23,NULL,0,0,0
+34,3,24,NULL,0,0,0
+35,3,25,NULL,0,0,0
+36,2,23,NULL,0,0,0
+37,2,24,NULL,0,0,0
+38,2,25,NULL,0,0,0
+39,4,10,NULL,0,0,0
+40,4,11,NULL,0,0,0
+41,4,12,NULL,0,0,0
+42,4,13,NULL,0,0,0
+43,4,14,NULL,0,0,0
+44,4,15,NULL,0,0,0
+45,4,16,NULL,0,0,0
+46,4,17,NULL,0,0,0
+47,4,21,NULL,0,0,0
+48,4,22,NULL,0,0,0
+49,4,23,NULL,0,0,0
+50,4,24,NULL,0,0,0
+51,4,25,NULL,0,0,0
+52,4,4,NULL,0,0,0
+53,1,27,NULL,0,0,0
+54,1,28,NULL,0,0,0
+55,1,29,NULL,0,0,0
+56,1,30,NULL,0,0,0
+57,1,31,NULL,0,0,0
+58,1,32,NULL,0,0,0
+59,5,33,NULL,0,0,0
+60,5,34,NULL,0,0,0
+61,6,35,NULL,0,0,0
+62,6,36,NULL,0,0,0
+63,6,37,NULL,0,0,0
+64,6,4,NULL,0,0,0
+65,1,38,NULL,0,0,0
+66,1,39,NULL,0,0,0
+67,5,38,NULL,0,0,0
+68,5,39,NULL,0,0,0
+69,1,40,NULL,0,0,0
+70,1,41,NULL,0,0,0
+71,5,40,NULL,0,0,0
+72,5,41,NULL,0,0,0
+73,6,42,NULL,0,0,0
+74,1,43,NULL,0,0,0
+75,6,43,NULL,0,0,0
+76,2,44,NULL,0,0,0
+77,2,45,NULL,0,0,0
+78,2,46,NULL,0,0,0
+79,2,47,NULL,0,0,0
+80,6,48,NULL,0,0,0
+81,1,48,NULL,0,0,0
+82,6,49,NULL,0,0,0
+83,6,50,NULL,0,0,0
+84,3,51,NULL,0,0,0
+85,3,44,NULL,0,0,0
+86,1,52,NULL,0,0,0
+87,1,53,NULL,0,0,0
+88,2,54,NULL,0,0,0
+89,2,55,NULL,0,0,0
+90,1,56,NULL,0,0,0
+91,1,57,NULL,0,0,0
+92,1,58,NULL,0,0,0
+93,1,59,NULL,0,0,0
+94,2,60,NULL,0,0,0
+95,2,61,NULL,0,0,0
+96,8,38,NULL,0,0,0
+97,8,39,NULL,0,0,0
+98,8,40,NULL,0,0,0
+99,8,41,NULL,0,0,0
+100,1,62,NULL,0,0,0
+101,6,63,NULL,0,0,0
+102,6,64,NULL,0,0,0
+103,6,65,NULL,0,0,0
+104,6,66,NULL,0,0,0
+105,6,67,NULL,0,0,0
+106,8,68,NULL,0,0,0
+107,1,69,NULL,0,0,0
+108,6,70,NULL,0,0,0
+109,6,71,NULL,0,0,0
+110,6,72,NULL,0,0,0
+111,6,73,NULL,0,0,0
+112,8,74,NULL,0,0,0
+113,2,75,NULL,0,0,0
+114,2,76,NULL,0,0,0
+115,6,77,NULL,0,0,0
+116,1,78,NULL,0,0,0
+117,1,79,NULL,0,0,0
+118,1,80,NULL,0,0,0
+119,1,81,NULL,0,0,0
+120,1,82,NULL,0,0,0
+121,1,83,NULL,0,0,0
+122,1,84,NULL,0,0,0
+123,1,85,NULL,0,0,0
+124,1,86,NULL,0,0,0
+125,2,87,NULL,0,0,0
+126,1,88,NULL,0,0,0
+127,1,89,NULL,0,0,0
+128,6,90,NULL,0,0,0
+129,6,91,NULL,0,0,0
+130,6,92,NULL,0,0,0
+131,6,93,NULL,0,0,0
+132,1,94,NULL,0,0,0
+133,6,95,NULL,0,0,0
+134,6,96,NULL,0,0,0
+135,6,97,NULL,0,0,0
+136,2,98,NULL,0,0,0
+137,2,99,NULL,0,0,0
+138,2,100,NULL,0,0,0
+139,1,101,NULL,0,0,0
+140,1,102,NULL,0,0,0
+141,6,103,NULL,0,0,0
+142,1,104,NULL,0,0,0
+143,1,105,NULL,0,0,0
+144,1,106,NULL,0,0,0
+145,1,107,NULL,0,0,0
+146,3,107,NULL,0,0,0
+147,3,108,NULL,0,0,0
+148,3,109,NULL,0,0,0
+149,8,110,NULL,0,0,0
+150,8,111,NULL,0,0,0
+151,8,112,NULL,0,0,0
+152,8,113,NULL,0,0,0
+153,8,114,NULL,0,0,0
+154,8,115,NULL,0,0,0
+155,8,116,NULL,0,0,0
+156,8,117,NULL,0,0,0
+157,8,118,NULL,0,0,0
+158,7,38,NULL,0,0,0
+159,7,39,NULL,0,0,0
+160,7,40,NULL,0,0,0
+161,7,41,NULL,0,0,0
+162,6,119,NULL,0,0,0
+163,6,120,NULL,0,0,0
+164,5,121,NULL,0,0,0
+165,1,122,NULL,0,0,0
+166,1,123,NULL,0,0,0
+167,2,124,NULL,0,0,0
+168,8,125,NULL,0,0,0
+169,8,126,NULL,0,0,0
+170,8,127,NULL,0,0,0
+171,8,128,NULL,0,0,0
+172,8,129,NULL,0,0,0
+173,8,130,NULL,0,0,0
+174,8,131,NULL,0,0,0
+175,1,132,NULL,0,0,0
+176,8,133,NULL,0,0,0
+177,1,134,NULL,0,0,0
+178,1,135,NULL,0,0,0
+179,1,136,NULL,0,0,0
+180,1,137,NULL,0,0,0
+181,1,138,NULL,0,0,0
+182,1,139,NULL,0,0,0
+183,1,140,NULL,0,0,0
+184,1,141,NULL,0,0,0
+185,1,142,NULL,0,0,0
+186,1,143,NULL,0,0,0
+187,1,144,NULL,0,0,0
+188,6,145,NULL,0,0,0
+189,6,146,NULL,0,0,0
+190,6,147,NULL,0,0,0
+191,6,148,NULL,0,0,0
+192,6,149,NULL,0,0,0
+193,6,150,NULL,0,0,0
+194,6,151,NULL,0,0,0
+195,1,152,NULL,0,0,0
+196,1,153,NULL,0,0,0
+197,1,154,NULL,0,0,0
+198,1,155,NULL,0,0,0
+199,8,156,NULL,0,0,0
+200,8,157,NULL,0,0,0
+201,6,158,NULL,0,0,0
+202,1,159,NULL,0,0,0
+203,1,160,NULL,0,0,0
+204,1,161,NULL,0,0,0
+205,1,162,NULL,0,0,0
+206,1,163,NULL,0,0,0
+207,1,164,NULL,0,0,0
+208,1,165,NULL,0,0,0
+209,1,166,NULL,0,0,0
+210,1,167,NULL,0,0,0
+211,1,168,NULL,0,0,0
+212,1,169,NULL,0,0,0
+213,1,170,NULL,0,0,0
+214,1,171,NULL,0,0,0
+215,6,172,NULL,0,0,0
+216,6,173,NULL,0,0,0
+217,1,174,NULL,0,0,0
+218,6,175,NULL,0,0,0
+219,1,176,NULL,0,0,0
+220,1,177,NULL,0,0,0
+221,1,178,NULL,0,0,0
+222,1,179,NULL,0,0,0
+223,1,180,NULL,0,0,0
+224,1,181,NULL,0,0,0
+225,6,182,NULL,0,0,0
+226,1,183,NULL,0,0,0
+227,1,184,NULL,0,0,0
+228,1,185,NULL,0,0,0
+229,1,186,NULL,0,0,0
+230,1,187,NULL,0,0,0
+231,1,188,NULL,0,0,0
+232,1,189,NULL,0,0,0
+233,1,190,NULL,0,0,0
+234,1,191,NULL,0,0,0
+235,1,192,NULL,0,0,0
+236,1,193,NULL,0,0,0
+237,1,194,NULL,0,0,0
+238,1,195,NULL,0,0,0
+239,1,196,NULL,0,0,0
+240,1,197,NULL,0,0,0
+241,1,198,NULL,0,0,0
+242,8,199,NULL,0,0,0
+243,1,200,NULL,0,0,0
+244,8,201,NULL,0,0,0
+245,8,202,NULL,0,0,0
+246,8,203,NULL,0,0,0
+247,8,204,NULL,0,0,0
+248,8,205,NULL,0,0,0
+249,8,206,NULL,0,0,0
+250,8,207,NULL,0,0,0
+251,8,208,NULL,0,0,0
+252,1,209,NULL,0,0,0
+253,1,210,NULL,0,0,0
+254,8,211,NULL,0,0,0
+255,10,212,NULL,0,0,0
+256,10,213,NULL,0,0,0
+257,10,214,NULL,0,0,0
+258,10,215,NULL,0,0,0
+259,10,216,NULL,0,0,0
+260,10,217,NULL,0,0,0
+261,10,218,NULL,0,0,0
+262,11,214,NULL,0,0,0
+263,6,219,NULL,0,0,0
+264,6,220,NULL,0,0,0
+265,6,221,NULL,0,0,0
+266,6,222,NULL,0,0,0
+267,6,223,NULL,0,0,0
+268,6,224,NULL,0,0,0
+269,6,225,NULL,0,0,0
+270,6,226,NULL,0,0,0
+271,8,227,NULL,0,0,0
+272,1,228,NULL,0,0,0
+273,1,229,NULL,0,0,0
+274,1,230,NULL,0,0,0
+275,1,231,NULL,0,0,0
+276,6,232,NULL,0,0,0
+277,6,233,NULL,0,0,0
+278,6,234,NULL,0,0,0
+279,1,235,NULL,0,0,0
+280,6,236,NULL,0,0,0
+281,8,237,NULL,0,0,0
+282,3,238,NULL,0,0,0
+283,2,101,NULL,0,0,0
+284,8,239,NULL,0,0,0
+285,6,240,NULL,0,0,0
+286,1,241,NULL,0,0,0
+287,1,242,NULL,0,0,0
+288,9,43,NULL,0,0,0
+289,6,243,NULL,0,0,0
+290,2,88,NULL,0,0,0
+291,2,229,NULL,0,0,0
+292,2,230,NULL,0,0,0
+293,8,244,NULL,0,0,0
+294,8,245,NULL,0,0,0
+295,8,246,NULL,0,0,0
+296,8,247,NULL,0,0,0
+297,6,248,NULL,0,0,0
+298,3,249,NULL,0,0,0
+299,3,250,NULL,0,0,0
+300,3,251,NULL,0,0,0
+301,3,252,NULL,0,0,0
+302,3,253,NULL,0,0,0
+303,3,254,NULL,0,0,0
+304,3,255,NULL,0,0,0
+305,1,256,NULL,0,0,0
+306,2,257,NULL,0,0,0
+307,2,258,NULL,0,0,0
+308,1,259,NULL,0,0,0
+309,6,260,NULL,0,0,0
+310,2,261,NULL,0,0,0
+311,2,262,NULL,0,0,0
+312,2,263,NULL,0,0,0
+313,8,264,NULL,0,0,0
+314,6,265,NULL,0,0,0
+315,1,266,NULL,0,0,0
+
+Valid_Property_Value
+Valid_Property_Value_ID,Property_Value_ID,Valid_Property_ID,Label,IsDefault,Global_User_ID,Row_Time_Stamp
+1,1,1,NULL,0,0,0
+2,2,1,NULL,0,0,0
+3,3,2,NULL,0,0,0
+4,4,2,NULL,0,0,0
+5,5,3,NULL,0,0,0
+6,6,3,NULL,0,0,0
+7,7,4,NULL,0,0,0
+8,8,4,NULL,0,0,0
+9,9,5,NULL,0,0,0
+10,10,5,NULL,0,0,0
+11,11,6,NULL,0,0,0
+12,12,7,NULL,0,0,0
+13,13,8,NULL,0,0,0
+14,7,9,NULL,0,0,0
+15,8,9,NULL,0,0,0
+16,9,10,NULL,0,0,0
+17,10,10,NULL,0,0,0
+18,11,11,NULL,0,0,0
+19,12,12,NULL,0,0,0
+20,13,13,NULL,0,0,0
+21,23,14,NULL,0,0,0
+22,24,14,NULL,0,0,0
+23,25,14,NULL,0,0,0
+24,26,15,NULL,0,0,0
+25,27,16,NULL,0,0,0
+26,7,17,NULL,0,0,0
+27,8,17,NULL,0,0,0
+28,14,18,NULL,0,0,0
+29,15,19,NULL,0,0,0
+30,16,20,NULL,0,0,0
+31,17,21,NULL,0,0,0
+32,18,22,NULL,0,0,0
+33,19,23,NULL,0,0,0
+34,20,24,NULL,0,0,0
+35,21,25,NULL,0,0,0
+36,22,26,NULL,0,0,0
+37,30,27,NULL,0,0,0
+38,31,28,NULL,0,0,0
+39,32,29,NULL,0,0,0
+40,33,29,NULL,0,0,0
+41,34,29,NULL,0,0,0
+42,35,30,NULL,0,0,0
+43,36,30,NULL,0,0,0
+44,28,31,NULL,0,0,0
+45,29,32,NULL,0,0,0
+46,30,33,NULL,0,0,0
+47,31,34,NULL,0,0,0
+48,32,35,NULL,0,0,0
+49,33,35,NULL,0,0,0
+50,34,35,NULL,0,0,0
+51,30,36,NULL,0,0,0
+52,31,37,NULL,0,0,0
+53,32,38,NULL,0,0,0
+54,33,38,NULL,0,0,0
+55,34,38,NULL,0,0,0
+56,15,39,NULL,0,0,0
+57,16,40,NULL,0,0,0
+58,17,41,NULL,0,0,0
+59,18,42,NULL,0,0,0
+60,19,43,NULL,0,0,0
+61,20,44,NULL,0,0,0
+62,21,45,NULL,0,0,0
+63,22,46,NULL,0,0,0
+64,28,47,NULL,0,0,0
+65,29,48,NULL,0,0,0
+66,30,49,NULL,0,0,0
+67,31,50,NULL,0,0,0
+68,32,51,NULL,0,0,0
+69,33,51,NULL,0,0,0
+70,34,51,NULL,0,0,0
+71,7,52,NULL,0,0,0
+72,8,52,NULL,0,0,0
+73,37,53,NULL,0,0,0
+74,38,54,NULL,0,0,0
+75,39,55,NULL,0,0,0
+76,40,56,NULL,0,0,0
+77,41,56,NULL,0,0,0
+78,42,57,NULL,0,0,0
+79,43,58,NULL,0,0,0
+80,44,59,NULL,0,0,0
+81,45,60,NULL,0,0,0
+82,46,61,NULL,0,0,0
+83,47,62,NULL,0,0,0
+84,48,63,NULL,0,0,0
+85,8,64,NULL,0,0,0
+86,49,65,NULL,0,0,0
+87,50,66,NULL,0,0,0
+88,49,67,NULL,0,0,0
+89,50,68,NULL,0,0,0
+90,51,69,NULL,0,0,0
+91,52,70,NULL,0,0,0
+92,51,71,NULL,0,0,0
+93,52,72,NULL,0,0,0
+94,53,73,NULL,0,0,0
+95,54,74,NULL,0,0,0
+96,55,74,NULL,0,0,0
+97,54,75,NULL,0,0,0
+98,55,75,NULL,0,0,0
+99,56,76,NULL,0,0,0
+100,57,76,NULL,0,0,0
+101,58,76,NULL,0,0,0
+102,59,77,NULL,0,0,0
+103,60,78,NULL,0,0,0
+104,61,79,NULL,0,0,0
+105,62,80,NULL,0,0,0
+106,62,81,NULL,0,0,0
+107,63,82,NULL,0,0,0
+108,64,82,NULL,0,0,0
+109,65,83,NULL,0,0,0
+110,66,84,NULL,0,0,0
+111,67,84,NULL,0,0,0
+112,56,85,NULL,0,0,0
+113,57,85,NULL,0,0,0
+114,58,85,NULL,0,0,0
+115,68,86,NULL,0,0,0
+116,69,87,NULL,0,0,0
+117,70,88,NULL,0,0,0
+118,71,89,NULL,0,0,0
+119,72,90,NULL,0,0,0
+120,73,91,NULL,0,0,0
+121,74,92,NULL,0,0,0
+122,75,93,NULL,0,0,0
+123,76,94,NULL,0,0,0
+124,77,95,NULL,0,0,0
+125,49,96,NULL,0,0,0
+126,50,97,NULL,0,0,0
+127,51,98,NULL,0,0,0
+128,52,99,NULL,0,0,0
+129,78,100,NULL,0,0,0
+130,79,101,NULL,0,0,0
+131,80,102,NULL,0,0,0
+132,81,103,NULL,0,0,0
+133,82,104,NULL,0,0,0
+134,83,105,NULL,0,0,0
+135,84,106,NULL,0,0,0
+136,85,90,NULL,0,0,0
+137,86,88,NULL,0,0,0
+138,86,107,NULL,0,0,0
+139,87,107,NULL,0,0,0
+140,88,107,NULL,0,0,0
+141,86,108,NULL,0,0,0
+142,89,109,NULL,0,0,0
+143,90,110,NULL,0,0,0
+144,91,110,NULL,0,0,0
+145,92,111,NULL,0,0,0
+146,93,112,NULL,0,0,0
+147,94,113,NULL,0,0,0
+148,95,114,NULL,0,0,0
+149,96,115,NULL,0,0,0
+150,97,116,NULL,0,0,0
+151,98,116,NULL,0,0,0
+152,99,116,NULL,0,0,0
+153,100,117,NULL,0,0,0
+154,101,118,NULL,0,0,0
+155,102,119,NULL,0,0,0
+156,103,120,NULL,0,0,0
+157,104,121,NULL,0,0,0
+158,105,121,NULL,0,0,0
+159,106,121,NULL,0,0,0
+160,104,122,NULL,0,0,0
+161,105,122,NULL,0,0,0
+162,106,122,NULL,0,0,0
+163,107,122,NULL,0,0,0
+164,108,123,NULL,0,0,0
+165,109,124,NULL,0,0,0
+166,110,125,NULL,0,0,0
+167,111,126,NULL,0,0,0
+168,112,127,NULL,0,0,0
+169,113,127,NULL,0,0,0
+170,114,128,NULL,0,0,0
+171,115,129,NULL,0,0,0
+172,116,130,NULL,0,0,0
+173,117,131,NULL,0,0,0
+174,118,132,NULL,0,0,0
+175,119,132,NULL,0,0,0
+176,120,122,NULL,0,0,0
+177,121,133,NULL,0,0,0
+178,122,134,NULL,0,0,0
+179,123,135,NULL,0,0,0
+180,124,136,NULL,0,0,0
+181,125,137,NULL,0,0,0
+182,126,138,NULL,0,0,0
+183,127,139,NULL,0,0,0
+184,128,140,NULL,0,0,0
+185,129,141,NULL,0,0,0
+186,130,141,NULL,0,0,0
+187,131,141,NULL,0,0,0
+188,132,142,NULL,0,0,0
+189,133,143,NULL,0,0,0
+190,134,144,NULL,0,0,0
+191,135,145,NULL,0,0,0
+192,135,146,NULL,0,0,0
+193,136,147,NULL,0,0,0
+194,137,148,NULL,0,0,0
+195,138,149,NULL,0,0,0
+196,139,150,NULL,0,0,0
+197,140,151,NULL,0,0,0
+198,141,152,NULL,0,0,0
+199,142,153,NULL,0,0,0
+200,143,154,NULL,0,0,0
+201,144,155,NULL,0,0,0
+202,145,156,NULL,0,0,0
+203,146,157,NULL,0,0,0
+204,49,158,NULL,0,0,0
+205,50,159,NULL,0,0,0
+206,51,160,NULL,0,0,0
+207,52,161,NULL,0,0,0
+208,147,162,NULL,0,0,0
+209,148,163,NULL,0,0,0
+210,149,164,NULL,0,0,0
+211,150,165,NULL,0,0,0
+212,151,165,NULL,0,0,0
+213,152,166,NULL,0,0,0
+214,153,166,NULL,0,0,0
+215,114,167,NULL,0,0,0
+216,154,168,NULL,0,0,0
+217,155,169,NULL,0,0,0
+218,156,170,NULL,0,0,0
+219,157,171,NULL,0,0,0
+220,158,172,NULL,0,0,0
+221,159,173,NULL,0,0,0
+222,160,174,NULL,0,0,0
+223,161,175,NULL,0,0,0
+224,162,176,NULL,0,0,0
+225,163,177,NULL,0,0,0
+226,164,178,NULL,0,0,0
+227,165,179,NULL,0,0,0
+228,166,180,NULL,0,0,0
+229,167,181,NULL,0,0,0
+230,168,182,NULL,0,0,0
+231,169,183,NULL,0,0,0
+232,170,184,NULL,0,0,0
+233,171,185,NULL,0,0,0
+234,172,186,NULL,0,0,0
+235,173,187,NULL,0,0,0
+236,174,188,NULL,0,0,0
+237,175,189,NULL,0,0,0
+238,176,190,NULL,0,0,0
+239,177,191,NULL,0,0,0
+240,178,192,NULL,0,0,0
+241,179,193,NULL,0,0,0
+242,180,194,NULL,0,0,0
+243,181,195,NULL,0,0,0
+244,182,196,NULL,0,0,0
+245,183,197,NULL,0,0,0
+246,184,198,NULL,0,0,0
+247,185,199,NULL,0,0,0
+248,186,200,NULL,0,0,0
+249,187,201,NULL,0,0,0
+250,188,202,NULL,0,0,0
+251,189,203,NULL,0,0,0
+252,190,204,NULL,0,0,0
+253,191,205,NULL,0,0,0
+254,192,206,NULL,0,0,0
+255,193,207,NULL,0,0,0
+256,194,208,NULL,0,0,0
+257,195,209,NULL,0,0,0
+258,196,210,NULL,0,0,0
+259,197,211,NULL,0,0,0
+260,198,212,NULL,0,0,0
+261,199,213,NULL,0,0,0
+262,200,214,NULL,0,0,0
+263,201,215,NULL,0,0,0
+264,202,216,NULL,0,0,0
+265,128,217,NULL,0,0,0
+266,203,218,NULL,0,0,0
+267,204,219,NULL,0,0,0
+268,205,220,NULL,0,0,0
+269,206,221,NULL,0,0,0
+270,207,222,NULL,0,0,0
+271,208,223,NULL,0,0,0
+272,209,224,NULL,0,0,0
+273,210,225,NULL,0,0,0
+274,211,226,NULL,0,0,0
+275,212,227,NULL,0,0,0
+276,213,228,NULL,0,0,0
+277,214,229,NULL,0,0,0
+278,215,230,NULL,0,0,0
+279,216,231,NULL,0,0,0
+280,217,232,NULL,0,0,0
+281,218,233,NULL,0,0,0
+282,219,234,NULL,0,0,0
+283,220,235,NULL,0,0,0
+284,221,236,NULL,0,0,0
+285,222,237,NULL,0,0,0
+286,223,238,NULL,0,0,0
+287,224,239,NULL,0,0,0
+288,225,240,NULL,0,0,0
+289,226,241,NULL,0,0,0
+290,227,242,NULL,0,0,0
+291,228,243,NULL,0,0,0
+292,229,244,NULL,0,0,0
+293,230,245,NULL,0,0,0
+294,231,246,NULL,0,0,0
+295,232,247,NULL,0,0,0
+296,233,248,NULL,0,0,0
+297,234,249,NULL,0,0,0
+298,235,250,NULL,0,0,0
+299,236,251,NULL,0,0,0
+300,237,252,NULL,0,0,0
+301,238,253,NULL,0,0,0
+302,239,254,NULL,0,0,0
+303,240,255,NULL,0,0,0
+304,241,256,NULL,0,0,0
+305,242,257,NULL,0,0,0
+306,243,258,NULL,0,0,0
+307,244,259,NULL,0,0,0
+308,245,260,NULL,0,0,0
+309,246,261,NULL,0,0,0
+310,242,262,NULL,0,0,0
+311,247,263,NULL,0,0,0
+312,248,264,NULL,0,0,0
+313,249,265,NULL,0,0,0
+314,250,266,NULL,0,0,0
+315,251,267,NULL,0,0,0
+316,252,268,NULL,0,0,0
+317,253,269,NULL,0,0,0
+318,254,270,NULL,0,0,0
+319,255,271,NULL,0,0,0
+320,256,272,NULL,0,0,0
+321,257,273,NULL,0,0,0
+322,258,274,NULL,0,0,0
+323,259,275,NULL,0,0,0
+324,260,276,NULL,0,0,0
+325,261,277,NULL,0,0,0
+326,262,278,NULL,0,0,0
+327,263,279,NULL,0,0,0
+328,264,280,NULL,0,0,0
+329,265,281,NULL,0,0,0
+330,266,282,NULL,0,0,0
+331,127,283,NULL,0,0,0
+332,267,284,NULL,0,0,0
+333,268,285,NULL,0,0,0
+334,269,286,NULL,0,0,0
+335,270,287,NULL,0,0,0
+336,54,288,NULL,0,0,0
+337,55,288,NULL,0,0,0
+338,271,289,NULL,0,0,0
+339,111,290,NULL,0,0,0
+340,257,291,NULL,0,0,0
+341,258,292,NULL,0,0,0
+342,272,293,NULL,0,0,0
+343,273,294,NULL,0,0,0
+344,274,295,NULL,0,0,0
+345,275,296,NULL,0,0,0
+346,32,297,NULL,0,0,0
+347,266,298,NULL,0,0,0
+348,276,299,NULL,0,0,0
+349,277,300,NULL,0,0,0
+350,278,301,NULL,0,0,0
+351,279,302,NULL,0,0,0
+352,280,303,NULL,0,0,0
+353,281,304,NULL,0,0,0
+354,282,304,NULL,0,0,0
+355,283,305,NULL,0,0,0
+356,284,305,NULL,0,0,0
+357,285,306,NULL,0,0,0
+358,286,306,NULL,0,0,0
+359,287,307,NULL,0,0,0
+360,281,308,NULL,0,0,0
+361,282,308,NULL,0,0,0
+362,288,309,NULL,0,0,0
+363,289,310,NULL,0,0,0
+364,290,310,NULL,0,0,0
+365,291,310,NULL,0,0,0
+366,292,310,NULL,0,0,0
+367,293,310,NULL,0,0,0
+368,294,310,NULL,0,0,0
+369,295,310,NULL,0,0,0
+370,296,310,NULL,0,0,0
+371,297,311,NULL,0,0,0
+372,298,312,NULL,0,0,0
+373,299,313,NULL,0,0,0
+374,300,314,NULL,0,0,0
+375,301,315,NULL,0,0,0
+376,302,315,NULL,0,0,0
+
+MetaClass_Member
+MetaClass_Member_ID,Valid_MetaClass_ID,Name,Label,Table_Row_ID,SequenceNo,Global_User_ID,Row_Time_Stamp
+1,7,Model,NULL,1,0,625,0
+
+Property_Usage
+Property_Usage_ID,MetaClass_Member_ID,Valid_Property_ID,Label,Min_Rows,Max_Rows,Enforce_Maximum,IsMandatory,Global_User_ID,Row_Time_Stamp
+1,1,155,NULL,NULL,NULL,0,0,626,0
+
+Property_Value_Usage
+Property_Value_Usage_ID,Valid_Property_Value_ID,Property_Usage_ID,Value_Override,SequenceNo,Label,Global_User_ID,Row_Time_Stamp
+1,201,1,"<?xml version=""1.0"" encoding=""UTF-8"" standalone=""no""?>
+<!DOCTYPE ERStudioGeneratePhysicalModelWizard SYSTEM """"><!--Name		  : Embarcadero Project File
+Description   : This file contains an Embarcadero generated data file.
+Version	   : Version 1.00
+Creation Date : 05/13/21 - 10:28:22
+Last Update   : 05/13/21 - 10:28:22
+--><ERStudioGeneratePhysicalModelWizard><GeneratePhysicalModelWizPropertyValue GeneratePhysicalModelWizPropertyValue=""DOMINO""/>
+<BooleanVariables m_bEraseData=""0"" m_bFallbackProtection=""0"" m_bFileBasedXML=""0"" m_bFix=""0"" m_bGenerateAKIndex=""0"" m_bGenerateFKIndex=""0"" m_bGenerateIEIndex=""0"" m_bGeneratePKClustered=""0"" m_bGeneratePKIndex=""1"" m_bIncludeDrawingShape=""0"" m_bIncludeSubmodels=""0"" m_bIncludeTextBlocks=""0"" m_bIsDimensionalModel=""0"" m_bLogDataChanges=""0"" m_bNotLoggedInitially=""0"" m_bPadIndex=""0"" m_bReplacementStrategy=""0"" m_bSelectAllEntity=""1"" m_bSelectAllRole=""0"" m_bSelectAllUser=""0"" m_bSelectAllView=""0"" m_bSortInTempDb=""0"" m_bTableStorage=""0"" m_bUnbalancedSplit=""0"" m_bValidateModel=""1""/>
+<NumberVariables m_SpaceHandling=""2"" m_TargetDatabaseId=""73"" m_nCaseShift=""1"" m_nExtFKHandling=""0"" m_nGBPCache=""0"" m_nHandlingNonspecificRel=""0"" m_nIdxOwnershipHandling=""0"" m_nInvalidCharHandling=""1"" m_nLockMode=""0"" m_nMySQLTableType=""0"" m_nPartialSettingHandling=""1"" m_nPrefetchStrategy=""0"" m_nSaveSettingsOption=""0"" m_nStorageType=""0"" m_nTblOwnershipHandling=""0"" m_nViewGenOption=""-1"" m_nViewOwnershipHandling=""0""/>
+<CStringVariables m_PhysicalModelName=""domino"" m_TargetDatabase=""MySQL 5.x"" m_csAfterJournal="""" m_csBeforeJournal="""" m_csDB2IndexInclude="""" m_csDatabase="""" m_csDatablockSize="""" m_csDupRowControl="""" m_csExternalNSTemplatePath="""" m_csIdentityGap="""" m_csIdxBufferPool="""" m_csIdxExtentGrowthFactor="""" m_csIdxFillfactor="""" m_csIdxFreeListGroups="""" m_csIdxFreeLists="""" m_csIdxInitialExtentSize="""" m_csIdxMaxExtents="""" m_csIdxMaxRowsPerPage="""" m_csIdxMaxTransactions="""" m_csIdxMinExtents="""" m_csIdxMinTransactions="""" m_csIdxNextExtentSize="""" m_csIndexNewOwner="""" m_csIndexPctFree="""" m_csIndexPctUsed="""" m_csIndexStorage="""" m_csLongStorage="""" m_csReservePageGap="""" m_csSelectedDatatypeMapping="""" m_csSelectedNSTemplateName=""[none]"" m_csSybaseLockingScheme="""" m_csTableNewOwner="""" m_csTablePctFree="""" m_csTablePctUsed="""" m_csTablePrefix="""" m_csTableStorage="""" m_csTableSuffix="""" m_csTblBufferPool="""" m_csTblExtentGrowthFactor="""" m_csTblFillfactor="""" m_csTblFreeListGroups="""" m_csTblFreeLists="""" m_csTblInitialExtentSize="""" m_csTblMaxExtents="""" m_csTblMaxRowsPerPage="""" m_csTblMaxTransactions="""" m_csTblMinExtents="""" m_csTblMinTransactions="""" m_csTblNextExtentSize="""" m_csTextImageFileGroup="""" m_csViewNewOwner="""" m_csViewPrefix="""" m_csViewSuffix=""""/>
+<GenPhysicalDataObjectList><m_EntityList/>
+<m_ViewList/>
+<m_UserList/>
+<m_RoleList/>
+</GenPhysicalDataObjectList>
+</ERStudioGeneratePhysicalModelWizard>
+",1,NULL,627,0
+
+DbPackage
+DbPackage_ID,Model_ID,Owner_ID,Name_ID,Description_ID,Flags,Header_Value_ID,Body_Value_ID,NSTFlag,CompareFlags,Global_User_ID
+
+DbTrigger
+DbTrigger_ID,Entity_ID,Owner_ID,Name_ID,Description_ID,Type,Flags,Trigger_Action,Value_ID,NSTFlag,Global_User_ID
+
+Proc
+Proc_ID,Model_ID,Owner_ID,Name_ID,Description_ID,Type,Flags,Value_ID,NSTFlag,CompareFlags,Global_User_ID
+
+Templated_Proc
+Templated_Proc_ID,Entity_ID,Name_ID,Description_ID,Flags,Value_ID,NSTFlag,Global_User_ID
+
+Storage_Object
+Storage_Object_ID,Model_ID,Owner_ID,Name_ID,Description_ID,Value_ID,Type,NSTFlag,CompareFlags,Global_User_ID
+
+Shape
+Shape_ID,Model_ID,Name_ID,Value_ID,Type,NSTFlag,CompareFlags,Global_User_ID
+
+Shape_Edge
+Shape_Edge_ID,Model_ID,Parent_MetaTable_ID,Parent_Table_Row_ID,Child_MetaTable_ID,Child_Table_Row_ID,Name_ID,VerbPhraseId,InversePhraseId,NSTFlag,Global_User_ID
+
+Referenced_Object
+Referenced_Object_ID,Proc_ID,DbTrigger_ID,DbPackage_ID,Storage_Object_ID,MetaTable_ID,Table_Row_ID,Global_User_ID
+
+Bound_Dictionary_Object
+Bound_Dictionary_Object_ID,Dictionary_Object_ID,MetaTable_ID,Table_Row_ID,Flags,Value_Override_ID,Sequence_No,Global_User_ID
+
+Object_Tracking
+Object_Tracking_ID,MetaTable_ID,Table_Row_ID,Created_By_ID,Create_Timestamp_ID,Last_Updated_By_ID,Last_Update_Timestamp_ID,Global_User_ID
+
+Data_Dictionary
+Data_Dictionary_ID,Name_ID,Description_ID,Flags,SignatureGUID,Global_User_ID
+1,75,2,1,NULL,2
+
+Dictionary_Object_Type
+Dictionary_Object_Type_ID,Name,Dictionary_Object_Type,Data_Type
+1,Trigger,1,0
+2,Library,2,0
+3,Procedure,3,0
+4,Default,4,0
+5,Rule,5,0
+6,UserDatatype,6,0
+7,Domain,7,0
+8,Reference Value,8,0
+9,Attachment Type,9,0
+10,Valid Attachment Type,10,0
+11,Attachment,11,0
+12,Dictionary Object Link,12,0
+13,Naming Standards Template,13,0
+
+Dictionary_Object
+Dictionary_Object_ID,Data_Dictionary_ID,Dictionary_Object_Type_ID,Property_Value_Data_Type,Global_User_ID
+1,1,9,0,111
+2,1,10,0,112
+3,1,10,0,113
+4,1,10,0,114
+5,1,10,0,115
+
+Dictionary_Library
+Dictionary_Library_ID,Dictionary_Object_ID,Name_ID,Description_ID,Is_System,Value_ID,Global_User_ID
+
+Dictionary_Trigger
+Dictionary_Trigger_ID,Dictionary_Object_ID,Name_ID,Description_ID,Is_System,Trigger_Type,Trigger_Action,Value_ID,DBMS_Type,Global_User_ID
+
+Reusable_Procedure
+Reusable_Procedure_ID,Dictionary_Object_ID,Name_ID,Description_ID,Value_ID,DBMS_Type,Global_User_ID
+
+Reference_Value
+Reference_Value_ID,Dictionary_Object_ID,Name_ID,Description_ID,Value_ID,Value_Description_ID,Min_Value_ID,Max_Value_ID,Is_Not_Between,Is_Range,Global_User_ID
+
+Attachment_Type
+Attachment_Type_ID,Dictionary_Object_ID,Name_ID,Description_ID,Is_User_Defined,Global_User_ID
+1,1,5,5,0,111
+
+Valid_Attachment_Type
+Valid_Attachment_Type_ID,Dictionary_Object_ID,MetaTable_ID,Attachment_Type_ID,Min_Rows,Max_Rows,Global_User_ID
+1,2,12,1,0,0,112
+2,3,1,1,0,0,113
+3,4,3,1,0,0,114
+4,5,57,1,0,0,115
+
+Attachment
+Attachment_ID,Dictionary_Object_ID,Attachment_Type_ID,Name_ID,Description_ID,Value_Default_ID,Attachment_Data_Type,Global_User_ID
+
+Dictionary_Object_Link
+Dictionary_Object_Link_ID,Dictionary_Object_ID,Ultimate_Parent_ID,Parent_ID,Child_ID,NodeNameID,NodeLevel,IsBottomLevel,Global_User_ID
+
+Naming_Standards_Template
+Naming_Standards_Template_ID,Dictionary_Object_ID,Name_ID,Description_ID,Data_ID,Global_User_ID,Row_Time_Stamp
+
+Object_Transform
+Object_Transform_ID,Model_ID,Transform_Type,Name_ID,Description_ID,CompareFlags,Global_User_ID
+
+Transform_Member
+Transform_Member_ID,Object_Transform_ID,MetaTable_ID,Source_Table_Row_ID,Target_Table_Row_ID,Transform_Action,Global_User_ID
+
+Database_Role
+Database_Role_ID,Model_ID,Name_ID,Identification_Type,Password,Description_ID,Flags,NSTFlag,CompareFlags,Global_User_ID
+
+Database_User
+Database_User_ID,Model_ID,Name_ID,External_Name_ID,Password,Description_ID,Flags,NSTFlag,CompareFlags,Global_User_ID
+
+Object_Permission
+Object_Permission_ID,Model_ID,Object_MetaTable_ID,Object_Table_Row_ID,Attribute_ID,Object_Name_ID,Object_Owner_ID,Grantee_MetaTable_ID,Grantee_Table_Row_ID,Grantee_Name_ID,Action_Type,Permission_Type,Flags,Global_User_ID
+
+User_Role_Member
+User_Role_Member_ID,Model_ID,Database_Role_ID,Database_User_ID,Global_User_ID
+
+User_Object_Match
+User_Object_Match_ID,A_Model_ID,B_Model_ID,A_MetaTable_ID,B_MetaTable_ID,A_Table_Row_ID,B_Table_Row_ID,Flags,DefinitionId,Global_User_ID
+
+Lineage_Component
+Lineage_Component_ID,Model_ID,MetaTable_ID,Table_Row_ID,DisplayName_ID,Global_User_ID
+
+Lineage_Stream
+Lineage_Stream_ID,Model_ID,Transformation_ID,Lineage_Component_ID,Flags,Name_ID,Description_ID,Global_User_ID
+
+Lineage_Stream_Member
+Lineage_Stream_Member_ID,Lineage_Stream_ID,MetaTable_ID,Table_Row_ID,Global_User_ID
+
+Transformation
+Transformation_ID,Model_ID,Name_ID,DefinitionId,Code_ID,Type_ID,Global_User_ID
+
+InterModelObjectLink
+InterModelObjectLink_ID,UniqueObject_ID,InterModelRelationship_ID
+
+InterModelRelationship
+InterModelRelationship_ID,Global_User_ID
+
+ObjectModification
+ObjectModification_ID,UniqueObject_ID,Modification_Type
+
+Delayed_Checkout
+Delayed_Checkout_ID,ObjectTechKey,DependencyType,DependencyTechKey,UniqueObject_Id,ObjectType,Flags
+
+UniqueObject
+UniqueObject_Id,ObjectType_Id,Model_ID,Object_Domain_ID,InterModel_Id,IntraModelObject_Id,GUID,VersionGUID,CreationDate,CreateDate,RepositoryStatus,LastUpdateDate,Row_Time_Stamp
+1,4,0,1,1,0,12d027a37af34ce28b8c09b5afed979f,12ccbfc3fd104d3db34d55086a80f773,05/13/2021 00:08:10G,1620862626,1,0,0
+2,55,0,2,1,0,33f06a8754264aae903992030f4b9b0b,a3d08fbe579c481cae7a035ac016c879,05/13/2021 00:08:10G,1620862626,1,0,0
+3,7,1,1,0,0,0c4ce0766d45437aac660ed0c52beabe,30f9a285c34649f8800b65cea02799e8,05/13/2021 00:08:10G,1620862626,1,0,0
+4,53,0,1,0,0,028351afd54e454c82eba7a8db082c9d,fcb074d5fc0d45699cee1cde3e88194c,05/13/2021 00:08:10G,1620862626,1,0,0
+5,53,0,1,0,0,d9847311a3e84994b4ba4bf1cb9b5aaa,232a068823114e22971fb827e2731d59,05/13/2021 00:08:10G,1620862626,1,0,0
+6,53,0,1,0,0,d80a2add6d6041fa91af2ce272355110,1809267090c94bc9bd4cb22fdd66d071,05/13/2021 00:08:10G,1620862626,1,0,0
+7,53,0,1,0,0,8794e918fdbb43e496a20479de1518be,1f513f1aa76244568cc72700670e71d5,05/13/2021 00:08:10G,1620862626,1,0,0
+8,53,0,1,0,0,7000a1fe184d4a1fb9d0823761d83624,766c35ff7d7040758d6168914cb6b794,05/13/2021 00:08:10G,1620862626,1,0,0
+9,53,0,1,0,0,d32429fbf35444b28800a89e73f3fb64,e782081babd64b5cbecceebcd1b40f01,05/13/2021 00:08:10G,1620862626,1,0,0
+10,53,0,1,0,0,0480119942fe40e38e4992ec94cf95ed,9f1cd4c7de724af187da4d40b53696d3,05/13/2021 00:08:10G,1620862626,1,0,0
+11,53,0,1,0,0,36d31f3b8962467e89de9996bc4ca948,3cf88ca7dfdb4a97ad98d7870bd29d4b,05/13/2021 00:08:10G,1620862626,1,0,0
+12,53,0,1,0,0,04a6044c98554fe3b58d42524e2ffc95,906d4b5221204005ae36face71d7eec4,05/13/2021 00:08:10G,1620862626,1,0,0
+13,53,0,1,0,0,d3a60cdd31b04826a0a5c8d0c0a33ce1,d563ee8e6dd24666b2ea2c37eeb20e76,05/13/2021 00:08:10G,1620862626,1,0,0
+14,53,0,1,0,0,83b1dcff3c2845058dd661e1391e76f3,386ddf9fb03b41398799245b2bc557ca,05/13/2021 00:08:10G,1620862626,1,0,0
+15,53,0,1,0,0,c350f9a98e3943c3acf3bccd7789080b,bb63ed76defb4967abdcdd2b9bb076e7,05/13/2021 00:08:10G,1620862626,1,0,0
+16,53,0,1,0,0,e166a38ce9c741b28471843a0d4bd059,ad45fe577e5b428bbc37044495fc0f35,05/13/2021 00:08:10G,1620862626,1,0,0
+17,53,0,1,0,0,1e33ddcc7da24a29a68891add5aaf116,585500d45274488bb648a96edd105e12,05/13/2021 00:08:10G,1620862626,1,0,0
+18,53,0,1,0,0,61f2fa03f88d4f218708441a5f41c34f,e60ae2065535422a8d2b1ee79650d614,05/13/2021 00:08:10G,1620862626,1,0,0
+19,53,0,1,0,0,a50ff803f0734133a1921fb6882df5fe,34548c7f2fd44902b7e068e625b06729,05/13/2021 00:08:10G,1620862626,1,0,0
+20,53,0,1,0,0,1b722d621046466e9921e268b4823ae0,c3692e462c1443718f67cc3e935b339b,05/13/2021 00:08:10G,1620862626,1,0,0
+21,53,0,1,0,0,409de2e789ed40d2af58e2fdae6b089f,ddc2eb7ac8a04c6583de230d207ce833,05/13/2021 00:08:10G,1620862626,1,0,0
+22,25,1,1,1,0,a9653055fc694ccab5a45d46093f4380,f925595759b24c5281cdcfa7b9079c3b,05/13/2021 00:08:10G,1620862626,1,0,0
+23,36,1,1,0,0,fdcac8f88f2a4458be928ebca14fa8cd,921eacda5a21483c9ec35b9f1e9b7b79,05/13/2021 00:08:10G,1620862626,1,0,0
+24,39,1,1,0,0,bfb51921c3ea4a13bb3f6a8003ee1bfa,03cb8f0414b147af95613d0d620dcc72,05/13/2021 00:08:10G,1620862626,1,0,0
+25,37,1,1,0,0,a097ae6a51a84405a4e4baded7d1f140,7d6786914f2c43c3b04458b45a7f7a82,05/13/2021 00:08:10G,1620862626,1,0,0
+26,37,1,1,0,0,344ab113db854f688bf87b2862a51581,60054d9561cb4d419d63ceeb409243a2,05/13/2021 00:08:10G,1620862626,1,0,0
+27,37,1,1,0,0,3b5cf821f1ca421ead78e970e72ad032,d75d8cf8b6304d7e91b773de5779e390,05/13/2021 00:08:10G,1620862626,1,0,0
+28,37,1,1,0,0,fa9dcdea4c27421fac2f6625254208cc,c72c0d0e49a2447589168ed46f0c3d77,05/13/2021 00:08:10G,1620862626,1,0,0
+29,37,1,1,0,0,652dc1bf5b964939b26807f7b9925373,f83292b9c1834c43b2611b8bc2fb32b2,05/13/2021 00:08:10G,1620862626,1,0,0
+30,37,1,1,0,0,8aed02e4d387444da3c0f75316799583,f6e9af5ac61f44fdaa6cf8dd3a063cb5,05/13/2021 00:08:10G,1620862626,1,0,0
+31,37,1,1,0,0,0cf0b4e7571841368a620f61fda853d5,ad9b54c73532477e9f3550b97133521c,05/13/2021 00:08:10G,1620862626,1,0,0
+32,37,1,1,0,0,8d7ecb0a378c4e7eb8ab768420c33eaf,375e134b627c4cf38cfe8420b8ac2144,05/13/2021 00:08:10G,1620862626,1,0,0
+33,37,1,1,0,0,0f14efd54ca04ea1aba5a51708b599fc,a3c92c1f3b43400da8904c94e464fd98,05/13/2021 00:08:10G,1620862626,1,0,0
+34,37,1,1,0,0,c46272576bf14305888a30b3ba8e55a9,577b650d99a24ed6893d63502cc17397,05/13/2021 00:08:10G,1620862626,1,0,0
+35,37,1,1,0,0,79be15b1587a4424a47b723c1b393a7b,277221df41ec4e5c82fff66b6cb8e334,05/13/2021 00:08:10G,1620862626,1,0,0
+36,37,1,1,0,0,b453dbbd12e84047b24aa4fae0407a19,21f92e1dd499460da088f9b9d7deed21,05/13/2021 00:08:10G,1620862626,1,0,0
+37,37,1,1,0,0,022d72f6ac8d411998103f28003d9b74,0ffe39190c7a4f5bb7ba02b3f0e08c50,05/13/2021 00:08:10G,1620862626,1,0,0
+38,37,1,1,0,0,2e52be46402640d2928608eea2e2184a,1faadda7dc724939ba58c7eacc6529a5,05/13/2021 00:08:10G,1620862626,1,0,0
+39,37,1,1,0,0,e950021e6d0e4b6588e0bcaa86fcc355,dc7e9ef91aa747abb53322a244bb2f81,05/13/2021 00:08:10G,1620862626,1,0,0
+40,37,1,1,0,0,457490daa73c4b428a2b6e0d9aedb696,99d45302d3014e778992c92c89694785,05/13/2021 00:08:10G,1620862626,1,0,0
+41,37,1,1,0,0,18ddb3e20fb14ce4aa8e490871ad7e15,a0b8ba682cd340f2bc051dbcedcbb373,05/13/2021 00:08:10G,1620862626,1,0,0
+42,37,1,1,0,0,4327a9a385924016841e18544d0ea5f9,758e210d7a974238a80f0716c3808b45,05/13/2021 00:08:10G,1620862626,1,0,0
+43,37,1,1,0,0,a39b827e9234417c862f6b6c16464da4,0026d6a2ab77409788ee968f6c8308fa,05/13/2021 00:08:10G,1620862626,1,0,0
+44,37,1,1,0,0,dd0b352675bc47c890a5d4f208b95ddf,78d3cee0cac340a9825af84deed4e3cb,05/13/2021 00:08:10G,1620862626,1,0,0
+45,37,1,1,0,0,ace9cb051b144d848bd54ae963c5f9b1,d22866ae24eb4faba809e4fe0af669b0,05/13/2021 00:08:10G,1620862626,1,0,0
+46,37,1,1,0,0,71f5cca2fd50414fa0935acf7940b933,86a2bedfc273464e8c5f39ac03e5e56f,05/13/2021 00:08:10G,1620862626,1,0,0
+47,38,1,1,0,0,460ad083747a4d6fa81ae1223caa3dd2,db402a90a3ed435a8ae74109c39ced1d,05/13/2021 00:08:10G,1620862626,1,0,0
+48,38,1,1,0,0,9b9edbd6cc5f4a9b9517656246fff25b,427869fb6af946ba88644eef4566121c,05/13/2021 00:08:10G,1620862626,1,0,0
+49,38,1,1,0,0,05628e9d3c3140debd11c03ac378a1e2,3f65e0bb3f4b46b9bf9500506b083720,05/13/2021 00:08:10G,1620862626,1,0,0
+50,38,1,1,0,0,c6488bdc96b94c8fadf0a478b409bcac,ababd7a38817463193bb643a4df4481e,05/13/2021 00:08:10G,1620862626,1,0,0
+51,38,1,1,0,0,8a969365b98d4f298ad3c952685c846c,9b96088cf45a477ea6e358919633c603,05/13/2021 00:08:10G,1620862626,1,0,0
+52,38,1,1,0,0,6d358f8cbb4c4e7db0107aa745bafd4d,092c940485aa4ae787022dcc8cf5273e,05/13/2021 00:08:10G,1620862626,1,0,0
+53,38,1,1,0,0,e3b3a1fc32bd43628a5977978f7744e4,e04dc3d15db549d9a3a054ea0955ef7d,05/13/2021 00:08:10G,1620862626,1,0,0
+54,38,1,1,0,0,966c3cad7f7c477a872d7fda8611bb3f,0ca201423cbf4090a2918a10953bf262,05/13/2021 00:08:10G,1620862626,1,0,0
+55,38,1,1,0,0,020b6cf8eace42a384ada7aac974e1d8,5300abd34bee4fce9e9ae0190d7c5a33,05/13/2021 00:08:10G,1620862626,1,0,0
+56,38,1,1,0,0,dc7ddd77dcb2480290966946304e924f,873fc6344f014dc69b4a560c3885756a,05/13/2021 00:08:10G,1620862626,1,0,0
+57,38,1,1,0,0,f154393085494c1ab4b81d9eb697a019,ceffa236712c49628a37451a62e4fe90,05/13/2021 00:08:10G,1620862626,1,0,0
+58,38,1,1,0,0,5061d5f88ac34138bb84fd73305bfe53,7dcc6a807474449495b456302ca8c9cc,05/13/2021 00:08:10G,1620862626,1,0,0
+59,38,1,1,0,0,5ed891c6e682428c8c7bcd5e59703325,f890b8e5177745aa99e9ec39f1136c4f,05/13/2021 00:08:10G,1620862626,1,0,0
+60,38,1,1,0,0,39c182838b0d41298b37206b8f580b0f,82e2c040897649d38853d80e7e1719d9,05/13/2021 00:08:10G,1620862626,1,0,0
+61,38,1,1,0,0,af24defe1e52491c9f3a2f713a251d5f,87ef22c1fef9482ca6eeb870afcb77e9,05/13/2021 00:08:10G,1620862626,1,0,0
+62,38,1,1,0,0,4abae8ac7ff94cd7aa1b2ae6ba0771bd,a569160c10ce4c2aba153edf333e1d7a,05/13/2021 00:08:10G,1620862626,1,0,0
+1678,53,0,1,0,0,46686e9f86fa4755bcba8ea98f88a8ac,2e069f6d29924bd38c3844c099589e76,05/13/2021 15:58:28G,1620921107,1,0,0
+63,38,1,1,0,0,7bd15a00377748fc91a80e469258b36e,655679649029437da098cd7bdb3af49b,05/13/2021 00:08:10G,1620862626,1,0,0
+64,38,1,1,0,0,ab12fef6906e4b06b9ce66a7947531f3,28a18f7ec9864592baffcc2b380b1fc6,05/13/2021 00:08:10G,1620862626,1,0,0
+65,37,1,1,0,0,746aee7174094f7794bf0ac9d7628de3,cc008852404b4531ae8e2d2fdde4f347,05/13/2021 00:08:10G,1620862626,1,0,0
+1681,53,0,1,0,0,030f9a0ae03e48f2af009e543e9057fb,3154cac57be445359fb5b6adc711fb7a,05/13/2021 15:58:28G,1620921107,1,0,0
+66,38,1,1,0,0,85251f541a704e4d969f4adabdeaa1d6,e1e37af7e0eb4ba0a1fc031d86c0a92f,05/13/2021 00:08:10G,1620862626,1,0,0
+67,38,1,1,0,0,d8cff3141b474162933d9adb8e272ad6,63cb7562fa2846f7b82d8a6fd0c39877,05/13/2021 00:08:10G,1620862626,1,0,0
+68,38,1,1,0,0,27778b26c6684ab8b6f07f2567f2fb34,7f094c4206774d049c6bd255451b5178,05/13/2021 00:08:10G,1620862626,1,0,0
+69,38,1,1,0,0,7f65235a9ba64f1f8d257bf3f9f03218,a1fe775ebba4404a908bd5c7b8cd9fef,05/13/2021 00:08:10G,1620862626,1,0,0
+70,38,1,1,0,0,c18fdcfcb92947549099d6b030103ea9,1551b264b6314e3898b61db18af4437f,05/13/2021 00:08:10G,1620862626,1,0,0
+71,38,1,1,0,0,b8c1d1cc495342a1b2ee0d1fdd22f9cf,a395c4f43d2b491da6e09edf39f1a6a7,05/13/2021 00:08:10G,1620862626,1,0,0
+72,38,1,1,0,0,7f2b12b93e3541c88e461bfcbda4db56,c772dcc6c727434fbc9abd10482c9383,05/13/2021 00:08:10G,1620862626,1,0,0
+73,38,1,1,0,0,6a9a6852aeb349089dafc2e8339a28e3,a71b97b5b7db4e24a9de884b434b69cf,05/13/2021 00:08:10G,1620862626,1,0,0
+74,38,1,1,0,0,80c26bdcce934a52ae84a14e92e04dbf,2a46a16422954cfb88077a89841db705,05/13/2021 00:08:10G,1620862626,1,0,0
+75,38,1,1,0,0,5b792a6a501f454daacd0b5d8e9f7c7f,f3b38159887947798a3dbfc3424ebf57,05/13/2021 00:08:10G,1620862626,1,0,0
+76,38,1,1,0,0,10b74395c6334649b063656f9c224001,be4242a901f64cafbb428397e518b9d0,05/13/2021 00:08:10G,1620862626,1,0,0
+1692,37,4,1,0,0,e47337d5a4484b36a406a355c2f5c652,c3bfe66749e94f8c997070c62dc7f8ee,05/13/2021 15:58:28G,1620921107,1,0,0
+77,38,1,1,0,0,2566e3d91370434dad45a9235c70b1e5,532b40831a064cdbbdeb891f10bc37cf,05/13/2021 00:08:10G,1620862626,1,0,0
+1693,37,4,1,0,0,eb709cff5f7742aabcfee9bcd2bffd86,3e0ee7747f604b70b63ccdb4484decdc,05/13/2021 15:58:28G,1620921107,1,0,0
+78,38,1,1,0,0,eec9646c400542539681deca298e2e9e,20b5a974d86346e7a8b3c5466028e88c,05/13/2021 00:08:10G,1620862626,1,0,0
+1694,37,4,1,0,0,b6599ead71c04bd7a78d28eba659f81f,15185b857476400e99311d5ad9575285,05/13/2021 15:58:28G,1620921107,1,0,0
+79,38,1,1,0,0,80da33a387254674986da2473aed944c,5c121589b4d04ebf97860b7bdf613d23,05/13/2021 00:08:10G,1620862626,1,0,0
+1695,37,4,1,0,0,57cb8f4ca6b04923a06a86f95a9163b5,6bdc9dea4b514eb1817f8972a8612fd4,05/13/2021 15:58:28G,1620921107,1,0,0
+80,38,1,1,0,0,229781e65e8743ed90d57722c61b93a3,16e5c3ba1579468286572c3eebca90fd,05/13/2021 00:08:10G,1620862626,1,0,0
+1696,37,4,1,0,0,5d77df43f0a5453589a231379efa2bdf,faf20ccfd0254cee91cdfe39e1e04394,05/13/2021 15:58:28G,1620921107,1,0,0
+81,38,1,1,0,0,1698e10bf9f1449a9a1b72b5efd1a81d,7209acdf0fc74af2861b698ff249a1f9,05/13/2021 00:08:10G,1620862626,1,0,0
+1697,37,4,1,0,0,cdd4b9ed49224f779df943053356b46a,f45593b43d6c443e83636f6dd0ef7119,05/13/2021 15:58:28G,1620921107,1,0,0
+82,38,1,1,0,0,be4adf7a5755497facb4bdc0b92d25b2,ee148d70d0f54bdebdc6a35409c93ad6,05/13/2021 00:08:10G,1620862626,1,0,0
+1698,37,4,1,0,0,2d720971eb3d4885aba6457429011cb7,561e75dca72a458bb7efd211c20460e7,05/13/2021 15:58:28G,1620921107,1,0,0
+83,38,1,1,0,0,5de8b43b0b074724b70a083e45d03388,79e221720f544f77aa4b3b28426b9704,05/13/2021 00:08:10G,1620862626,1,0,0
+1699,37,4,1,0,0,0570875bedf94b9198e7a23a31afb1ba,2b3680a2b28e408db3754b4f280504b4,05/13/2021 15:58:28G,1620921107,1,0,0
+84,38,1,1,0,0,2afaca73656a436b8ce19b4a6753e14c,4af77231484e46ca882b5494cb073806,05/13/2021 00:08:10G,1620862626,1,0,0
+1700,37,4,1,0,0,54085fe4b0ee4035a9dc4e01805a3438,454868de089048178e4dc4e5639674f4,05/13/2021 15:58:28G,1620921107,1,0,0
+85,38,1,1,0,0,187080269de04f4a8b2e3b22ea434ecc,72b4033e62df481186aae1c2e206a528,05/13/2021 00:08:10G,1620862626,1,0,0
+86,38,1,1,0,0,0c35eb37d0ea494a9ff55dc624d55f7f,2658a139f7db4ca08a0002cf15b723ff,05/13/2021 00:08:10G,1620862626,1,0,0
+87,38,1,1,0,0,387c106570ac455fbf00f3e5ffe1ffae,30523a2169214bd384c34be87d7bdca3,05/13/2021 00:08:10G,1620862626,1,0,0
+88,38,1,1,0,0,15ea0e4beefb4ee6a42665290046eadc,8312dcbe12cb4b74af43b718483b78f4,05/13/2021 00:08:10G,1620862626,1,0,0
+1704,37,4,1,0,0,6a3ff97ef0de4f3b84d48532223180b6,66c02238f80e4113a1cabb92217859dd,05/13/2021 15:58:28G,1620921107,1,0,0
+89,38,1,1,0,0,2b420c5353c3483882b7dcee2676a178,7fc40cad6db94ecda9c5042ba79eb147,05/13/2021 00:08:10G,1620862626,1,0,0
+1705,37,4,1,0,0,8935da55866c40a693a5c11ca5081fcc,e11e225a2c6a443fb44cbd0a5756896c,05/13/2021 15:58:28G,1620921107,1,0,0
+90,38,1,1,0,0,f61fbf1ab93d47f28be5e561542dcd1f,74e8377839144ad987981c38d6e5a9ca,05/13/2021 00:08:10G,1620862626,1,0,0
+91,38,1,1,0,0,0f54b1665f4145698a1dd7dbbeaeb46b,8cd9af0bb143404ebd88fd62431abee4,05/13/2021 00:08:10G,1620862626,1,0,0
+92,38,1,1,0,0,98842da67f2a40209afea6bd370fb099,8edd7c52efdc432cb4813821d5b8b90a,05/13/2021 00:08:10G,1620862626,1,0,0
+1708,38,4,1,0,0,9e84f8667492450880fb658acfe74fa5,11636b2db83e406891201a3cce9cca70,05/13/2021 15:58:28G,1620921107,1,0,0
+93,38,1,1,0,0,a63b4810357447f4bbe06fd82296cf19,852f5c27f3c7403ab9f683e4921df5b0,05/13/2021 00:08:10G,1620862626,1,0,0
+94,38,1,1,0,0,cd262ea6aa3d4071b734d6d0b6f7ec7d,02331826eda249d98e37fa08d559d994,05/13/2021 00:08:10G,1620862626,1,0,0
+95,38,1,1,0,0,cfed319d59b3485bb3aa1ed5ca9f64b5,9fb262b5be164c72a7fb1bc1955b00db,05/13/2021 00:08:10G,1620862626,1,0,0
+96,37,1,1,0,0,fd5426d305214c969d08fd4bdb6c197f,4561d20b46e34701be9283cd3a5737d7,05/13/2021 00:08:10G,1620862626,1,0,0
+97,37,1,1,0,0,1e5b624e98fe43049cb8d64ed0dabc3b,167c787027cd48bf833fb29ebae5f320,05/13/2021 00:08:10G,1620862626,1,0,0
+98,38,1,1,0,0,cc62eb8a51f84ecd83a45c1572e4cde1,2be6595c96a54d65bda13c1d1c1075f7,05/13/2021 00:08:10G,1620862626,1,0,0
+99,38,1,1,0,0,b66452119a9541d4abb4ada15b91feaa,1bb462b292284c11abdd37ddfac0150c,05/13/2021 00:08:10G,1620862626,1,0,0
+1715,38,4,1,0,0,041fd130af00482fa4a2c3779dc0880a,5cd10304046243d6a269a61ff259c99d,05/13/2021 15:58:28G,1620921107,1,0,0
+100,38,1,1,0,0,e263c9d2bff940559c527bb91712feb5,5b3073f36b1a40218cdddac023f48a03,05/13/2021 00:08:10G,1620862626,1,0,0
+1716,38,4,1,0,0,008307f912f843ceac7570b2fecba000,9486e7685e4c45d292e8e1e7bb0f9a92,05/13/2021 15:58:28G,1620921107,1,0,0
+101,38,1,1,0,0,b34be8b41a294600bba7639069255336,389803158f2746d58511d061fd371a81,05/13/2021 00:08:10G,1620862626,1,0,0
+1717,38,4,1,0,0,fafa8f24b89c4656b8070eff6d1a7691,369d03db469d4c6db220c6d3a96b9e24,05/13/2021 15:58:28G,1620921107,1,0,0
+102,38,1,1,0,0,c466c7b991ac4a5c89a7851d0a4f0db8,da978862cc1f41f0af58007db0cc9696,05/13/2021 00:08:10G,1620862626,1,0,0
+1718,38,4,1,0,0,ba91aed6cf6944a89eba6ad58280beb9,a266a72332904614aadaa2ccb4a079f6,05/13/2021 15:58:28G,1620921107,1,0,0
+103,38,1,1,0,0,fa1caee425e6435baa50e2a04967a31c,3f1779ea0fe1451f8f73cee077b30d00,05/13/2021 00:08:10G,1620862626,1,0,0
+1719,38,4,1,0,0,5fb93ea93c0045789e6299e6e5354689,c4b088b01b474d22baa8371c5fe368e1,05/13/2021 15:58:28G,1620921107,1,0,0
+104,38,1,1,0,0,e44552b9210940258aec43462cf498d9,863c263534a94c1c8eedd43c46127ae8,05/13/2021 00:08:10G,1620862626,1,0,0
+1720,38,4,1,0,0,9624202136da49ca8dc831c008cf059b,63627bfa75814bcdbbcccecb7c0dd689,05/13/2021 15:58:28G,1620921107,1,0,0
+105,38,1,1,0,0,577888d292d2440d837b7a312b079fec,22acd93945e14942933581e265d15f79,05/13/2021 00:08:10G,1620862626,1,0,0
+1721,38,4,1,0,0,e0070e83925546218bdcf19e46005ac4,6104cd98628142cf89dda0e97e066c1c,05/13/2021 15:58:28G,1620921107,1,0,0
+106,37,1,1,0,0,704d6f57f9b84f6d88e156f8cf1212ae,9aafb0cc7b9c433cbf5d13a55671657b,05/13/2021 00:08:10G,1620862626,1,0,0
+1722,38,4,1,0,0,f80671fa1137417d950b6e6ad863f94e,58b7f3c3f6824465a23d0f985445e2b6,05/13/2021 15:58:28G,1620921107,1,0,0
+107,37,1,1,0,0,64ad67b5f9a0486c8187df4e56040e09,f55a9ffdd2d64cc4bdaa89802c6d35bf,05/13/2021 00:08:10G,1620862626,1,0,0
+1723,38,4,1,0,0,c04c819fbd8d4b29bf69a72f48c3cc47,510d0b819342406ba6bd5d496bd202ae,05/13/2021 15:58:28G,1620921107,1,0,0
+108,37,1,1,0,0,06c2cc04822445a9811ac1bdde5a63fc,612b72615cd1469c976c781007967c6c,05/13/2021 00:08:10G,1620862626,1,0,0
+109,37,1,1,0,0,6e6712e6a54e4b85ae8b3eca9d4d86e5,ba851cd9d3ea4bc6ac6bd3d383569470,05/13/2021 00:08:10G,1620862626,1,0,0
+110,37,1,1,0,0,1145ef1e25b047739d29dfcbe7fcb20c,b7a86b6a5f6445bab5346ce7d8c0cff3,05/13/2021 00:08:10G,1620862626,1,0,0
+1726,37,4,1,0,0,8bfe6f3b45da4f3d84ea10dc399af6e3,224289bab0d645ee9dac8408812b0bd4,05/13/2021 15:58:28G,1620921107,1,0,0
+111,58,0,2,1,0,bbce3f58195b46399de45b327c355556,6cbeeb51e68e4fa0ae7a6af4db80079e,05/13/2021 00:08:10G,1620862626,1,0,0
+1727,38,4,1,0,0,1e1360b27b9c4a8f88dd20796f05c54f,c8c7e2020eed43e099fb914701fece8a,05/13/2021 15:58:28G,1620921107,1,0,0
+112,59,0,2,2,0,3239e323f27a4b31b9eac23108d07887,fa09beb235474409b0f1d0de8385e27c,05/13/2021 00:08:10G,1620862626,1,0,0
+1728,38,4,1,0,0,5b11c01c448e40ac9f009abdd175e0ce,d96bf1e6a2c84587aeef73e7092f4ad7,05/13/2021 15:58:28G,1620921107,1,0,0
+113,59,0,2,3,0,c79bd26ec7654871b80816ea06245295,4cc2603e5a3f4d9db47ffb85844c23f6,05/13/2021 00:08:10G,1620862626,1,0,0
+1729,38,4,1,0,0,eaf6a927a53b42eca893383c550a7224,9f4f7a1bbd3e41a88a24b473fea48638,05/13/2021 15:58:28G,1620921107,1,0,0
+114,59,0,2,4,0,968f674106fb4bf1aecafa8a69746fa9,6beb7fd745004f64a04979c8565e6506,05/13/2021 00:08:10G,1620862626,1,0,0
+115,59,0,2,5,0,b41d299c51f44248aebde3345c1f0235,9bd57001013049e3b12a036ffea7d50c,05/13/2021 00:08:10G,1620862626,1,0,0
+116,5,1,1,1,0,6fc58ced63284121bfd7b179eb867ec8,711e5282facf49d9a30c738021c5b38f,05/13/2021 00:08:10G,1620862635,1,0,0
+117,41,1,1,0,0,7f5def4c01c44223914fa4dcec636693,292333fc79974a1a902fd2cab4e83f5e,05/13/2021 00:08:10G,1620862635,1,0,0
+118,6,1,1,1,1,5d8c71d39d49459e9c1f68b4cad7b467,6ebf230f73c44ec5ab405162fb885434,05/13/2021 00:08:10G,1620862635,1,0,0
+119,40,1,1,0,0,09401c0355814fb886abb26e07f8fc29,82fe7b6f2add4437a23fc76861ba7866,05/13/2021 00:08:10G,1620862635,1,0,0
+120,27,0,1,1,0,f5e7e3dccc88408f803c8538ae230e96,0a90b73d305b4bba968cb6a7e238e4d8,05/13/2021 00:08:10G,1620862635,1,0,0
+121,1,1,1,1,1,d35bc9350dfa4dffb6f7ce40ffcdfaaf,f1dcf517b4974e9fb5666984e738ac11,05/13/2021 00:08:10G,1620862639,1,0,0
+122,28,1,1,0,0,3fac61261ce848079d46dd0e91655417,f05d3090f5384dbfaf9c1ad9affda647,05/13/2021 00:08:10G,1620862639,1,0,0
+1738,38,4,1,0,0,2280c6002d4040a78dbf60f890cdf115,fcc2d63e05ba4ae69192f541cb5bf0b6,05/13/2021 15:58:28G,1620921107,1,0,0
+123,1,1,1,2,1,470b695d966a41e38f9faa441c32b4c2,43a37c70abac47d6b91b66ac6f6814ed,05/13/2021 00:08:10G,1620862642,1,0,0
+124,1,1,1,3,1,4e2c95754dba408eb35b506c34325df1,4133dd708cd647889afbf298883071e8,05/13/2021 00:08:10G,1620862647,1,0,0
+1743,38,4,1,0,0,d20afb0554784f4dafad1af5615f7ec6,104844cc78354441a3cc18d9ba91c4d8,05/13/2021 15:58:28G,1620921107,1,0,0
+128,1,1,1,7,1,19fce9fc0fc74ccf8055d4ca035b344e,bd46307b6cb94cf991be2f397791033c,05/13/2021 00:08:10G,1620862673,1,0,0
+1744,38,4,1,0,0,9daa086d41cc489887df02d4e0af0b7b,5087c2fc386d436bb2aa5801b7682b69,05/13/2021 15:58:28G,1620921107,1,0,0
+132,5,1,1,2,0,3422343e10734438b374edd0980f71d0,d5fe1edfdf794516b793c2975cab3e72,05/13/2021 00:08:10G,1620862732,1,0,0
+133,41,1,1,0,0,7082b5a44f68403eb012f2301b5ea11d,7daf06ad67dc48ceb93f22dfbe48b105,05/13/2021 00:08:10G,1620862732,1,0,0
+1749,38,4,1,0,0,8f015d2c2a7f4818b2bab9b627f3dfef,7b31c069219b4ff59c10f5072802f9d1,05/13/2021 15:58:28G,1620921107,1,0,0
+134,6,1,1,1,2,d0a36eb874ba4248b7d71490a9cee337,fd1b89dcc8a9404089861515c51e38af,05/13/2021 00:08:10G,1620862732,1,0,0
+135,40,1,1,0,0,f2e3472e7eda491d97bdd03db3721cf8,986ffb14520947b1b91d8c83fdccf1d5,05/13/2021 00:08:10G,1620862732,1,0,0
+136,27,0,1,2,0,7608d8d2b3cd47c7a2420a61e6c20da6,60840dfab95a4f29b2d2cd02c3b92f99,05/13/2021 00:08:10G,1620862732,1,0,0
+1752,38,4,1,0,0,d2909bcbb73c48aea063b204920625c4,79954498e1b7402baf6c749111cca28d,05/13/2021 15:58:28G,1620921107,1,0,0
+137,1,1,1,1,2,9fbe5cbe37f949e8be9c0c00bdb8f9e0,72e33350a7754ef6a3af552675e44005,05/13/2021 00:08:10G,1620862735,1,0,0
+1753,38,4,1,0,0,4aaf24fe1e2b431b8742f5fdbad12cea,70a46f82d219478c94edffc57001bce9,05/13/2021 15:58:28G,1620921107,1,0,0
+138,28,1,1,0,0,787deec95ac34d0b93cedefd992c8ba0,b42c292fcac84a02b9ed123aed29d2be,05/13/2021 00:08:10G,1620862735,1,0,0
+1754,38,4,1,0,0,f933573a608b41e289a3557d867cc033,5e0bc8aa929a475a802beb7fd10d247b,05/13/2021 15:58:28G,1620921107,1,0,0
+1755,38,4,1,0,0,04605c58e14e4e8a98619278fde4d24c,ede11242676e45da89e6f9dd430cc03a,05/13/2021 15:58:28G,1620921107,1,0,0
+1756,38,4,1,0,0,63f6a66b06c24eafbb51ec5c8d5c483f,76de08d652084d6994612126bdee59db,05/13/2021 15:58:28G,1620921107,1,0,0
+141,1,1,1,3,2,5f31bc9d6e864848a805947777dd24ba,aff61c4d651f45a3b6c8c1dbdac20c54,05/13/2021 00:08:10G,1620862743,1,0,0
+1757,37,4,1,0,0,b8caf7e21a7d458095560728cc6ec420,03deceab8a2947fa9a2cbc409783cfc8,05/13/2021 15:58:28G,1620921107,1,0,0
+142,5,1,1,3,0,3ecd7c564e8d406792e442cd8d3dd135,12f136726f47425596dc51dea81ed1f5,05/13/2021 00:08:10G,1620862750,1,0,0
+1758,37,4,1,0,0,bf9cdcab249a4ec18f82b4ff21d92f0e,1f474d2ac0b44a959947e7f388c33d0b,05/13/2021 15:58:28G,1620921107,1,0,0
+143,41,1,1,0,0,a22c85de607548e4acabee1d85c8db18,e57a948ec6024688995821469e3acc8c,05/13/2021 00:08:10G,1620862750,1,0,0
+1759,38,4,1,0,0,251c74f0a5ca4f0a844c38dfe37f3e2b,6ea09051911f45c7a7b113b383f22119,05/13/2021 15:58:28G,1620921107,1,0,0
+144,6,1,1,1,3,3a80333622ed43aa9611601496e77ee2,891780b9e8f848308f821e446d4910c1,05/13/2021 00:08:10G,1620862750,1,0,0
+1760,38,4,1,0,0,a1d6c04429654f87b7c22becb011a0b7,b67455322f8e44f891c20e996015c25d,05/13/2021 15:58:28G,1620921107,1,0,0
+145,40,1,1,0,0,2849371385f9448d97015cc5ac09eec7,61d812aa33cc45d98ba0aa400584dc74,05/13/2021 00:08:10G,1620862750,1,0,0
+1761,38,4,1,0,0,6d0916a30cf847068724537f5dd7d72a,4c50628aaf6e4f5cb17a77dde9bc4969,05/13/2021 15:58:28G,1620921107,1,0,0
+146,27,0,1,3,0,ec815a83b5a84d8da6e01b6246d38c19,1d7d46d136df484f9d9f510d89e4c278,05/13/2021 00:08:10G,1620862750,1,0,0
+1762,38,4,1,0,0,4c7e7a6a00c242cb8ec8333f05d7bbfa,6910f071a8e047e4876a5d0bc4f19fad,05/13/2021 15:58:28G,1620921107,1,0,0
+147,1,1,1,1,3,35fe838211eb4bfe9cd21a3861c69b30,fd10f3f5383a4410b0587e892fc7354c,05/13/2021 00:08:10G,1620862755,1,0,0
+1763,38,4,1,0,0,b3eeee8a3dcd484b8c2d6eb0f524c864,882966fe256e458d857be2790aaa650b,05/13/2021 15:58:28G,1620921107,1,0,0
+148,28,1,1,0,0,502e3496facc4da39b32e0d93aed5f0a,1a8933d920b544c4807d3b0337f4df1a,05/13/2021 00:08:10G,1620862755,1,0,0
+1764,38,4,1,0,0,0323dfcd72f8409ca62242f179df08ab,2de23c812b5e4ffbbf4ca70586cbc5bf,05/13/2021 15:58:28G,1620921107,1,0,0
+1765,38,4,1,0,0,a403961ab3f94b1bb37b84ccf3c721cf,7073c2aa615d4c4d94df4a9e58a86e4e,05/13/2021 15:58:28G,1620921107,1,0,0
+1766,38,4,1,0,0,9b23300d631a443f8b6670e1345c7765,4b1515916a044ff3a140b471c10557ca,05/13/2021 15:58:28G,1620921107,1,0,0
+151,1,1,1,3,3,f294f9df72e44127ba5c7bf54a4ce31a,ae9c15ec5e4e4c66a997654bda66ee40,05/13/2021 00:08:10G,1620862758,1,0,0
+1767,37,4,1,0,0,eeb382bfba734b20b684cc24b62d8e15,b15b39f4388a4102b72fc7fc0801cae6,05/13/2021 15:58:28G,1620921107,1,0,0
+152,5,1,1,4,0,f43cffde0706491894cfa6b6d3f70cf5,e79adacc4c5c42b599456299a21c35ab,05/13/2021 00:08:10G,1620862762,1,0,0
+1768,37,4,1,0,0,5c962be27d1645ff9a8f427859672343,87e8c0e435b44852b4c4888cd462d33e,05/13/2021 15:58:28G,1620921107,1,0,0
+153,41,1,1,0,0,1a105588b3304a41911cd354e324fa4e,dda70b79aab44fab82651780c7768511,05/13/2021 00:08:10G,1620862762,1,0,0
+1769,37,4,1,0,0,2eef911b0bf543c689a248fe8a350994,2fcc84de5a7e4407a9e8347a7eaca9a7,05/13/2021 15:58:28G,1620921107,1,0,0
+154,6,1,1,1,4,3aa490f2964f44aca1c8728545ecbf56,44cd173de8de4c53977e94983d11f358,05/13/2021 00:08:10G,1620862762,1,0,0
+1770,37,4,1,0,0,22fbba0b80c4482f992bfdb298c19611,1ddf29b2876041bba4c9a0d58d0a75e2,05/13/2021 15:58:28G,1620921107,1,0,0
+155,40,1,1,0,0,22c9658beb7243a5bb64e440f4a8c047,9dedb6360e5a41fc95d0930a3444f97f,05/13/2021 00:08:10G,1620862762,1,0,0
+1771,37,4,1,0,0,2033dec3d43d48a7b7b25011720dedb0,445c72abc5fb48158dfdf705eb030b91,05/13/2021 15:58:28G,1620921107,1,0,0
+156,27,0,1,4,0,b00462b030c74860b4c3779d3ba7e401,9ea86bf0c85e49fdb6685d0e8f89d8ca,05/13/2021 00:08:10G,1620862762,1,0,0
+157,1,1,1,1,4,8432af00e55e4fb1b2bf30b4ea0a284d,5fccaf23f4aa47898ff820d49c3297d3,05/13/2021 00:08:10G,1620862769,1,0,0
+158,28,1,1,0,0,1519e30b22544e1fbe623e474ffd6012,0226c0b3cb09441e8e7ecc62b0388c28,05/13/2021 00:08:10G,1620862769,1,0,0
+159,1,1,1,2,4,3a963e2529b9437c9b60a9f791460857,6ae40a1331f247edbe21c985379137f7,05/13/2021 00:08:10G,1620862773,1,0,0
+160,1,1,1,3,4,219311c935d54c779aac25a56878c812,c6557fd86f6246e0806737cce293f583,05/13/2021 00:08:10G,1620862777,1,0,0
+161,5,1,1,5,0,90bbcd10351549849e2a80831cfc32b1,f3b6e93f503b44a0b9a1abb4106ff8c6,05/13/2021 00:08:10G,1620862784,1,0,0
+162,41,1,1,0,0,33a3b207cb88404fb94a5512d7451d24,01fc14862fbb400e884c418ac5b5d40c,05/13/2021 00:08:10G,1620862784,1,0,0
+163,6,1,1,1,5,0cbbaa5ef9874fa3ad6e369d7e07762b,35e27f1dbea540deae90e9b075ceacf0,05/13/2021 00:08:10G,1620862784,1,0,0
+164,40,1,1,0,0,3252a8f2987e4d3c992d1dd15b010b09,a78eb44c822b473c99955556e6fe50f3,05/13/2021 00:08:10G,1620862784,1,0,0
+165,27,0,1,5,0,fbc2281bc91646ab8d4754c418247962,2df4ef8cfb3d48cc8ce9556102513da9,05/13/2021 00:08:10G,1620862784,1,0,0
+166,1,1,1,1,5,4853decb9251440f98c7b65c91bf391c,a51b4778feb74bd096bc7984e9474412,05/13/2021 00:08:10G,1620862787,1,0,0
+167,28,1,1,0,0,e715cd6c57dc450bb641b1c2d3640f65,7ef77bbabed84f569f2d078d03bd83ce,05/13/2021 00:08:10G,1620862787,1,0,0
+168,1,1,1,2,5,1bb3ffdcb14d4b0296376eec3933ed1a,e7daebde7cb0443e8fe3849cacf9c4de,05/13/2021 00:08:10G,1620862790,1,0,0
+169,1,1,1,3,5,e1888ed8376d491cab5d93132a7f651d,9e5d40f6377b4c6096d07f199ec53244,05/13/2021 00:08:10G,1620862793,1,0,0
+170,5,1,1,6,0,f84179efe41e4233b8e00690b83c2155,3f786b54ea4b4efc9b179cc341c1a81e,05/13/2021 00:08:10G,1620862799,1,0,0
+171,41,1,1,0,0,ed3e5501d9b9474e9a5f330e1f6cb20d,68a8b017797d4183b690f80fc19c2c4d,05/13/2021 00:08:10G,1620862799,1,0,0
+172,6,1,1,1,6,450c3ff66402417cb5723f4d703b652a,a2da8acfd045413ab30f070e64090261,05/13/2021 00:08:10G,1620862799,1,0,0
+173,40,1,1,0,0,856ca765690945a7bb10fa2c434ae445,23c4084e1e9245eba9dd53d04bd4195b,05/13/2021 00:08:10G,1620862799,1,0,0
+174,27,0,1,6,0,20726cd44fd141a1b18c9da411293c32,08c6e99d9a86440d8770b97401b1d11d,05/13/2021 00:08:10G,1620862799,1,0,0
+175,1,1,1,1,6,a5491d9f7e4d47a8a93a45d6c3ba5d8c,ab73a643b51b44dd91cd5836f970fe7f,05/13/2021 00:08:10G,1620862810,1,0,0
+176,28,1,1,0,0,7aa7cba615954cc2bf1cca7ef323f698,3736a47fd0254acba87a824162eff330,05/13/2021 00:08:10G,1620862810,1,0,0
+177,1,1,1,2,6,8757c88f5acd4db38ae13d4a9db559bb,ca26d9f881f14006a053f54e534e8746,05/13/2021 00:08:10G,1620862812,1,0,0
+178,1,1,1,3,6,9d5a3b1890034c67b4836887c5895825,7775e1c2eb674c99be886b9485fb7b25,05/13/2021 00:08:10G,1620862818,1,0,0
+179,5,1,1,7,0,8e7023eddcde4e1ebbdf65b91fe2f3f7,0f5210cf314546b4b8c88149f27160f3,05/13/2021 00:08:10G,1620862836,1,0,0
+180,41,1,1,0,0,3e3a282880c64eafae5d3973c8351877,ef02309d1c164fb1a8df6a3fb69a6680,05/13/2021 00:08:10G,1620862836,1,0,0
+181,6,1,1,1,7,e9150bbd106a456c8ddf86a9fe9e72c9,47f8de6e5bf24e3d8491a81b6f0bb72f,05/13/2021 00:08:10G,1620862836,1,0,0
+182,40,1,1,0,0,a57a6cdfb2e14a3d9e2f0db6d16ea45b,4bff6b5d0dbd436b8e8c00f9b983f7ca,05/13/2021 00:08:10G,1620862836,1,0,0
+183,27,0,1,7,0,a4f099eaa97649acb8019689ad14fb24,c30661bd31ab4f309beff86b22c366d2,05/13/2021 00:08:10G,1620862836,1,0,0
+184,5,1,1,8,0,ae40442b7bc94c96a4326205459fbf2e,36b8d9631da94f1a92ac321459c1e122,05/13/2021 00:08:10G,1620862846,1,0,0
+185,41,1,1,0,0,aa95037367f849228e7c9992b99b2bca,9ca5edb353a14c3c90742995ddce1a26,05/13/2021 00:08:10G,1620862846,1,0,0
+186,6,1,1,1,8,fac4b84afee443f5b0da4f0a834a8289,c18253ad11e449b0ab297ad527f582cf,05/13/2021 00:08:10G,1620862846,1,0,0
+187,40,1,1,0,0,94ac965a19464fb789c9980b026f45ab,8cd6850bc6dc40b598906166c0d73f09,05/13/2021 00:08:10G,1620862846,1,0,0
+188,27,0,1,8,0,13545a51447f4713aeb4829cadd92236,47f75382b6ae4a048aab22618bb03d69,05/13/2021 00:08:10G,1620862846,1,0,0
+194,5,1,1,10,0,6fa17eff9bee41f69e01a0a93d71fca1,a7e17fdb42874348a799563f5cb6bd69,05/13/2021 00:08:10G,1620862896,1,0,0
+195,41,1,1,0,0,2960967a88d24b62a2ec667905c3bc1d,2d3e9c9a43aa4898a84c05e521bd799c,05/13/2021 00:08:10G,1620862896,1,0,0
+196,6,1,1,1,10,4b0a6ad9d30e44278352f23b16da37c9,5dd48afca4e0428791df9df0929666bb,05/13/2021 00:08:10G,1620862896,1,0,0
+197,40,1,1,0,0,afc1e285b8c74a8cbf35c494c6a25bb0,017e3963d4904ae1bc4508f4d4bef3b6,05/13/2021 00:08:10G,1620862896,1,0,0
+198,27,0,1,10,0,0d992248dca34befa229091ae0ca3d78,f429ed0cd1bd42ed99fd3e957fd56834,05/13/2021 00:08:10G,1620862896,1,0,0
+199,5,1,1,11,0,eb1fe32088e349d1b289e94c22a4d039,016dc13f303d4641a91bf5ffd2fadc78,05/13/2021 00:08:10G,1620862918,1,0,0
+200,41,1,1,0,0,e9850e3c06304bd28694753c8eb47caa,5a5a3f6964654c049f99ad9e44c10ce2,05/13/2021 00:08:10G,1620862918,1,0,0
+201,6,1,1,1,11,9d481737823f43769288eb074b65ec44,4011e78be6b34d6f975af84eb6d9a9d9,05/13/2021 00:08:10G,1620862918,1,0,0
+202,40,1,1,0,0,3e71c68b42754f59ad886c243568b61e,ca5d6f24af854a38813a66c634d12946,05/13/2021 00:08:10G,1620862918,1,0,0
+203,27,0,1,11,0,da8e1bfcac8846f682dee462a43781da,d0289e7f85f249498e8fe3cdab5836dd,05/13/2021 00:08:10G,1620862918,1,0,0
+206,5,1,1,12,0,8954a1bb665c4b688b8f10e59561c8d4,00ff5bc5ec6c43cf84597ad136c0e7cf,05/13/2021 00:08:10G,1620862952,1,0,0
+207,41,1,1,0,0,4603fe5d96bc404caddbb14925b8eb32,a27e6098f690478585292f78a12008bf,05/13/2021 00:08:10G,1620862952,1,0,0
+208,6,1,1,1,12,6f83f7bf5c2b4a008a6cc7e3cb737686,f4fa28dedfed47289da09268507cccd8,05/13/2021 00:08:10G,1620862952,1,0,0
+209,40,1,1,0,0,cd8ede48c51a44258f39425a9a72af40,b861749ea1944ac68ea6160d9952e804,05/13/2021 00:08:10G,1620862952,1,0,0
+210,27,0,1,12,0,5c6bf8735fac47889871d0e85d2b570b,d6abb65e4c7040b2acd4f84efe7e1634,05/13/2021 00:08:10G,1620862952,1,0,0
+211,5,1,1,13,0,5a6398dc0cfa448d9ef649d95511c163,81b7e4f3b73a40d798118d3d16d12809,05/13/2021 00:08:10G,1620862963,1,0,0
+212,41,1,1,0,0,42b0c2af04054593bd3234ddea9a887e,089d265216e1416d9a808c0e51c9c20e,05/13/2021 00:08:10G,1620862963,1,0,0
+213,6,1,1,1,13,63707b4ea2224f41bdbe8cd83131e947,7194ea11013e48ad9abeeda52a8033eb,05/13/2021 00:08:10G,1620862963,1,0,0
+214,40,1,1,0,0,1dad512846404f409c31c02be9cd1adb,d0457ab8472f43a5b4c1e338f274f2e9,05/13/2021 00:08:10G,1620862963,1,0,0
+215,27,0,1,13,0,3d0c6804243f47cc835a3491bf3cd523,1ae9f112f5344387a70201374ddb5ee2,05/13/2021 00:08:10G,1620862963,1,0,0
+216,5,1,1,14,0,0d6809d85a9647f2887736391c65bd3c,cee6ce9701ac4e288278eaf212c91752,05/13/2021 00:08:10G,1620862971,1,0,0
+217,41,1,1,0,0,b6ecc54960ff41649d045b0ff5740056,ed7d80cd068d4f669a8f509ecaa1b7aa,05/13/2021 00:08:10G,1620862971,1,0,0
+218,6,1,1,1,14,584a7aa6b98e4186b0a22f7fd211120c,a653e4afe3204938919368c68e473db5,05/13/2021 00:08:10G,1620862971,1,0,0
+219,40,1,1,0,0,a919f08b16c242f195237b6a87bab12f,327d82207217483997aed64763c325d3,05/13/2021 00:08:10G,1620862971,1,0,0
+220,27,0,1,14,0,7acc08f84b62442bb8f55cd47c21d39f,db1c57d6d26643c7b9161f9132ec7368,05/13/2021 00:08:10G,1620862971,1,0,0
+221,8,1,1,1,0,4691289db1bd4d30b92a28cd3e10092f,c206aea4045643bb83fe680f0a362057,05/13/2021 00:08:10G,1620863037,1,0,0
+222,29,1,1,1,0,f787cc77f0cb45008ef3e826e1152c6e,a0d5f349167f42938d425135f6fe9894,05/13/2021 00:08:10G,1620863037,1,0,0
+223,1,1,1,11,1,7c44c71039b3443d83da006d83bb08d8,c67aad4a81ab4a09885ff6fdbf91b7f0,05/13/2021 00:08:10G,1620863055,1,0,0
+224,26,1,1,1,0,1a26467c343f412eb8ee42fb78df2727,cef7cfb833e043db874a91fb6cd7c64b,05/13/2021 00:08:10G,1620863055,1,0,0
+225,8,1,1,2,0,7059506d3ae142f394418bd028b80ea3,b08e99cc829845e599887ffa96fdc12a,05/13/2021 00:08:10G,1620863062,1,0,0
+226,29,1,1,2,0,c342be8f7c8a4b688a932eafa1ee4bae,33e7fd675b2a4b988b5c9f906a3ccbf1,05/13/2021 00:08:10G,1620863062,1,0,0
+227,1,1,1,12,1,ae67ed847e08499e9f64b0ec1fb62a3b,ada9408e05334e908f081ee1c7811f9e,05/13/2021 00:08:10G,1620863068,1,0,0
+228,26,1,1,2,0,381f3259bed04a7d9ef99b04388cf6f9,67ab7bc08de44c25bb0d11d7b9ab0177,05/13/2021 00:08:10G,1620863068,1,0,0
+229,8,1,1,3,0,dd3265c2c9f74bcdacdbdb21e2781817,df672ceafd904218aa9368fa0d9bda5f,05/13/2021 00:08:10G,1620863076,1,0,0
+230,29,1,1,3,0,113e672474344c048e6ed0fd6242b492,8ed6cce8dd054bba80c629976c61439c,05/13/2021 00:08:10G,1620863076,1,0,0
+231,1,1,1,13,1,d7e81f813a9540b49aea368a6cbfd0e0,2d4f2bc1951641e1b1eef5e2bfc30602,05/13/2021 00:08:10G,1620863083,1,0,0
+232,26,1,1,3,0,dec6e835fa8e413eb2e904e8ca50165f,4dabad0c9ca544ce94a7afea7fc2e7a7,05/13/2021 00:08:10G,1620863083,1,0,0
+233,8,1,1,4,0,2d22781241ed4954b8d0e555619ac506,d80d6c847d9c456f934a64e49780af1d,05/13/2021 00:08:10G,1620863094,1,0,0
+234,29,1,1,4,0,ff213a1299e84e5b81b8039c49d9cc37,c916c0819f024312abca7e334db34f9e,05/13/2021 00:08:10G,1620863094,1,0,0
+235,1,1,1,4,3,3359ed1e802940158f3d38fbc906575c,ec285f05e6e440c7811a9b098ed8e036,05/13/2021 00:08:10G,1620863101,1,0,0
+236,26,1,1,4,0,e3fa10ba859f46d6828eef825780bdf8,072598fb0c2c446487ab765e0e7fc3d2,05/13/2021 00:08:10G,1620863101,1,0,0
+237,8,1,1,5,0,e9a8bcc193d3408b8bedaadbff505215,b279524723e9445f9c23900ef1ba5fed,05/13/2021 00:08:10G,1620863215,1,0,0
+238,29,1,1,5,0,6175b618d4204cb0b0021221d8da9787,0076d6946da04ce6a288ee7a06a0fb0c,05/13/2021 00:08:10G,1620863215,1,0,0
+239,1,1,1,14,1,37b12a7bf17546f8a7933cd6d8d241e6,0313d5d3943645a8a50b9a9212b3d60e,05/13/2021 00:08:10G,1620863223,1,0,0
+240,26,1,1,5,0,e556ed936e4c4d7d817583b69eff7c8b,70b54c2506e04e289934af2146242418,05/13/2021 00:08:10G,1620863223,1,0,0
+242,1,1,1,2,7,bf1fcde2ba444d2bb3e973337e95ce6e,0e788a1ba02446469f5e52f6cee9f24b,05/13/2021 00:08:10G,1620863330,1,0,0
+260,8,1,1,9,0,6011f459da09432baae70b51acfbcdd3,4b52f9b0b44f47f5bfe095582c93075e,05/13/2021 00:08:10G,1620863354,1,0,0
+261,29,1,1,9,0,89b9c54c77d844209309e225688c3415,8ae4235acf014a5a8601a250f6d39084,05/13/2021 00:08:10G,1620863354,1,0,0
+262,5,1,1,16,0,0bce630a740a44d3bd1e9d0b8cd75ce5,4d000185ec7d49a7a3aa9efd09cbdd65,05/13/2021 00:08:10G,1620863354,1,0,0
+263,41,1,1,0,0,7247c33d0cba4b6fadb7447180c9715a,31973d494c9841b7945727f44e71a949,05/13/2021 00:08:10G,1620863354,1,0,0
+264,6,1,1,1,16,ec4c51d48cbb437d9b3086b1571c4841,4de019aba3974bad8bba809080dc9a8c,05/13/2021 00:08:10G,1620863354,1,0,0
+265,40,1,1,0,0,a4260e64c0544ac89266488ec3ee4712,2b4c7693e881466e8746dc2481bb79c7,05/13/2021 00:08:10G,1620863354,1,0,0
+266,27,0,1,16,0,3dbc957e651841c0a06255859d8ebfe4,72d2f840173f480f8f5ada3bd80354c1,05/13/2021 00:08:10G,1620863354,1,0,0
+267,8,1,1,10,0,6a5f7c026a784247941e112a06643698,0f31595e74e54bc684efe30af58b4287,05/13/2021 00:08:10G,1620863354,1,0,0
+268,29,1,1,10,0,d87d126d4b92492eb2a50929f4961c3b,476b4ccff5544317866945ae4d18affd,05/13/2021 00:08:10G,1620863354,1,0,0
+269,8,1,1,11,0,3bc9300bb5ae40d79c28e8233dc21a85,47c26ecdc9b7483caea12e9c0564e150,05/13/2021 00:08:10G,1620863354,1,0,0
+270,29,1,1,11,0,ae0ff478a2de423c8ba373ea5d743bce,8ce85464f91943e99d28fd9ec8e68207,05/13/2021 00:08:10G,1620863354,1,0,0
+271,1,1,1,1,16,240b8585298c40538f1a41a449a14477,2a1a00707a164021af9f75f77065d44c,05/13/2021 00:08:10G,1620863354,1,0,0
+272,26,1,1,8,0,ceaa0d91c97844afb68d59f889232611,5481db65c0c84ea69b392c1ff83d66b7,05/13/2021 00:08:10G,1620863354,1,0,0
+273,28,1,1,0,0,f615f613c5d84caaa69b007be7d28ba0,35d6ae9c07024895a4b39065c139c7a3,05/13/2021 00:08:10G,1620863354,1,0,0
+274,1,1,1,1,8,d649db156b0f42d8aba0777b249d09b4,2fdafd7ac9204de6a89923af9f00f1b1,05/13/2021 00:08:10G,1620863425,1,0,0
+275,1,1,1,2,8,162952ea3d9345df9d98518ae889af92,ad63e7b51bb24ae1a463679d489baece,05/13/2021 00:08:10G,1620863425,1,0,0
+276,1,1,1,3,8,a0a947c834254267ba560ef1ef340848,3ef700a80ddd4d4b88de8d8a25069310,05/13/2021 00:08:10G,1620863425,1,0,0
+277,28,1,1,0,0,5527ba316fdb4018a710a6f8a3a78427,1e10b154adf64c27bfaf27cfa23e5f1a,05/13/2021 00:08:10G,1620863425,1,0,0
+278,1,1,1,2,16,e36717ba46124ef08cb7d21d4ad65401,b298c2e98cc843388e16fa9e8e010008,05/13/2021 00:08:10G,1620863425,1,0,0
+279,26,1,1,9,0,cb1c964c7f414c6bbc7d2a5a6a9445e6,08566c55dcfb4a2d8c9f60e0143d934e,05/13/2021 00:08:10G,1620863425,1,0,0
+280,1,1,1,1,12,083e02fea1c9422197dae57278952621,ef9bf1ab132b4e08baa43ba16c3d8005,05/13/2021 00:08:10G,1620864432,1,0,0
+281,1,1,1,2,12,404c0ade320945bcb87b79cf1183b1d0,f120da2c15e74356841672181620c1e9,05/13/2021 00:08:10G,1620864432,1,0,0
+282,1,1,1,3,12,4d3dcff13c88469f8ec38011f8fe60fd,2fd69a0e57cb47c0877c4f576f92abab,05/13/2021 00:08:10G,1620864432,1,0,0
+283,1,1,1,4,12,bf95244048844feea3a0f84e4da86dc6,bb1db55ac1af4801b6083af567b3c95b,05/13/2021 00:08:10G,1620864432,1,0,0
+284,1,1,1,5,12,11dadb16cd794b62b5ff37fbfe0ec387,7d53c60d7be34747a71ecb9ae120573e,05/13/2021 00:08:10G,1620864432,1,0,0
+285,1,1,1,6,12,75b47d957d7a4a12ae1f4976324c1627,d56c4454a2334fe08801b999b4825833,05/13/2021 00:08:10G,1620864432,1,0,0
+290,1,1,1,11,12,3836105b0f994f1da79037787d120d7f,e7b1f0763bb24e89b15ab96034ca97e4,05/13/2021 00:08:10G,1620864432,1,0,0
+291,28,1,1,0,0,ba775f0ab38b4654bda488f9d4a36167,c5f9c09de1774e22ab32f971c05ae619,05/13/2021 00:08:10G,1620864432,1,0,0
+292,8,1,1,12,0,e6dd7dbef8c246a2b6b3db8b8414b21e,6ef3563e64e44c9980cba7b034133b37,05/13/2021 00:08:10G,1620864463,1,0,0
+293,29,1,1,12,0,90eda0773f9244f38746e4eb73e735f4,775d53238c724b399d8ee91546b5c04f,05/13/2021 00:08:10G,1620864463,1,0,0
+294,1,1,1,12,12,b6531b1f3ddf4b5e81cace530baa3c07,be5f823281dc415da5a6633169ff4623,05/13/2021 00:08:10G,1620864469,1,0,0
+295,26,1,1,10,0,d8c9e3d58ed74216ab380931214327c3,38fe39e0bad748e4a1e64ef5169f22cf,05/13/2021 00:08:10G,1620864469,1,0,0
+296,67,1,1,1,0,5406116955904dfa9fabfab7512932b9,f068d90e2938455fb2457dc6ee7851da,05/13/2021 00:08:10G,1620864490,1,0,0
+297,68,1,1,1,0,26a157046a824098b63fd07b610c4731,378286d1032949d4a7cc0fb6cdcf3dd6,05/13/2021 00:08:10G,1620864490,1,0,0
+298,69,1,1,1,0,1bfcf42e70f044ec996fd48b56c26378,43521778ae87438482cbccc2c868a5f6,05/13/2021 00:08:10G,1620864490,1,0,0
+299,70,1,1,1,0,4b36cf44200646b4ae22c2b8374efa6d,c95a63da4b8a484282d14f9bab8af7ca,05/13/2021 00:08:10G,1620864490,1,0,0
+300,71,1,1,1,0,8ee38f4fa86a452cab0e4024855d23d6,22c600bba23144378d08c202227da62d,05/13/2021 00:08:10G,1620864490,1,0,0
+301,72,1,1,1,0,8036769215e94e8a8db363ff9abf1f8d,f05a156e44d043039e7446d59f83fd7c,05/13/2021 00:08:10G,1620864490,1,0,0
+302,73,1,1,1,0,66c3581fb74643acaef39dfe1e70bd1a,f168af9c48f84b29b43378b85ccaf01f,05/13/2021 00:08:10G,1620864490,1,0,0
+303,74,1,1,1,0,341cff805b6e48fdaa3ee972b2a023e5,e9445cf7fa3f47288be20f55d17bd98d,05/13/2021 00:08:10G,1620864490,1,0,0
+304,5,1,1,17,0,afce1f13863e41038e14361dfa5d0a47,552cb952564c4077ab9ad86625953923,05/13/2021 00:11:17G,1620864547,1,0,0
+305,41,1,1,0,0,aa86473feba940999c6103f8b3a823fb,9ffe2a3641d04af5a0174f27d59a5eb9,05/13/2021 00:11:17G,1620864547,1,0,0
+306,6,1,1,1,17,3f2b58e1e05e4989af1c60e082eb47b2,e75d68bab7f04a35a44dcc721025b55c,05/13/2021 00:11:17G,1620864547,1,0,0
+307,40,1,1,0,0,ace68b7bc9e2444d969244957a6386c8,a2177e723ae04302b95eb3b387cfcd1e,05/13/2021 00:11:17G,1620864547,1,0,0
+308,27,0,1,17,0,54eaa392c4564f489a125dbf25a5ffc6,d9dae990809242aaa049af0fc65b4b85,05/13/2021 00:11:17G,1620864547,1,0,0
+309,1,1,1,1,17,69a803c2d3ab4fbcab003c2129dc552f,2afa1631d945426b8d20717aa95f7d0e,05/13/2021 00:11:17G,1620864554,1,0,0
+310,28,1,1,0,0,b4ed557f0a5b4839b630d374a59b2c24,bed69cb78b6e4cf78ba2d15d3e52e01b,05/13/2021 00:11:17G,1620864554,1,0,0
+311,1,1,1,2,17,78c3aa4a735744be81f8b43d76f76f07,dced6614909e4d6cb02c170b3a78e815,05/13/2021 00:11:17G,1620864557,1,0,0
+332,1,1,1,15,1,dd55a916a44542d9b3f1a1c744810e48,6e289ebdd4254be7b729a1e461c22358,05/13/2021 00:14:56G,1620864852,1,0,0
+333,1,1,1,16,1,79653d4a717744cb931cff770293554d,3970a1142fe04703ba7778a5307410a2,05/13/2021 00:14:56G,1620864852,1,0,0
+334,1,1,1,17,1,902d406be37f41ceb04ae4dd24f0f447,007d9fbcb5ed4c5e89807567764f625b,05/13/2021 00:14:56G,1620864852,1,0,0
+335,1,1,1,18,1,29beb0b3411e42e08efea0d6d8fcf222,81022493bd6e416db2b1d06b84c637c2,05/13/2021 00:14:56G,1620864852,1,0,0
+336,1,1,1,1,10,05768ae805d44663b4546070ccfe2832,fe10af55ff914466b0adcd4dd07f4560,05/13/2021 00:36:19G,1620865074,1,0,0
+337,28,1,1,0,0,9006df2920e84b098a3a37164145ef1e,61328c7c86c44142906236fb4a3a8d99,05/13/2021 00:36:19G,1620865074,1,0,0
+346,1,1,1,3,11,f8360c70c0644af6bbb5ed7b3f0f9ad3,dc7adeb3f8fe4141bfacbbffcf7a7cf5,05/13/2021 00:36:19G,1620865237,1,0,0
+355,28,1,1,0,0,22455a96aac0401088e1309f8b3efbc6,40c83fb470214fb594c705292ae71b86,05/13/2021 00:36:19G,1620865262,1,0,0
+362,8,1,1,21,0,af95462a252a4539a5089aca77fcea8a,3b9b20a7f28049a18d13f3510196a6be,05/13/2021 00:36:19G,1620865272,1,0,0
+363,29,1,1,21,0,80ae709e8a4a4d29a4566786c15cea2d,f0a4974e6d934403ab95321679c8ed4a,05/13/2021 00:36:19G,1620865272,1,0,0
+364,1,1,1,6,11,51efb37b0bcb45a09ca9ebdecc7b4535,b9b5fc494a7e44618a3d2e7a9d437412,05/13/2021 00:36:19G,1620865272,1,0,0
+365,26,1,1,18,0,536925f0a85b481dbfbffa9ed974b20b,cbdeac8f3b494c70853fcc5138755c02,05/13/2021 00:36:19G,1620865272,1,0,0
+366,28,1,1,0,0,acd50d74092643ef87e6e4de1fe22aac,abefc060104a44bca22e5edcdeb2a335,05/13/2021 00:36:19G,1620865272,1,0,0
+367,1,1,1,7,11,5c0fd51c79fb410f96e3851afbcdd364,5b61dd38867f4797b6cccab75048d0ef,05/13/2021 00:36:19G,1620865450,1,0,0
+368,1,1,1,8,11,2fd6fdaaf03141b3aef44ab5df7d6774,4c640eeec3cd4294909be91d694565b5,05/13/2021 00:36:19G,1620865450,1,0,0
+369,1,1,1,9,11,dcf720fd6dde42a1b29dca70ecf0633d,72968cff19cb4a8d85ceb86f350ca573,05/13/2021 00:36:19G,1620865450,1,0,0
+370,1,1,1,10,11,141d218840114e72b812ed3a47ba1aa2,e2d21c23b9a8489d97b3bb134929738e,05/13/2021 00:36:19G,1620865500,1,0,0
+371,8,1,1,22,0,fd41c90e2063495e9025bbc752a021a5,5e050771cef24a6eb429ee3536b42a8d,05/13/2021 00:36:19G,1620865518,1,0,0
+372,29,1,1,22,0,2078585d80dd4651972fd590572b601d,d1abe5187b714f15bc40ec964800fb5a,05/13/2021 00:36:19G,1620865518,1,0,0
+1180,37,3,1,0,0,5ffbf30b4ff3423b8720679af9fbae31,7b11cdd1fdf04dd791ecebf890e19667,05/13/2021 15:46:44G,1620916972,1,0,0
+373,1,1,1,4,10,cd46057ba85d4c0aa299ff2811b9668b,3e600adacf6941cbb43e81fea691a404,05/13/2021 00:36:19G,1620865518,1,0,0
+1181,37,3,1,0,0,f2d9c0d9dc2a4198847aa3b33b2155d5,ce58dedd15c64bab9bba3b3e911a48e1,05/13/2021 15:46:44G,1620916972,1,0,0
+374,26,1,1,19,0,9b4c7885b9ff4c07ad4481014667baf5,a155e53b7cf24d6ab988352766cd721e,05/13/2021 00:36:19G,1620865518,1,0,0
+1182,37,3,1,0,0,12619ea078794d51b3e8c1ec4b8501d8,d8cd399d338d4f3abf2f59e7666d4efb,05/13/2021 15:46:44G,1620916972,1,0,0
+375,28,1,1,0,0,2f5ab681c1be4c4586c986a7b8c093d4,1150d0c6598e41e48033264a7c9039c1,05/13/2021 00:36:19G,1620865518,1,0,0
+1183,37,3,1,0,0,37d154b80d4749c78e76332c09f873aa,5b85557fbabf4d8a8f20945d3a115d62,05/13/2021 15:46:44G,1620916972,1,0,0
+1184,37,3,1,0,0,1878b1dba1494f31aeed4e8a2ed949df,6bf9c99da3eb42f1bae15192e644ee5a,05/13/2021 15:46:44G,1620916972,1,0,0
+1185,37,3,1,0,0,f5fd32a969c54f3a914a4144c332581c,4f3907759661440d8d0879836375e0be,05/13/2021 15:46:44G,1620916972,1,0,0
+1186,37,3,1,0,0,6e7f8040631c4c3b84eb42312600c337,410793d791e040778c74181fd47c38cc,05/13/2021 15:46:44G,1620916972,1,0,0
+1187,37,3,1,0,0,11c18c42280149b1ab75ef694c8c7cd5,725ae40f28884f56808c8ef64e8a38d7,05/13/2021 15:46:44G,1620916972,1,0,0
+1191,37,3,1,0,0,7d1bd5e61fa544a4946ce839e90eaaa5,7270b25217954f88ae6548e744cd5bff,05/13/2021 15:46:44G,1620916972,1,0,0
+1192,37,3,1,0,0,22b2d8e99ac545168ff331a5db000cc8,08f392758b0340618e3f6449ad30508f,05/13/2021 15:46:44G,1620916972,1,0,0
+1202,38,3,1,0,0,b1742d145a394deabdd09961c38586ca,724eeb619bfb49a5934c80f7195f9b0e,05/13/2021 15:46:44G,1620916972,1,0,0
+395,8,1,1,26,0,a8fec048e7f8466d8b5d511b5823cb5f,ea7ccf3e94fe4655a16ceeb360157f8b,05/13/2021 00:36:19G,1620865799,1,0,0
+1203,38,3,1,0,0,1a7f3e88e6834a099cdb72d026ae6d23,1cfd960f086443f48c5d6157e2a10252,05/13/2021 15:46:44G,1620916972,1,0,0
+396,29,1,1,26,0,73ded34399504b4797d72c729aaedf69,b83e676534c9486292ca5b81f689cb6c,05/13/2021 00:36:19G,1620865799,1,0,0
+1204,38,3,1,0,0,a5acd5e362a24d40a3a9a72c94512573,38c9a0be4c77462aa64ea499b0a27f60,05/13/2021 15:46:44G,1620916972,1,0,0
+397,1,1,1,6,13,ca66b189215840b191fb64928ee6d324,649eb89b72814a8483a5473ffbeb759f,05/13/2021 00:36:19G,1620865799,1,0,0
+1205,38,3,1,0,0,42739fb0c0054fb39ca1f39c5746786b,52beb5dc1cb54b89a4d5fe85a92ecb46,05/13/2021 15:46:44G,1620916972,1,0,0
+398,26,1,1,25,0,27174ccce97b4c2cbca0d996915a439c,3a3fced3f90742a39a45f7eb2ca732aa,05/13/2021 00:36:19G,1620865799,1,0,0
+1206,38,3,1,0,0,e375d7c60fa1495e8b6d9068a873c21c,a9511dce45924419881fd3cfd45b574d,05/13/2021 15:46:44G,1620916972,1,0,0
+1207,38,3,1,0,0,12dd4bd4fa0c4c618272a4dc771c1377,3473848f38764503b238de1fe2b94e5f,05/13/2021 15:46:44G,1620916972,1,0,0
+400,1,1,1,7,13,91e9918e997a4101b052424225d68801,40d3f08955fa44b4bdc27ae1565e34c9,05/13/2021 00:36:19G,1620865845,1,0,0
+1208,38,3,1,0,0,fd09ac2913cf453ebaff39be37ebd864,ce0d8231b7fd4eecb48a205b5f9a656b,05/13/2021 15:46:44G,1620916972,1,0,0
+1209,38,3,1,0,0,79fa2c1e8be94f0baa280a4c7a8c43c5,f4ef567a147d440d82d94735c1a0530b,05/13/2021 15:46:44G,1620916972,1,0,0
+402,28,1,1,0,0,91acd9fa263b450c86ecd4919b17c936,1a0fd057043d448aaf0ed29750706e48,05/13/2021 00:36:19G,1620865845,1,0,0
+403,28,1,1,0,0,f01405a5bdc64ee2a8a41cfc72a1bcbe,cb26d9381d5a40ffacf95dcefb4ad971,05/13/2021 00:36:19G,1620865845,1,0,0
+404,8,1,1,27,0,b00ec8e8356c4336888585756b709416,a4bafbffca5e4a339ca3317b11e08fd4,05/13/2021 00:36:19G,1620865863,1,0,0
+405,29,1,1,27,0,2dc2f7a2b570490faef7d372861936a1,e3202fac98fe49e882f699d0e63d3033,05/13/2021 00:36:19G,1620865863,1,0,0
+1213,37,3,1,0,0,149539efa0454d43b16f04e832d1d49a,0caf7a9aa6624ac8adcc5fc8b497d1e3,05/13/2021 15:46:44G,1620916972,1,0,0
+406,1,1,1,8,13,6538030c0d5e4bb9b62b283742d62a44,26871fc76a794069a533b452e2831800,05/13/2021 00:36:19G,1620865883,1,0,0
+1214,38,3,1,0,0,553c2ae449db441484bea2780b126bdc,78b0cd7fb9564d79b7db325bfe1cc4f4,05/13/2021 15:46:44G,1620916972,1,0,0
+407,26,1,1,26,0,a1495a5c85c849b4a5b6a7a11a6abaaf,f536e7bf58204a70b1fbfa2463d61639,05/13/2021 00:36:19G,1620865883,1,0,0
+1215,38,3,1,0,0,8c0990d46eb34b478ec9fc197d0ae3cc,aef72c9a8605442d9264125b44042e67,05/13/2021 15:46:44G,1620916972,1,0,0
+408,1,1,1,9,13,50ce26850f754bf7b6fb9f6ecd57f8e0,d2c71525447f4912a8c7f1625a741064,05/13/2021 00:36:19G,1620865883,1,0,0
+1216,38,3,1,0,0,3a3806b4132f4534b0aa4ea5cbf27cae,5afa434fd47149389985d37af1323575,05/13/2021 15:46:44G,1620916972,1,0,0
+409,26,1,1,27,0,70f0c17ac77745d890d4430f9134f592,72ec8f12ea844dc1a9ec0c8dcaba2874,05/13/2021 00:36:19G,1620865883,1,0,0
+410,28,1,1,0,0,059deacfd6f0454b8bf901385a496fbb,d6a5bc20a37642fe881e034cdb1373e2,05/13/2021 00:36:19G,1620865883,1,0,0
+1225,38,3,1,0,0,8476596da08a4346b0ca5109bdb7f25e,a7d341bfad974822b712b961613c45aa,05/13/2021 15:46:44G,1620916972,1,0,0
+419,8,1,1,29,0,28aa79aba5a8420b9ed2b687b2f2e67d,fbbbf209373f4651951dcdda65873acb,05/13/2021 00:36:19G,1620865947,1,0,0
+420,29,1,1,29,0,a6bd4324763843f38d73067f5d3e6d33,93be689d79dd4df19cd18c1e2015dfb9,05/13/2021 00:36:19G,1620865947,1,0,0
+421,1,1,1,12,13,571749cb5ca348028a0fdf88b912762a,41f957e6ec484062a33841e19fc16e7d,05/13/2021 00:36:19G,1620865955,1,0,0
+422,26,1,1,30,0,916bdf3054d544ae811bfb1a6008fef2,a582849b4d0b48b0a36bf17d195eb4ec,05/13/2021 00:36:19G,1620865955,1,0,0
+423,1,1,1,13,13,402dc0370fa442ff9fea14cfbe616a7f,9ad5643242be4d609090214616bb7046,05/13/2021 00:36:19G,1620865955,1,0,0
+424,26,1,1,31,0,c26d9304bc1c4269b20cd2f7acd545bd,0ed31cece64a4c428457490c0e2eb36e,05/13/2021 00:36:19G,1620865955,1,0,0
+425,28,1,1,0,0,3b90f182c8f1494d9564e2a8fe4e2909,99e70f9b4af5410e9347efc8d8c293d7,05/13/2021 00:36:19G,1620865955,1,0,0
+426,1,1,1,14,13,4775c4f83db74ad1905de0b61fc5a589,0a7d7433b7a546a3b5208fdd53b78580,05/13/2021 00:36:19G,1620866177,1,0,0
+427,1,1,1,15,13,98c4820fdb2c4fbe8b88e2ca14146a5c,189433bb0ba145c0b304c5e283f510ec,05/13/2021 00:41:27G,1620866484,1,0,0
+428,1,1,1,19,1,ce0f0e79ab774e158ec0c8b157c098b0,463abd7eaa5d4f2698eef9a88e7c34ab,05/13/2021 00:43:12G,1620866532,1,0,0
+429,1,1,1,20,1,13c9fa0a1efe4d839b770ff108e24be4,23ef5949eb5c499f852f04515de74dee,05/13/2021 00:49:04G,1620866918,1,0,0
+1239,38,3,1,0,0,c23def6ee0904aa4b4a36ce6dc8888af,b679cfd5d54e4ccd867978d15cdc64c7,05/13/2021 15:46:44G,1620916972,1,0,0
+1240,38,3,1,0,0,86b4f1d7756b4d38b724daa36147b6ac,97c942f1884c4439b6b85e8bba595e6a,05/13/2021 15:46:44G,1620916972,1,0,0
+1241,38,3,1,0,0,65c2bd728a6549e398dabeeb8b9a75a8,1133db7c83b44ea6bd7e53a678d5ad2a,05/13/2021 15:46:44G,1620916972,1,0,0
+1242,38,3,1,0,0,caabda226c404a34bd5996efca9322a8,2f61b224dee145ec9bf495eeee1b8ce2,05/13/2021 15:46:44G,1620916972,1,0,0
+1243,38,3,1,0,0,e84cb747dbdc4f658838941d71be6cfb,39be10135a5c4c30965dd319f83c519a,05/13/2021 15:46:44G,1620916972,1,0,0
+1244,37,3,1,0,0,68d8067ddc6a4f3dbb9a7aa01333e048,17dc0f9a4140412a92513cad857e7010,05/13/2021 15:46:44G,1620916972,1,0,0
+1245,37,3,1,0,0,34b06107b4b6488e8fe1460f11edeea6,36e963ab0b404c4d871827da380ce788,05/13/2021 15:46:44G,1620916972,1,0,0
+1246,38,3,1,0,0,8eb8cb24dc6f449195b368be772cedb4,1dae0fb4884f428e896723d5f8348faf,05/13/2021 15:46:44G,1620916972,1,0,0
+1247,38,3,1,0,0,ff6b1010b81342cca2148b0959463a2b,4c501702cd69431daf732537ac9d9fb1,05/13/2021 15:46:44G,1620916972,1,0,0
+1248,38,3,1,0,0,70c610a4d9044d51a76e6d0cb98a5741,2ce48aab4d3e4ac6b4c4a94fa2e673af,05/13/2021 15:46:44G,1620916972,1,0,0
+1249,38,3,1,0,0,34c3b7f9911d42dc8e9ce3c589efa4dc,302d6311fca64ab0b6b30079a9aaa8d1,05/13/2021 15:46:44G,1620916972,1,0,0
+1250,38,3,1,0,0,408de0ad73084fde937ee71ba8da021c,d1ceff5477774f8a867d3847c5abe97e,05/13/2021 15:46:44G,1620916972,1,0,0
+1251,38,3,1,0,0,d5798f213e70442db95393c6734fcf66,385c07a1dd6d461f8c32e75254afe3a5,05/13/2021 15:46:44G,1620916972,1,0,0
+1252,38,3,1,0,0,086f5e36a9174499af687fe8100a3d35,763654787eab418cb80b612014872f4e,05/13/2021 15:46:44G,1620916972,1,0,0
+1253,38,3,1,0,0,4b660e47cd23419a87eb6045055b49d5,ac159b00aca74bb4993b65869a1ed4c9,05/13/2021 15:46:44G,1620916972,1,0,0
+1254,37,3,1,0,0,502f16677b96403a8ea5e4865ceb0570,ee4e8cad594940c9a0cced8a2f3ca018,05/13/2021 15:46:44G,1620916972,1,0,0
+1255,37,3,1,0,0,c9e141fd5afc44b49f5726886dbfd971,13e8f6c299be436f943ff4e6f0eb6025,05/13/2021 15:46:44G,1620916972,1,0,0
+1256,37,3,1,0,0,07a26e24bd8c4f9492628f336286f4a0,7ec98e6c8f634394ab991fcd205bd836,05/13/2021 15:46:44G,1620916972,1,0,0
+1257,37,3,1,0,0,b85c1122556b4ba9af0b87bf76af62eb,349fc439c5a3422983dd983f07f70b7a,05/13/2021 15:46:44G,1620916972,1,0,0
+1258,37,3,1,0,0,8fe4bd01cb714c06bbb3a40aa87fb97e,27ca2f48905a40529484f999b0ef2b0a,05/13/2021 15:46:44G,1620916972,1,0,0
+452,5,1,1,20,0,6eeb47a434f5465b9330d9a05a3fe05b,bc0f9fd5c3fc4796a53a1f9b05025658,05/13/2021 04:27:58G,1620879286,1,0,0
+453,41,1,1,0,0,9446c23a850c41e4bbf1a175b5b77fae,db12a9999c46474894a1314d7ef71f9f,05/13/2021 04:27:58G,1620879286,1,0,0
+454,6,1,1,1,20,018ea687fb454fca816245ca22124557,7c162b473b304a0581d1d412e0eaac5f,05/13/2021 04:27:58G,1620879286,1,0,0
+455,40,1,1,0,0,42b7b3ea9e4e43ee8fd9c15ab69e4db0,bcb7a8351fcc4a49988957e9c034583c,05/13/2021 04:27:58G,1620879286,1,0,0
+456,27,0,1,20,0,8b929dfc53214ce1a740ed5cac845ea5,7ca9182b394b49f1a4dad961a8b46670,05/13/2021 04:27:58G,1620879286,1,0,0
+457,33,1,1,1,0,702ed9c68e34450da7940a1e23e79599,eead67edfb9546dca478a984a678d91e,05/13/2021 04:27:58G,1620879298,1,0,0
+458,34,0,1,0,0,d196bc9e37014ec58d0bd67b613a7744,94ed726c37484750bb6def0ac6f10050,05/13/2021 04:27:58G,1620879298,1,0,0
+459,8,1,1,34,0,a04cbd347fc6450890eb265dcc52f4f2,2e5f8914ef3a454c9ea16937d0f215d8,05/13/2021 04:27:58G,1620879298,1,0,0
+460,35,1,1,20,0,6a8d756574eb47cc87fec5e71c0da94e,a21fc4b2cd3f48bdb03a5be2c879294f,05/13/2021 04:27:58G,1620879298,1,0,0
+461,29,1,1,34,0,fdf6ee6a532941d6b90317a562a052ad,d070b0acc0a6467baa9c8f35aa582618,05/13/2021 04:27:58G,1620879298,1,0,0
+462,1,1,1,1,20,c38fbcaf794f40a8be3df6f074de754d,70b04a76cf54455aafbf0c6e09cfb429,05/13/2021 04:27:58G,1620879298,1,0,0
+463,26,1,1,35,0,9076622b97a940e2973ffc68d2e2d1b0,475d54562d154302b0df5dec4b1e3f39,05/13/2021 04:27:58G,1620879298,1,0,0
+464,28,1,1,0,0,d3773991a8fd45d8a2bf6d54d04e2d36,b092977a31e04302b463af59cc0f2585,05/13/2021 04:27:58G,1620879298,1,0,0
+465,5,1,1,21,0,51ba03f24f444c0980dd2dc4d82c31d9,4699b09ffa5b4794bb7c1d23f8b95b4e,05/13/2021 04:27:58G,1620879310,1,0,0
+466,41,1,1,0,0,9cffeeb9529540148ee0c28e717f2943,c040fe6b5a1344018d3cbab218596a19,05/13/2021 04:27:58G,1620879310,1,0,0
+467,6,1,1,1,21,a3f075094d02471781c008c881b5c276,ef8fbd3e22da44e6a008dbead1837e54,05/13/2021 04:27:58G,1620879310,1,0,0
+468,40,1,1,0,0,a2f9ef6029c44e1382120cca988ab4fc,adea823d93f549a087621d8fe75431ff,05/13/2021 04:27:58G,1620879310,1,0,0
+469,27,0,1,21,0,43006ce298b14468beb380bce1c61d1f,01090dc871014f91a68fb3bcb537e40b,05/13/2021 04:27:58G,1620879310,1,0,0
+470,8,1,1,35,0,9166c78188bf4e4fa219aa23019b9a22,ce84d9c7bca3482484b5c91d0581f509,05/13/2021 04:27:58G,1620879321,1,0,0
+471,35,1,1,21,0,46b65c73267a4d37b96b0e9359ede797,b224eef7e0dc435bb03ee1aa87161620,05/13/2021 04:27:58G,1620879321,1,0,0
+472,29,1,1,35,0,3fb24c51d0124eb089986f22bf8d940f,fa8744cc6d4b4b53ba358a927e567d9f,05/13/2021 04:27:58G,1620879321,1,0,0
+473,1,1,1,1,21,39591a9f6e7249fea78d5b4f5d3ff60b,53f4be38e34d4c87a2ae22b89109c8ae,05/13/2021 04:27:58G,1620879321,1,0,0
+474,26,1,1,36,0,ac39c6befb384ab291a232ebc7a0bf32,813f83e588724ef2b03b1097ada50b29,05/13/2021 04:27:58G,1620879321,1,0,0
+475,28,1,1,0,0,2ad4a88c93b64e87b2f1218938f91f93,1381d941592e452f98c5640171ea821b,05/13/2021 04:27:58G,1620879321,1,0,0
+476,1,1,1,2,20,89db06df04064c3a8fdda8061a5abbf8,7a80bd20556f45e8a455852b4f4a2043,05/13/2021 04:27:58G,1620879368,1,0,0
+477,1,1,1,3,20,02ddd6be29ca4b2e873674e7dc901844,22896aba9c5b41e28343862147f1b616,05/13/2021 04:27:58G,1620879368,1,0,0
+478,1,1,1,4,20,c0cd1d2b9bd244d09a89121dfdac3d91,0ded89051be4432a9b3d053b9c13a685,05/13/2021 04:27:58G,1620879368,1,0,0
+479,1,1,1,5,20,90c1a3989d484acabbf8cb68c80c2a91,9ed667ef359d4c98a4707c091276ce96,05/13/2021 04:27:58G,1620879381,1,0,0
+480,5,1,1,22,0,c4222043aa7544dab3e78566e65b75b2,d33f8f0830a94cda935e3528ba4cefd7,05/13/2021 04:27:58G,1620879439,1,0,0
+481,41,1,1,0,0,0606d13add284ae4902d4957d2c03e5a,96e8d894ebf7451f879086ac13710c88,05/13/2021 04:27:58G,1620879439,1,0,0
+482,6,1,1,1,22,54badd7e2eac448fb483376388cd436c,9427441902c7412d89c02914b5394acc,05/13/2021 04:27:58G,1620879439,1,0,0
+483,40,1,1,0,0,cecdbc5e4b1049e08bb81514dc8f1e08,3d9e5873f2054776ae6909698fef0ee4,05/13/2021 04:27:58G,1620879439,1,0,0
+484,27,0,1,22,0,ba3925a72e214b5da871e044e8c8660a,0bb08e4a99c84c5a9c6bda7dec72eae7,05/13/2021 04:27:58G,1620879439,1,0,0
+487,8,1,1,36,0,24b5ac8512354ac2b698f60ce9f358bb,26cb4bec40fe47f49a2a50314ca13d94,05/13/2021 04:27:58G,1620879451,1,0,0
+488,35,1,1,22,0,db02be14930f4301adb6327233031371,d63dc7b9b062431aba7c549bdf5b23ae,05/13/2021 04:27:58G,1620879451,1,0,0
+489,29,1,1,36,0,cff8ed53fad241e6b33fef0fde1f21e6,7dc5b87956624c11b12520a41daa9fd5,05/13/2021 04:27:58G,1620879451,1,0,0
+490,1,1,1,2,22,9557176cba3e4d79aa8edb98b52895ec,a43818f560e64709962ba6916fcf79e0,05/13/2021 04:27:58G,1620879451,1,0,0
+491,26,1,1,37,0,8acc825076c14606bff41c97ef262b4f,0759064e67604527a88ed8b4bb722731,05/13/2021 04:27:58G,1620879451,1,0,0
+492,28,1,1,0,0,58de6146ac43432194c8ca84c16feb22,2959360d08cb402a9df62a91f132d4f6,05/13/2021 04:27:58G,1620879451,1,0,0
+493,8,1,1,37,0,7ebd0e4c65474daaa7bde851d5d067be,bb25bd71a77f42bc8c3abab8b4118787,05/13/2021 04:27:58G,1620879803,1,0,0
+494,29,1,1,37,0,5b8e26e326a84c8c9a4a1273c478cc31,6029206921664df99ac678e565796baf,05/13/2021 04:27:58G,1620879803,1,0,0
+495,1,1,1,3,7,5bba8a59a3354a489aad400f2f3c56ee,2bf1fd02e54a4134a787eda04a4cd4c0,05/13/2021 04:27:58G,1620879811,1,0,0
+496,26,1,1,38,0,e51263adbc35453089e242a3a71c92a3,97b866133161475396cfd4bafe7c3d47,05/13/2021 04:27:58G,1620879811,1,0,0
+497,28,1,1,0,0,48b464767fdd4a06a5798fdb4e51c8a1,fc3cef58b22348cb8090ec06691de08b,05/13/2021 04:27:58G,1620879811,1,0,0
+502,8,1,1,38,0,e63e27d3ae104759a771065c31b2ca52,2ad563b35af24cd1aae1e80b234b9e0c,05/13/2021 04:27:58G,1620879859,1,0,0
+503,29,1,1,38,0,0f581fbdd525464e8602db55bcf2c04e,5aeaa901e9074effb2860f33f503f327,05/13/2021 04:27:58G,1620879859,1,0,0
+504,1,1,1,4,7,f49245989df144629fae0f8fedf25420,bf56d0d6ca9841ec9f3c0a4ef76b8038,05/13/2021 04:27:58G,1620879859,1,0,0
+505,26,1,1,40,0,226410bd1b734e19b74ddfaed9064df4,6fd36bff39d04aca865d225dd8753854,05/13/2021 04:27:58G,1620879859,1,0,0
+506,28,1,1,0,0,582b93bb1931433fb3bf303541f6be10,5d206868a7d74e34ba57180dc8c35d17,05/13/2021 04:27:58G,1620879859,1,0,0
+507,1,1,1,2,21,75c503c491d54a8280b756940dc71744,beb311cf991d4075b784cb4367437668,05/13/2021 04:27:58G,1620880043,1,0,0
+509,1,1,1,4,21,5cda6277dcb44fdb9b3c4ee35702d3d8,2e21b60f08eb4d0e92588d177c4cbf99,05/13/2021 04:27:58G,1620880068,1,0,0
+510,1,1,1,3,22,a77808938d344df8930ecd9ceecaaa67,8ce4e37d8e7f4d93bfc986324104b49f,05/13/2021 04:33:17G,1620880146,1,0,0
+511,1,1,1,4,22,f2c2cb117d814fad8a55adc5ca296685,db8f344dc7154f27bbc30816c6612d60,05/13/2021 04:33:17G,1620880146,1,0,0
+512,1,1,1,13,12,d7c9da8aabd94012b4951043bba33f02,5bff6f3de29c4bc88a04b06aaa3bb1b7,05/13/2021 04:33:17G,1620880192,1,0,0
+513,5,1,1,23,0,6b5a4201a3464882b63a4e6e1f1d4878,8c23ec3a9e5a4095a79dfd47335d8f04,05/13/2021 05:03:53G,1620881744,1,0,0
+514,41,1,1,0,0,026e38a919604db39c9c47459fd832d8,11712ff1603d4f5fa0f0f2d1ece10817,05/13/2021 05:03:53G,1620881744,1,0,0
+515,6,1,1,1,23,e6980b6ff5404ab2b9c4383f9269ba80,2c7045bd3a384c489712a689c71866cf,05/13/2021 05:03:53G,1620881744,1,0,0
+516,40,1,1,0,0,45d48d4f1abc49c3944bf96c06a2133d,22a0906a5d244279a822ca3020c8b607,05/13/2021 05:03:53G,1620881744,1,0,0
+517,27,0,1,23,0,21d3b90001f94e3ebc0e6719b02ae304,30d922a8a9624b7daa59e3ab15bc09c4,05/13/2021 05:03:53G,1620881744,1,0,0
+531,1,1,1,14,12,764f5d7e9c0c43c6b702ba0710784bfd,fb10af8e5b13434881fb0a5078353563,05/13/2021 05:03:53G,1620881847,1,0,0
+532,1,1,1,15,12,da2d56ce55624e4ebb0a3d56aba9402e,0c04faf21a7e4cf6a57b0f9ba7b0e0cf,05/13/2021 05:03:53G,1620881906,1,0,0
+538,8,1,1,43,0,95f10e370abb49aaba5dfeff734bc1b1,c07862ed03864978b489c3aeebdded2f,05/13/2021 05:03:53G,1620882076,1,0,0
+539,29,1,1,43,0,2c92202689374abeaa57abe5494d5b41,8e58aaec292740b7a0673b75d7cdfb5c,05/13/2021 05:03:53G,1620882076,1,0,0
+540,1,1,1,2,14,b682474f8d914db6803c6a4041aa4bb9,e51471e414b0487ca5e1e0ba8d10753c,05/13/2021 05:03:53G,1620882076,1,0,0
+541,26,1,1,45,0,637f9e8031f04863abf3d74058e33c5f,193163462ad24cb6a11aceaf5bfc8724,05/13/2021 05:03:53G,1620882076,1,0,0
+542,1,1,1,3,14,495b456baa2d47429b05c9bab586b7ab,04b71e0e5ae24983a80aa7287f495417,05/13/2021 05:03:53G,1620882076,1,0,0
+543,26,1,1,46,0,6074a83fa6384d649547fcda292a1fe6,94f4f7b4ffb84efdae0392f454d94263,05/13/2021 05:03:53G,1620882076,1,0,0
+544,1,1,1,4,14,be9bf74f7d304139b35ee7e1e077bf85,f6df57b95021498088a52aaedb9e7663,05/13/2021 05:03:53G,1620882076,1,0,0
+545,26,1,1,47,0,db7be5fba0804428ad3d7a06a6d40bd5,95fe4769e4ee4d728104832579b00370,05/13/2021 05:03:53G,1620882076,1,0,0
+546,1,1,1,5,14,072a7b09d3f84068845869f2da32dd05,19d19eb179954bcc9f4b899c6746e2cf,05/13/2021 05:03:53G,1620882076,1,0,0
+547,26,1,1,48,0,2997aea00b004d3b96aa54f5fd4a6fe4,fc44cf38b01e4a3fa35b69508f7b3b46,05/13/2021 05:03:53G,1620882076,1,0,0
+548,1,1,1,6,14,d2190c73cd7a4b1e80a6da0648904815,a544bdec100b4544af9fa97439984fe0,05/13/2021 05:03:53G,1620882076,1,0,0
+549,26,1,1,49,0,33384ac28075458aaa91cda588c2bc86,ea563c0f13b94800a10f0475ca3baa75,05/13/2021 05:03:53G,1620882076,1,0,0
+550,1,1,1,7,14,347ccb9366ac468088531de23d8dae5f,2227391d90604863980a4093477f2b3f,05/13/2021 05:03:53G,1620882076,1,0,0
+551,26,1,1,50,0,d7316100c0924bf0ba1d2ab1c59b5bf0,821cbbd3112e4934b6c7ab5141c65800,05/13/2021 05:03:53G,1620882076,1,0,0
+556,8,1,1,44,0,b0ab08dd81464600a31274d87222ecfe,f874375dddc54c6eba567fb8848da3dc,05/13/2021 05:03:53G,1620882098,1,0,0
+557,29,1,1,44,0,72ce0278a5154ad392c0e1e617851ab7,24b3d579772941bf9adae52d280b45a5,05/13/2021 05:03:53G,1620882098,1,0,0
+558,1,1,1,8,14,953747b9da334ec4a8d68ba091d4adc0,d606bd559d0c4d4387432d1bc06257fa,05/13/2021 05:03:53G,1620882098,1,0,0
+559,26,1,1,51,0,e6831b96e9b941a0a681690105898125,e8c499a12fa84cf39c3293cebf587261,05/13/2021 05:03:53G,1620882098,1,0,0
+2176,1,1,1,21,1,6f7e1f02baf943889930d180cbda21f8,651fd24d169447099974d8096b3461ac,05/13/2021 16:40:26G,1620923690,1,0,0
+561,1,1,1,10,14,b0d537be3ade4c58a56846983375448f,97c1b76d93dd4ae0bcaebb5de1ccda11,05/13/2021 05:03:53G,1620882211,1,0,0
+2177,1,1,1,22,1,97815a2a084a4d1ba3d003115b922b3f,8a91b22ecd2442daba418c315aefe0b6,05/13/2021 16:40:26G,1620923690,1,0,0
+562,1,1,1,9,14,157b214fc8ab419c9a09f62f9a2331ca,6175a955f224440e90c64ba6d4141d69,05/13/2021 05:03:53G,1620882211,1,0,0
+564,28,1,1,0,0,2c4e88043c074a93a1a78510b04813c8,51f8ce9302f74a7f9ddb80a1d8962c2e,05/13/2021 05:03:53G,1620882211,1,0,0
+565,28,1,1,0,0,b3318e8292ea4a00aeb0cb34bf07a02b,0dd5186ccb1b467284fe7eee5d7f4e63,05/13/2021 05:03:53G,1620882211,1,0,0
+566,28,1,1,0,0,fd7cafcd82ca429a9ee5455aa137ffd5,7ae8b681b0b346b7a3f57205f437cf79,05/13/2021 05:03:53G,1620882211,1,0,0
+567,28,1,1,0,0,7063f217da3b41579a5f11fee4cd13e0,17687edabfea4c0fa27ee694e617ea35,05/13/2021 05:03:53G,1620882211,1,0,0
+568,28,1,1,0,0,7d58fdffd1c54144b3b328ef1afb3560,425ca9fb0150486c9ae6f63dfb3fdb25,05/13/2021 05:03:53G,1620882211,1,0,0
+569,28,1,1,0,0,847fcac5fd0d4f40bce215b521c40f14,5dc491928a8643e690232a352d290a6d,05/13/2021 05:03:53G,1620882211,1,0,0
+576,8,1,1,46,0,6baa2937a74f455fba614ae2d843d574,23032e5de0274a6ba3bdaaea30c5c0c5,05/13/2021 05:25:34G,1620883405,1,0,0
+2192,53,0,1,0,0,0e638cf66bed4cae9827374e58ad2a12,5e07a00577df4e7fb55db1ccc59f0074,05/13/2021 16:40:26G,1620923769,1,0,0
+577,29,1,1,46,0,1bf5a65f04824c7e8075de7c4c936c59,615e9b8c51184b6894c45d215462cb04,05/13/2021 05:25:34G,1620883405,1,0,0
+578,1,1,1,5,23,43136bb85c9d404381dfc3244f08a601,7b0d39fcf52d4996b661c34b3675f6f7,05/13/2021 05:25:34G,1620883405,1,0,0
+579,26,1,1,53,0,a09ed6f6c02041f7b3b06843e6ae7749,448180f8178b42058f7a0f701781c2a8,05/13/2021 05:25:34G,1620883405,1,0,0
+2195,53,0,1,0,0,f965d03d084f42b5bb649be1c3753b7c,da5db1c481c7471da3ee05f2dbf3bc10,05/13/2021 16:40:26G,1620923769,1,0,0
+580,28,1,1,0,0,81311b6bbec64e59b0454c53217a5fb4,1d468986ab6f4b9482a963db096647cf,05/13/2021 05:25:34G,1620883405,1,0,0
+581,8,1,1,47,0,8aee42f3bfb5421c9ed114aaa2b36058,5a47c9a54cdc4a9895f931c41ed52a06,05/13/2021 05:25:34G,1620883461,1,0,0
+582,29,1,1,47,0,41715724133b47229c86de8fb296effe,a3419c8562bb40e88e50d822128b158c,05/13/2021 05:25:34G,1620883461,1,0,0
+583,1,1,1,6,23,58c126ad3f1144f9ae72979541afa0de,c31651477a7349d89df1722798ba4029,05/13/2021 05:25:34G,1620883461,1,0,0
+584,26,1,1,54,0,535f9d5ac20a442abd18f2609a7d19de,c25758a3d1e74a2ca3c5f41db91a7f43,05/13/2021 05:25:34G,1620883461,1,0,0
+585,28,1,1,0,0,f8c80c01d0a849b1be371f7e9cf1be3d,be987ae233e749b0b2ef4be064a2e1b1,05/13/2021 05:25:34G,1620883461,1,0,0
+586,8,1,1,48,0,f374627180494e76824678416e7eb17d,ed7b184bc3eb42de942c3bae42f8ac96,05/13/2021 05:25:34G,1620883504,1,0,0
+587,29,1,1,48,0,3167fcb1c9da4e058e86aec4493ded46,8e8c4fed3b9048828bf3a5fc701a4d18,05/13/2021 05:25:34G,1620883504,1,0,0
+588,1,1,1,7,23,2e003dacc1a44061b89b5db5101f26e5,ba14f7bfd083476db064e60c6b488fa4,05/13/2021 05:25:34G,1620883504,1,0,0
+589,26,1,1,55,0,18b36f3181d04f37801daf71e53d49b2,509de5a00b194313b7280e346b03f805,05/13/2021 05:25:34G,1620883504,1,0,0
+590,5,1,1,24,0,779a67e596ee4b4cb4c871894d4f05c2,db1a7271c7c14601ae1a7f4c23c1965b,05/13/2021 14:21:06G,1620915318,1,0,0
+2206,37,5,1,0,0,38e2bd7259d44784b84a65636b08e6be,a98e74b24d2b442b9a7a6668fc3d5efc,05/13/2021 16:40:26G,1620923769,1,0,0
+591,41,1,1,0,0,62d410347a5b4a74be7ba3ec295b6e72,fc52e0ebd8bb4847b23770b50fb0830c,05/13/2021 14:21:06G,1620915318,1,0,0
+2207,37,5,1,0,0,800e3f9c5f5a43d886498acceecad5f4,b22d9d155e384a02a12e5ebd55f1a901,05/13/2021 16:40:26G,1620923769,1,0,0
+592,6,1,1,1,24,1975aafdc77c4c1f83fc2818b327600c,27e67ad1be56436282ec511044852c30,05/13/2021 14:21:06G,1620915318,1,0,0
+2208,37,5,1,0,0,3d4f13920bad4dce99b2d0fe23aac821,6275ba009ee647808699094b73e6b8f1,05/13/2021 16:40:26G,1620923769,1,0,0
+593,40,1,1,0,0,b48a783ff3f042a98e73483b91b1431e,75f3a3cad4f24c71b22868403b4f18a7,05/13/2021 14:21:06G,1620915318,1,0,0
+2209,37,5,1,0,0,7fe1245f171a4fc19ca81ab162ec4cc0,53863b99bd384607b4628bcad1dbedd0,05/13/2021 16:40:26G,1620923769,1,0,0
+594,27,0,1,24,0,4886c42ffeee4feaa3433d833ca0df67,f6b3a13d445749faba88726d3ab91241,05/13/2021 14:21:06G,1620915318,1,0,0
+2210,37,5,1,0,0,05fe661303de42a7ba5ee637ab04ca08,306a85c6b0144e898f74d12e1a0d9131,05/13/2021 16:40:26G,1620923769,1,0,0
+595,8,1,1,49,0,541f986a991b463a82045c81d8fcb87e,d045d9f25179404a8df737c8f2429f78,05/13/2021 14:21:06G,1620915342,1,0,0
+2211,37,5,1,0,0,d80241e8ab5b47b68e5429ba4b150f27,3733959f1d4b49228e995d5cf8ab4163,05/13/2021 16:40:26G,1620923769,1,0,0
+596,29,1,1,49,0,2972603696d7439ca5e2e9c19b8168d9,a14d3156e8ee4a169cd395803b286290,05/13/2021 14:21:06G,1620915342,1,0,0
+2212,37,5,1,0,0,bd0f775ca97e473e9f98d697dd9ec7fa,32d94c78482f450d8510b97ce1deec8a,05/13/2021 16:40:26G,1620923769,1,0,0
+597,1,1,1,1,24,1857d5e4e2834297b9adf3fceda4b58e,55366e5071d545fea63634a7cf04312b,05/13/2021 14:21:06G,1620915342,1,0,0
+2213,37,5,1,0,0,02b3c97fc605495a9e89f53c5a5f8279,30add7149ff142ae934b556f71d67709,05/13/2021 16:40:26G,1620923769,1,0,0
+598,26,1,1,56,0,61b65bcab7e9495e8b541407a4ca7cfc,b8552ac508854e58b2bd1ac6418eba80,05/13/2021 14:21:06G,1620915342,1,0,0
+2214,37,5,1,0,0,778859a4d05d4ef8853268512379de38,475ff3bfa5f943beb5222b28be21d2e6,05/13/2021 16:40:26G,1620923769,1,0,0
+599,28,1,1,0,0,5e449acd902e4498aa70ff6ee5b0f347,9fb19458472e4e329d915bc84bd7d583,05/13/2021 14:21:06G,1620915342,1,0,0
+600,8,1,1,50,0,cf68f6dc05c044c4a18a3c022e9b682b,33ce5c49f8c7485d9763c30f0ff6d5e0,05/13/2021 14:21:06G,1620915359,1,0,0
+601,29,1,1,50,0,26256e800eb041f9a67a4246972df1e3,636ed40e762c4e19aee127732472db28,05/13/2021 14:21:06G,1620915359,1,0,0
+602,1,1,1,2,24,25d0bdc1cbd94960a96d9c594203ef6c,b683725c7d2c4fcdbb31ad1cd1794291,05/13/2021 14:21:06G,1620915359,1,0,0
+2218,37,5,1,0,0,f863b252221049639335b51ec81e3acc,c1cdc88a3307432d87712c59d9977cb5,05/13/2021 16:40:26G,1620923769,1,0,0
+603,26,1,1,57,0,d2705488871a45759efbc15faf57d266,0bb64a36782d441a90b0bd359c3da3d4,05/13/2021 14:21:06G,1620915359,1,0,0
+2219,37,5,1,0,0,bfb2662ae6fe49b686bae7a9a3ad6e2d,32e88c483c35473cb8184d8fb6e997dc,05/13/2021 16:40:26G,1620923769,1,0,0
+604,1,1,1,3,24,14adfd3468c644268ca90f7a780f2a9f,5f7207d6c15646b0a4aaea2d2030dd42,05/13/2021 14:21:06G,1620915359,1,0,0
+605,26,1,1,58,0,a485f3069783482e9a3f0737d3c18ec1,9d84d47e291844af8a4975a5e2ceceff,05/13/2021 14:21:06G,1620915359,1,0,0
+606,1,1,1,4,24,d517eabd9d7f44e29791352253379358,749b288d7fd249d5a40aa5ee835228dd,05/13/2021 14:21:06G,1620915359,1,0,0
+2222,38,5,1,0,0,456c58cd66b94dbcaa8bf25b60616325,7cf7b3108eec451494f7aaaac2992053,05/13/2021 16:40:26G,1620923769,1,0,0
+607,26,1,1,59,0,6186bfba86344657a9b30bd24c7882ac,51a1f6d325f24c3ea24d80bc2689c716,05/13/2021 14:21:06G,1620915359,1,0,0
+608,1,1,1,5,24,800fafa93db648908af4da6dae137924,5fc5c567d2e0468c98d2658e25267199,05/13/2021 14:21:06G,1620915359,1,0,0
+609,26,1,1,60,0,a806e0bb9d604901ba67c48a001bac07,7e479e90c59249f982ceaa76c9ce4ec4,05/13/2021 14:21:06G,1620915359,1,0,0
+610,1,1,1,6,24,0fdb32e962c14ee091f6f0d4f823ad23,c7806c23ff7747dda255cd40d5461fa1,05/13/2021 14:21:06G,1620915359,1,0,0
+611,26,1,1,61,0,9f2cf73a7fa545f48c80372ec25a36da,761d8ee1bdd742b8bf7494d4a9027302,05/13/2021 14:21:06G,1620915359,1,0,0
+612,1,1,1,7,24,805cd6fd420b4c8cae9571c08b2b58cc,bf92a0e88a1d47e482d4ece7c8f137fa,05/13/2021 14:21:06G,1620915359,1,0,0
+613,26,1,1,62,0,9b21ae58f58646c0a87549bfeb3765ee,69f68ad5ef7048e79b6dc97c8b21ed7d,05/13/2021 14:21:06G,1620915359,1,0,0
+2229,38,5,1,0,0,3abcf62e1aec4e39920dedfe086a93ee,23249e41928d4cb28d33d3b0aa2fc161,05/13/2021 16:40:26G,1620923769,1,0,0
+614,28,1,1,0,0,95dff27da9de47888eb02608b5ecaf54,07142a9c2c684e1b97f5ba46c32c89a5,05/13/2021 14:21:06G,1620915359,1,0,0
+2230,38,5,1,0,0,aa849b599d6f4ecebfd0f5c120e9b861,5bb871132d3e4cd3b205c4f442743cb3,05/13/2021 16:40:26G,1620923769,1,0,0
+615,28,1,1,0,0,1801467213674f9ea44cc5cad7309456,2cf7f404ac5649e8930cb355851884e8,05/13/2021 14:21:06G,1620915359,1,0,0
+2231,38,5,1,0,0,3c75c52fde194f6fb14bbda739f5245c,ee4e4450ef104175901faa3d9c130b3c,05/13/2021 16:40:26G,1620923769,1,0,0
+616,28,1,1,0,0,6e5cce35301c460cb5bc945e9fa164be,aed9389b796d4a9db415142394e2c14a,05/13/2021 14:21:06G,1620915359,1,0,0
+2232,38,5,1,0,0,0288c5abc31d40bfb17d1c3d842b13ab,d7d47561978b4204a32b75b099ad4cdc,05/13/2021 16:40:26G,1620923769,1,0,0
+617,28,1,1,0,0,bee6b9eb68e447bdad9c827076fb2fab,a6e0e32dd5974910be5ffbfe967d5497,05/13/2021 14:21:06G,1620915359,1,0,0
+2233,38,5,1,0,0,5801248b53984f21aff8c7170724950e,a7f2591759f54698b37b35862aaa452f,05/13/2021 16:40:26G,1620923769,1,0,0
+618,1,1,1,8,24,f8a47ef59798404aad34140b0d8565b1,09ddf2f6f0b040a78154755f84aed50a,05/13/2021 14:21:06G,1620915637,1,0,0
+2234,38,5,1,0,0,e8973d8cf1e0488f88c77a8e1bb90379,bd0001e72e4c47b8b05cb20cf4ad9530,05/13/2021 16:40:26G,1620923769,1,0,0
+619,1,1,1,9,24,f4af4840d8094d818563dcdb4d00e7f2,18dfa8c2258e428e93c532c34e2accb9,05/13/2021 14:21:06G,1620915637,1,0,0
+2235,38,5,1,0,0,48b8f2f65fc1461e8f5736433f42a2ae,5186e7e6fc054771b9a6ca10c7e3c901,05/13/2021 16:40:26G,1620923769,1,0,0
+620,1,1,1,10,24,cea1e9f24cde418386d1207effe66049,8359c4881cd04e5cbc91465f63712478,05/13/2021 14:21:06G,1620915637,1,0,0
+2236,38,5,1,0,0,cdd9198bece14ab2b2788ae6c827b649,1f3e2160fc86497fbe3be0972a09636e,05/13/2021 16:40:26G,1620923769,1,0,0
+621,1,1,1,11,24,2f50b7d38843429d95b018816db0f165,6539ee0050144d4183a660d849413539,05/13/2021 14:21:06G,1620915637,1,0,0
+2237,38,5,1,0,0,cb092b696e1e4073a5ef73d5f16735c7,86b8fc26c8734e01a4594d1e956e29b2,05/13/2021 16:40:26G,1620923769,1,0,0
+622,1,1,1,12,24,20af6c1006e54f89b8c7f9d2df97fe95,3372a9198887408c8ee847527a0f4d11,05/13/2021 14:21:06G,1620915637,1,0,0
+623,1,1,1,13,24,8514250e5a4b4b66b7d7ae8aa3efe6a6,885769869bcb427d9c5e66e5db6d598d,05/13/2021 14:21:06G,1620915637,1,0,0
+2240,37,5,1,0,0,db332a9c1cd14d4583514b09ebaec267,89cf8730e3bc47c3b32cb75d76e87f0c,05/13/2021 16:40:26G,1620923769,1,0,0
+625,50,0,1,0,0,0007243bbf424675a773dbbc9d49067f,332fd33e55cf469cb6c3e9625e416f65,05/13/2021 15:46:44G,1620916102,1,0,0
+2241,38,5,1,0,0,54cdd8b21f1241cca0f1411feddc43ce,c05b62e6919046949db56ffb337bc5ea,05/13/2021 16:40:26G,1620923769,1,0,0
+626,51,0,1,0,0,6c4c86883422422b801968b72d799cf9,85d1858248524b04953df5831a46f2ec,05/13/2021 15:46:44G,1620916102,1,0,0
+2242,38,5,1,0,0,3f345f067526478190121424fa447a33,0307cd2bae0e444083c8b8256e815c1c,05/13/2021 16:40:26G,1620923769,1,0,0
+627,52,0,1,0,0,f023848e50fa4c0ebfe9404eebe90fd9,f7a3fe9eb7d1425d8a536b9b7915f7ad,05/13/2021 15:46:44G,1620916102,1,0,0
+2243,38,5,1,0,0,ae1671a0920d47e38d451c351da268fa,d3946195303840e69654b3a5911ca559,05/13/2021 16:40:26G,1620923769,1,0,0
+2252,38,5,1,0,0,0074452ccd804be6871caafd02e36976,59b4e8d4ced94f6caf76e1a19b7d184f,05/13/2021 16:40:26G,1620923769,1,0,0
+2257,38,5,1,0,0,75b6e597dfbb4d2585f81bb22b406041,e05d9f49fbbb41199a43050a6db4a151,05/13/2021 16:40:26G,1620923769,1,0,0
+2258,38,5,1,0,0,6c13003c31734a0ea78b424f1288d7f6,a35b6af9f63b48d1a3b43466ef8b5a46,05/13/2021 16:40:26G,1620923769,1,0,0
+2263,38,5,1,0,0,0a5ecb7677a346d4a15ccea3ac26ef7a,fd993e31f2854e39a9f9b3548393b06c,05/13/2021 16:40:26G,1620923769,1,0,0
+2266,38,5,1,0,0,7080186115ba4457a84fc7105d3391e4,ba2068bc99884c2f9021be582def2d72,05/13/2021 16:40:26G,1620923769,1,0,0
+2267,38,5,1,0,0,fb644bcd06a64e44b366dba66906195a,d3ae78e453674093b74d752b3a88d96d,05/13/2021 16:40:26G,1620923769,1,0,0
+2268,38,5,1,0,0,36145c1401e944cf97d4da717be5a16a,41b7147e4b784617b88ed0dfd010456d,05/13/2021 16:40:26G,1620923769,1,0,0
+2269,38,5,1,0,0,3b1fe5256d8a47d5862c8c666d68f88c,307e7f585623402cb05b15a5a369eda4,05/13/2021 16:40:26G,1620923769,1,0,0
+2270,38,5,1,0,0,8a47c2a51be14267aa23a87c5b6c9c22,e00fb10ad20e421d8a045ad9d5e18682,05/13/2021 16:40:26G,1620923769,1,0,0
+2271,37,5,1,0,0,f9611ae1cf014118b3f40ca082afc1b1,1fd4931033644037b29c1a4447df3cdb,05/13/2021 16:40:26G,1620923769,1,0,0
+2272,37,5,1,0,0,d85e9a5331a84500beb720e748fdc48e,ae0c044310d64bd6b49865c2ed4160f6,05/13/2021 16:40:26G,1620923769,1,0,0
+657,37,2,1,0,0,1b398f3c6f2c42298f294f0a91342149,4a374c6c89744708ac1e3ce7a5182f44,05/13/2021 15:46:44G,1620916109,1,0,0
+2273,38,5,1,0,0,616d20c4df67402384fffc3cd789d06b,d7e738a1bf9b40ef80c7c6e6caaf1440,05/13/2021 16:40:26G,1620923769,1,0,0
+658,37,2,1,0,0,1e939252f9f14a22b2caf6923f91018d,081e4de78396454a8f418f32ee094723,05/13/2021 15:46:44G,1620916109,1,0,0
+2274,38,5,1,0,0,1e10bfb265514a92af25e1ba21741844,59b4031b47204ce4a1d0261b57a02aa1,05/13/2021 16:40:26G,1620923769,1,0,0
+659,37,2,1,0,0,ff34b36fb5ab465d93e3aebd588078e5,97cd12f951d54a5bb474067b6f6c5f7a,05/13/2021 15:46:44G,1620916109,1,0,0
+2275,38,5,1,0,0,50285e755dde457984bb258b0843e455,fa211fcc28034aa6992f27625c52925a,05/13/2021 16:40:26G,1620923769,1,0,0
+660,37,2,1,0,0,431dd524104940f0b371601c4230bd0d,066c0627ad984b6280856a44db1fe746,05/13/2021 15:46:44G,1620916109,1,0,0
+2276,38,5,1,0,0,a50bb9bb9b864b2d84e724f7b2f2bbc2,ffeac03668014c5b8a7e43a2f4f2c8f5,05/13/2021 16:40:26G,1620923769,1,0,0
+661,37,2,1,0,0,a926a2a59b8d40fc8918bd2006a5b3ef,0a2062d9acb14d52a8bb820fd0666a67,05/13/2021 15:46:44G,1620916109,1,0,0
+2277,38,5,1,0,0,3796a67c2f974567b5cd5592bcc92d8b,cfe50ed7813c403ab93937db61bb11d8,05/13/2021 16:40:26G,1620923769,1,0,0
+662,37,2,1,0,0,5a2e945a9a7a46669b2973d0bf94a08a,d76211e646c24150a5b9dfa40c7e8257,05/13/2021 15:46:44G,1620916109,1,0,0
+2278,38,5,1,0,0,a492d2a01bea4833a912feabe604cb84,3e410b963f664c6b80cc582c464aa880,05/13/2021 16:40:26G,1620923769,1,0,0
+663,37,2,1,0,0,094210461313483bad5020f7848795e0,36d6055e90d94cb382aecff8c3acf9a4,05/13/2021 15:46:44G,1620916109,1,0,0
+2279,38,5,1,0,0,d5d73ff46e62478cb436f8c2aa23793c,6971ccfbc8fa400d9df03299058f8207,05/13/2021 16:40:26G,1620923769,1,0,0
+664,37,2,1,0,0,1848f093b4ed41cf9f383705c2bc2565,23c17de32d684e06bca1a34ba1cb631d,05/13/2021 15:46:44G,1620916109,1,0,0
+2280,38,5,1,0,0,7f5bbd9d31404ed190fbe7eb1ab50d5a,d9af868754e84632928c63625a15d99e,05/13/2021 16:40:26G,1620923769,1,0,0
+2281,37,5,1,0,0,80f302f5cecb45de80c0017150b6f57a,1337acb056404b59979fcdab68f621e3,05/13/2021 16:40:26G,1620923769,1,0,0
+2282,37,5,1,0,0,b8dbbca987ac4beba3b5a2520bb90828,4bb15a3840fc46ff80a41427fc31ea8f,05/13/2021 16:40:26G,1620923769,1,0,0
+2283,37,5,1,0,0,92cb6b4895fa484581a77ec7962ff8d4,abb8e2a9e93246dbb697ff457153daa4,05/13/2021 16:40:26G,1620923769,1,0,0
+668,37,2,1,0,0,0d111d659fd74e15abae72da152693df,5a0d78e7d6c3473f827e1f68605e66ce,05/13/2021 15:46:44G,1620916109,1,0,0
+2284,37,5,1,0,0,bc3a4c7a034c4a56bdd9f3ebd421d030,0a7f60619d2f4eba91a2f175568b930a,05/13/2021 16:40:26G,1620923769,1,0,0
+669,37,2,1,0,0,91091176ca3b43449c7c1760ff1a1ebf,fd32779800dd4d83a36b2ca853d5cd60,05/13/2021 15:46:44G,1620916109,1,0,0
+2285,37,5,1,0,0,f58c1fbbab844f23be871239bd3adacd,dcf249e7b9d54856829bba52548d178c,05/13/2021 16:40:26G,1620923769,1,0,0
+679,38,2,1,0,0,47f93acf9f584572992759d0ced5eb6f,0e50e7d00d3f415c858247ac70e39041,05/13/2021 15:46:44G,1620916109,1,0,0
+680,38,2,1,0,0,fbc77c0011b04ff3abcd2dabb40d525e,c0785c4d22e947229d92a6a3b4cb8b9e,05/13/2021 15:46:44G,1620916109,1,0,0
+681,38,2,1,0,0,f61b2df4fb99474594d902d655d1f850,c037c843a56a41cdb03559b3fd3abdf6,05/13/2021 15:46:44G,1620916109,1,0,0
+682,38,2,1,0,0,a42a9731d45040f091ca861f82ab5b65,19c7dfa56811494d8e543d3f01b9b087,05/13/2021 15:46:44G,1620916109,1,0,0
+683,38,2,1,0,0,03f88bca6e004ab1aeeb0de860d931ec,32c101a1302647768c6d968b8dfe1228,05/13/2021 15:46:44G,1620916109,1,0,0
+684,38,2,1,0,0,d7a3771962ac4a9ca2c3aa8514b6c88e,cba5133b0c164ad6b62380e486f2b484,05/13/2021 15:46:44G,1620916109,1,0,0
+685,38,2,1,0,0,ee0a8718e1d14602a0b052f0dda46bf7,a9d28d0bde0e492082b9874d7922995d,05/13/2021 15:46:44G,1620916109,1,0,0
+686,38,2,1,0,0,0f2b2a81ef0f43aaa1451515acad1b4f,982593b411c04dea8cded40461d316e3,05/13/2021 15:46:44G,1620916109,1,0,0
+690,37,2,1,0,0,ae487e73b6404ab98b99fb34fe833599,30a1641cb36a4a90b616a4d3cf7b52be,05/13/2021 15:46:44G,1620916109,1,0,0
+691,38,2,1,0,0,569dfee22db0492bb3db52b2b1f3dc86,ea402ce4483041749d05626b1f7b81b1,05/13/2021 15:46:44G,1620916109,1,0,0
+692,38,2,1,0,0,167892b24fab42438c0105df4827c7ba,51325c6324c042e4a916247304ae26a4,05/13/2021 15:46:44G,1620916109,1,0,0
+693,38,2,1,0,0,aabb198753b343f7a5f142bec1c76672,cf59fb64039348238a6fcd6838949ee4,05/13/2021 15:46:44G,1620916109,1,0,0
+702,38,2,1,0,0,c92b529debbb44279115e6755a1f06a4,da3d5eff39dc4b8fb065ce96e23082e9,05/13/2021 15:46:44G,1620916109,1,0,0
+716,38,2,1,0,0,f4f816b3389d488bbde35990cec23c71,a46e78b0488044a6aab60209bf503ff3,05/13/2021 15:46:44G,1620916109,1,0,0
+717,38,2,1,0,0,eda44e4cf0c44842a4f60e49e378b576,d0aeffe47ba14cd782ce42ad31c6b744,05/13/2021 15:46:44G,1620916109,1,0,0
+718,38,2,1,0,0,711e2a82a3c34d1fbd019e05f0c08cb7,a7f527259bfb407a9830bd70de8a28d9,05/13/2021 15:46:44G,1620916109,1,0,0
+719,38,2,1,0,0,9b7b2a9d03f0475798e3702950d1a90f,a8ec3f96f6f64110a86d17f38fc1d62c,05/13/2021 15:46:44G,1620916109,1,0,0
+720,38,2,1,0,0,1faa91703a5a4b0da6e0ebd61d1fb99c,692301ab6aa646bcae336bb857adc8c9,05/13/2021 15:46:44G,1620916109,1,0,0
+721,37,2,1,0,0,fc8b2a2ad80642289b0b48ae99d26ecd,5c619adc36be4f32ba226bd2eef065bf,05/13/2021 15:46:44G,1620916109,1,0,0
+722,37,2,1,0,0,f381d39c00b84e6eb7c87610a54a3d7f,526a54c7c69b446da0d0d9a57a4dcdae,05/13/2021 15:46:44G,1620916109,1,0,0
+723,38,2,1,0,0,9cd2b209c266467cafb1dd333c0c26c8,10685e17ceae4fc59cff55c62f51007a,05/13/2021 15:46:44G,1620916109,1,0,0
+724,38,2,1,0,0,1dc7f9c99c03460aa0b89cc482dd931c,247e3d8fcd694f61971b97b1fe60fc26,05/13/2021 15:46:44G,1620916109,1,0,0
+725,38,2,1,0,0,b9097a67ffea4c598f64cf574877372a,49e25662e0e444a5a6c9a880c62d631f,05/13/2021 15:46:44G,1620916109,1,0,0
+726,38,2,1,0,0,2cb813d356094845b4399fe5e211c86a,a01f99a1565240128b1d4e4138079934,05/13/2021 15:46:44G,1620916109,1,0,0
+727,38,2,1,0,0,269f8b63c90b468eb1264893d4900ba3,40b6bc2885e941af9114c409eba714b7,05/13/2021 15:46:44G,1620916109,1,0,0
+728,38,2,1,0,0,ba29b320a2c74380a4701e9f7c64a3d5,8c1d713f43104cbfa73f93e59736a302,05/13/2021 15:46:44G,1620916109,1,0,0
+729,38,2,1,0,0,8b92e36c2ed14f98b59298346cea230c,c5a1ddc9de9c47d59afe44bebf0fa458,05/13/2021 15:46:44G,1620916109,1,0,0
+730,38,2,1,0,0,c8846a25a985427bbea8c1199b64284a,1b3e138be16f4245a7c0ab3cbe695042,05/13/2021 15:46:44G,1620916109,1,0,0
+731,37,2,1,0,0,f9b3c6472c1446bb910fe58b4b9f9c76,600b5dfe7cdc41d39292d7cfc2809332,05/13/2021 15:46:44G,1620916109,1,0,0
+732,37,2,1,0,0,0cd386f3ca1743718085ff4419a5b348,1ab9e3474c284f8e889f5d55da44128d,05/13/2021 15:46:44G,1620916109,1,0,0
+733,37,2,1,0,0,9cae411c481b44db8a6a15719e066587,56dc3d5e87094e8c8adaee7da24a43a0,05/13/2021 15:46:44G,1620916109,1,0,0
+734,37,2,1,0,0,00cd6d81d7a94cd3ac056232500bbba8,3ab5e29a73894838afb9fbc418780641,05/13/2021 15:46:44G,1620916109,1,0,0
+735,37,2,1,0,0,cfda997b7a8342df917a236cf7bee28c,73527c9c6e6c4b64b8e0dffb166e56bf,05/13/2021 15:46:44G,1620916109,1,0,0
+
+ObjectDefinition
+ObjectType_Id,Description,ObjectName,Global_User_ID,Row_Time_Stamp
+1,"",Attribute,0,0
+2,"",Check Constraint,0,0
+3,"",Domain,0,0
+4,"",Diagram,0,0
+5,"",Entity,0,0
+6,"",Index,0,0
+7,"",Model,0,0
+8,"",Relationship,0,0
+9,"",User Data Type,0,0
+10,"",Default,0,0
+11,"",Rule,0,0
+12,"",View,0,0
+13,"",View Table,0,0
+14,"",View Field,0,0
+15,"",Parent Field Column,0,0
+16,"",View Column,0,0
+17,"",Column Usage,0,0
+18,"",View Component,0,0
+19,"",Trigger,0,0
+20,"",Procedure,0,0
+21,"",Package,0,0
+22,"",Dictionary Object,0,0
+23,"",Reusable Procedure,0,0
+24,"",Templated Procedure,0,0
+25,"",SubModel,0,0
+26,"",ParentChildPair,0,0
+27,"",Entity Display,0,0
+28,"",IndexColumn,0,0
+29,"",Relation Display,0,0
+30,"",Graphic Display,0,0
+31,"",View Display,0,0
+32,"",View Relation Display,0,0
+33,"",Supertype,0,0
+34,"",Supertype Display,0,0
+35,"",Subtype,0,0
+36,"",Diagram Display,0,0
+37,"",Font Default,0,0
+38,"",Color Default,0,0
+39,"",Grid Display,0,0
+40,"",Index Storage,0,0
+41,"",Table Storage,0,0
+42,"",Algorithm Property,0,0
+43,"",Docking Position,0,0
+44,"",Dock Pos Disp Level,0,0
+45,"",Submodel Algorithm,0,0
+46,"",Dictionary Trigger,0,0
+47,"",Dictionary Library,0,0
+48,"",Bound Dictionary Object,0,0
+49,"",Referenced Object,0,0
+50,"",MetaClass Member,0,0
+51,"",Property Usage,0,0
+52,"",Property Value Usage,0,0
+53,"",Model Option,0,0
+54,"",InterModelRelationship,0,0
+55,"",Data Dictionary,0,0
+56,"",Storage Object,0,0
+57,"",Reference Value,0,0
+58,"",Attachment Type,0,0
+59,"",Valid Attachment Type,0,0
+60,"",Attachment,0,0
+61,"",Submodel Link,0,0
+62,"",Dictionary Object Link,0,0
+63,"",Object Font Override,0,0
+64,"",Object Color Override,0,0
+65,"",Connector,0,0
+66,"",Path Node,0,0
+67,"",Graph Geometry,0,0
+68,"",Disconnected Nodes Layout,0,0
+69,"",Components Layout,0,0
+70,"",Circular Layout,0,0
+71,"",Hierarchical Layout,0,0
+72,"",Orthogonal Layout,0,0
+73,"",Symmetric Layout,0,0
+74,"",Tree Layout,0,0
+75,"",Default Constraint,0,0
+76,"",Submodel Schema Obj Link,0,0
+77,"",Schema Obj Edge,0,0
+78,"",Transform Member,0,0
+79,"",Object Transform,0,0
+80,"",Shape,0,0
+81,"",Shape Edge,0,0
+82,"",Shape Display,0,0
+83,"",Shape Edge Display,0,0
+84,"",User Object Match,0,0
+85,"",Database User,0,0
+86,"",Database Role,0,0
+87,"",Object Permission,0,0
+88,"",User Role Member,0,0
+89,"",Naming Standards Template,0,0
+90,"",Transformation,0,0
+91,"",Transformation Display,0,0
+92,"",Lineage Component,0,0
+93,"",Lineage Component Display,0,0
+94,"",Lineage Stream,0,0
+95,"",Lineage Stream Display,0,0
+96,"",Lineage Stream Member,0,0
+97,"",Object Tracking,0,0
+98,"",Attribute Display Override,0,0
+
+Object_Domain
+Object_Domain_ID,Name,Type,GUID
+1,dominoAPI.DM1,DIAGRAM,12d027a37af34ce28b8c09b5afed979f
+2,dominoAPI_DD,DATA_DICTIONARY,33f06a8754264aae903992030f4b9b0b
+
diff --git a/app/Models/SQL/dominoOld.sql b/app/Models/SQL/dominoOld.sql
new file mode 100644
index 0000000..67ca9a4
--- /dev/null
+++ b/app/Models/SQL/dominoOld.sql
@@ -0,0 +1,520 @@
+--
+-- ER/Studio 8.0 SQL Code Generation
+-- Company :      CASA
+-- Project :      dominoAPI.DM1
+-- Author :       Dayron
+--
+-- Date Created : Thursday, May 13, 2021 12:36:28
+-- Target DBMS : MySQL 5.x
+--
+
+-- 
+-- TABLE: arbitro 
+--
+
+CREATE TABLE arbitro(
+    id                  INT            NOT NULL,
+    nivel               VARCHAR(30)    NOT NULL,
+    es_internacional    BIT(1)         DEFAULT 0 NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: boleta 
+--
+
+CREATE TABLE boleta(
+    evento_id         INT         NOT NULL,
+    numero            INT         NOT NULL,
+    numero_ronda      SMALLINT    NOT NULL,
+    numero_mesa       SMALLINT    NOT NULL,
+    fecha_registro    CHAR(10),
+    es_valida         BIT(1)      DEFAULT 1 NOT NULL,
+    PRIMARY KEY (evento_id, numero, numero_ronda, numero_mesa)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: boleta_equipo 
+--
+
+CREATE TABLE boleta_equipo(
+    equipo_id       INT         NOT NULL,
+    evento_id       INT         NOT NULL,
+    numero          INT         NOT NULL,
+    numero_ronda    SMALLINT    NOT NULL,
+    numero_mesa     SMALLINT    NOT NULL,
+    salidor         BIT(1)      DEFAULT FALSE NOT NULL,
+    tantos          INT         NOT NULL,
+    resultado       INT         DEFAULT 0 NOT NULL,
+    ganador         BIT(1)      DEFAULT FALSE NOT NULL,
+    inicio          DATETIME    NOT NULL,
+    duracion        DATETIME,
+    PRIMARY KEY (equipo_id, evento_id, numero, numero_ronda, numero_mesa)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: categoria 
+--
+
+CREATE TABLE categoria(
+    id             SMALLINT        AUTO_INCREMENT,
+    nombre         VARCHAR(120)    NOT NULL,
+    descripcion    VARCHAR(255),
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: ciudad 
+--
+
+CREATE TABLE ciudad(
+    id         INT             AUTO_INCREMENT,
+    pais       VARCHAR(120)    NOT NULL,
+    pais_id    INT             NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: comite_organizador 
+--
+
+CREATE TABLE comite_organizador(
+    persona_id    INT             NOT NULL,
+    evento_id     INT             NOT NULL,
+    funcion       VARCHAR(120)    NOT NULL,
+    PRIMARY KEY (persona_id, evento_id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: data 
+--
+
+CREATE TABLE data(
+    evento_id        INT         NOT NULL,
+    numero_data      SMALLINT    NOT NULL,
+    numero_boleta    INT         NOT NULL,
+    numero_ronda     SMALLINT    NOT NULL,
+    numero_mesa      SMALLINT    NOT NULL,
+    equipo_id        INT         NOT NULL,
+    puntos           INT         NOT NULL,
+    PRIMARY KEY (evento_id, numero_data, numero_boleta, numero_ronda, numero_mesa, equipo_id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: equipo 
+--
+
+CREATE TABLE equipo(
+    id        INT            AUTO_INCREMENT,
+    nombre    VARCHAR(60)    NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: evento 
+--
+
+CREATE TABLE evento(
+    id                 INT             AUTO_INCREMENT,
+    ciudad_id          INT             NOT NULL,
+    nombre             VARCHAR(255)    NOT NULL,
+    tipo_id            SMALLINT        NOT NULL,
+    modalidad_id       SMALLINT        NOT NULL,
+    categoria_id       SMALLINT        NOT NULL,
+    es_internacional   BIT(1)          DEFAULT FALSE NOT NULL,
+    es_presencial      BIT(1)          DEFAULT TRUE NOT NULL,
+    comentario         VARCHAR(255),
+    cerrado            BIT(1)          DEFAULT FALSE NOT NULL,
+    fecha_inicio       DATETIME,
+    fecha_cierre       DATETIME,
+    cantidad_fichas    SMALLINT        DEFAULT 28 NOT NULL,
+    creado             DATETIME        NOT NULL,
+    actualizado        DATETIME        NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: jugador 
+--
+
+CREATE TABLE jugador(
+    id         INT            NOT NULL,
+    nivel      VARCHAR(30)    NOT NULL,
+    elo        INT            DEFAULT 0 NOT NULL,
+    ranking    CHAR(2),
+    tipo       CHAR(1),
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: mesa 
+--
+
+CREATE TABLE mesa(
+    evento_id    INT         NOT NULL,
+    numero       SMALLINT    NOT NULL,
+    PRIMARY KEY (evento_id, numero)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: modalidad 
+--
+
+CREATE TABLE modalidad(
+    id                    SMALLINT        AUTO_INCREMENT,
+    nombre                VARCHAR(120)    NOT NULL,
+    cantidad_jugadores    SMALLINT        NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: narrador 
+--
+
+CREATE TABLE narrador(
+    id            INT             NOT NULL,
+    tipo_medio    VARCHAR(60),
+    medio         VARCHAR(120)    NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: pais 
+--
+
+CREATE TABLE pais(
+    id        INT             AUTO_INCREMENT,
+    nombre    VARCHAR(120)    NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: participa 
+--
+
+CREATE TABLE participa(
+    jugador_id    INT    NOT NULL,
+    evento_id     INT    NOT NULL,
+    equipo_id     INT    NOT NULL,
+    PRIMARY KEY (jugador_id, evento_id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: participante 
+--
+
+CREATE TABLE participante(
+    id                  INT             AUTO_INCREMENT,
+    telefono            VARCHAR(15),
+    nombre              VARCHAR(120)    NOT NULL,
+    sexo                CHAR(1)         DEFAULT 'M' NOT NULL,
+    correo              VARCHAR(120)    NOT NULL,
+    nro_identidad       VARCHAR(30)     NOT NULL,
+    tipo_identidad      VARCHAR(30)     NOT NULL,
+    fecha_nacimiento    DATE            NOT NULL,
+    alias               VARCHAR(30),
+    comentario          VARCHAR(255),
+    ciudad_id           INT             NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: patrocinador 
+--
+
+CREATE TABLE patrocinador(
+    id              INT             AUTO_INCREMENT,
+    nombre          VARCHAR(120)    NOT NULL,
+    organizacion    VARCHAR(255),
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: patrocinador_evento 
+--
+
+CREATE TABLE patrocinador_evento(
+    id    INT    NOT NULL,
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: ronda 
+--
+
+CREATE TABLE ronda(
+    evento_id       INT             NOT NULL,
+    numero          SMALLINT        NOT NULL,
+    inicio          DATETIME,
+    cierre          DATETIME,
+    cerrada         BIT(1)          DEFAULT FALSE NOT NULL,
+    comentario      VARCHAR(255),
+    PRIMARY KEY (evento_id, numero)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: tipo 
+--
+
+CREATE TABLE tipo(
+    id             SMALLINT        AUTO_INCREMENT,
+    nombre         VARCHAR(120)    NOT NULL,
+    descripcion    VARCHAR(255),
+    PRIMARY KEY (id)
+)ENGINE=MYISAM
+;
+
+
+
+-- 
+-- TABLE: arbitro 
+--
+
+ALTER TABLE arbitro ADD CONSTRAINT Refparticipante35 
+    FOREIGN KEY (id)
+    REFERENCES participante(id)
+;
+
+
+-- 
+-- TABLE: boleta 
+--
+
+ALTER TABLE boleta ADD CONSTRAINT Refevento26 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+ALTER TABLE boleta ADD CONSTRAINT Refronda27 
+    FOREIGN KEY (evento_id, numero_ronda)
+    REFERENCES ronda(evento_id, numero)
+;
+
+ALTER TABLE boleta ADD CONSTRAINT Refmesa29 
+    FOREIGN KEY (evento_id, numero_mesa)
+    REFERENCES mesa(evento_id, numero)
+;
+
+
+-- 
+-- TABLE: boleta_equipo 
+--
+
+ALTER TABLE boleta_equipo ADD CONSTRAINT Refequipo49 
+    FOREIGN KEY (equipo_id)
+    REFERENCES equipo(id)
+;
+
+ALTER TABLE boleta_equipo ADD CONSTRAINT Refboleta50 
+    FOREIGN KEY (evento_id, numero, numero_ronda, numero_mesa)
+    REFERENCES boleta(evento_id, numero, numero_ronda, numero_mesa)
+;
+
+
+-- 
+-- TABLE: ciudad 
+--
+
+ALTER TABLE ciudad ADD CONSTRAINT Refpais4 
+    FOREIGN KEY (pais_id)
+    REFERENCES pais(id)
+;
+
+
+-- 
+-- TABLE: comite_organizador 
+--
+
+ALTER TABLE comite_organizador ADD CONSTRAINT Refparticipante37 
+    FOREIGN KEY (persona_id)
+    REFERENCES participante(id)
+;
+
+ALTER TABLE comite_organizador ADD CONSTRAINT Refevento38 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+
+-- 
+-- TABLE: data 
+--
+
+ALTER TABLE data ADD CONSTRAINT Refboleta43 
+    FOREIGN KEY (evento_id, numero_boleta, numero_ronda, numero_mesa)
+    REFERENCES boleta(evento_id, numero, numero_ronda, numero_mesa)
+;
+
+ALTER TABLE data ADD CONSTRAINT Refequipo44 
+    FOREIGN KEY (equipo_id)
+    REFERENCES equipo(id)
+;
+
+
+-- 
+-- TABLE: evento 
+--
+
+ALTER TABLE evento ADD CONSTRAINT Refcategoria1 
+    FOREIGN KEY (categoria_id)
+    REFERENCES categoria(id)
+;
+
+ALTER TABLE evento ADD CONSTRAINT Reftipo2 
+    FOREIGN KEY (tipo_id)
+    REFERENCES tipo(id)
+;
+
+ALTER TABLE evento ADD CONSTRAINT Refmodalidad3 
+    FOREIGN KEY (modalidad_id)
+    REFERENCES modalidad(id)
+;
+
+ALTER TABLE evento ADD CONSTRAINT Refciudad5 
+    FOREIGN KEY (ciudad_id)
+    REFERENCES ciudad(id)
+;
+
+
+-- 
+-- TABLE: jugador 
+--
+
+ALTER TABLE jugador ADD CONSTRAINT Refparticipante34 
+    FOREIGN KEY (id)
+    REFERENCES participante(id)
+;
+
+
+-- 
+-- TABLE: mesa 
+--
+
+ALTER TABLE mesa ADD CONSTRAINT Refevento22 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+
+-- 
+-- TABLE: narrador 
+--
+
+ALTER TABLE narrador ADD CONSTRAINT Refparticipante36 
+    FOREIGN KEY (id)
+    REFERENCES participante(id)
+;
+
+
+-- 
+-- TABLE: participa 
+--
+
+ALTER TABLE participa ADD CONSTRAINT Refjugador46 
+    FOREIGN KEY (jugador_id)
+    REFERENCES jugador(id)
+;
+
+ALTER TABLE participa ADD CONSTRAINT Refevento47 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+ALTER TABLE participa ADD CONSTRAINT Refequipo48 
+    FOREIGN KEY (equipo_id)
+    REFERENCES equipo(id)
+;
+
+
+-- 
+-- TABLE: participante 
+--
+
+ALTER TABLE participante ADD CONSTRAINT Refciudad12 
+    FOREIGN KEY (ciudad_id)
+    REFERENCES ciudad(id)
+;
+
+
+-- 
+-- TABLE: patrocinador_evento 
+--
+
+ALTER TABLE patrocinador_evento ADD CONSTRAINT Refpatrocinador10 
+    FOREIGN KEY (id)
+    REFERENCES patrocinador(id)
+;
+
+ALTER TABLE patrocinador_evento ADD CONSTRAINT Refevento11 
+    FOREIGN KEY (id)
+    REFERENCES evento(id)
+;
+
+
+-- 
+-- TABLE: ronda 
+--
+
+ALTER TABLE ronda ADD CONSTRAINT Refevento21 
+    FOREIGN KEY (evento_id)
+    REFERENCES evento(id)
+;
+
+
diff --git a/app/Models/SQL/jugadores.txt b/app/Models/SQL/jugadores.txt
new file mode 100644
index 0000000..900059f
--- /dev/null
+++ b/app/Models/SQL/jugadores.txt
@@ -0,0 +1,7 @@
+INSERT INTO `jugador` 
+		(`id`, `nombre`, `telefono`, `sexo`, `correo`, `nro_identidad`, `fecha_nacimiento`, `alias`, `ocupacion`, `comentario`, `nivel`, `elo`, `ranking`, `tipo`, `ciudad_id`) 
+VALUES (NULL, 'Senen1 Rodrķguez Aguilar', '52885542', 'M', 'senen@gmail.com', '75071618105', '1965-07-16', 'senen', 'Coordinador', 'Comentario Actualizado', 'Experto', '10', 'AA', 'P', '1'),
+VALUES (NULL, 'Olvis Rodrķguez Aguilar','58544051','M','Olvis@nauta.cu','83110925385','09-11-1983','
+
+
+
diff --git a/app/Models/SQL/jugadores.xlsx b/app/Models/SQL/jugadores.xlsx
new file mode 100644
index 0000000..027e46f
Binary files /dev/null and b/app/Models/SQL/jugadores.xlsx differ
diff --git a/app/ThirdParty/.gitkeep b/app/ThirdParty/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Views/errors/cli/error_404.php b/app/Views/errors/cli/error_404.php
new file mode 100644
index 0000000..456ea3e
--- /dev/null
+++ b/app/Views/errors/cli/error_404.php
@@ -0,0 +1,7 @@
+<?php
+
+use CodeIgniter\CLI\CLI;
+
+CLI::error('ERROR: ' . $code);
+CLI::write($message);
+CLI::newLine();
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
new file mode 100644
index 0000000..e505003
--- /dev/null
+++ b/app/Views/errors/cli/error_exception.php
@@ -0,0 +1,72 @@
+<?php
+
+use CodeIgniter\CLI\CLI;
+
+// The main Exception
+CLI::newLine();
+CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
+CLI::newLine();
+CLI::write($message);
+CLI::newLine();
+CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
+CLI::newLine();
+
+// The backtrace
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE)
+{
+	$backtraces = $exception->getTrace();
+
+	if ($backtraces)
+	{
+		CLI::write('Backtrace:', 'green');
+	}
+
+	foreach ($backtraces as $i => $error)
+	{
+		$padFile  = '    '; // 4 spaces
+		$padClass = '       '; // 7 spaces
+		$c        = str_pad($i + 1, 3, ' ', STR_PAD_LEFT);
+
+		if (isset($error['file']))
+		{
+			$filepath = clean_path($error['file']) . ':' . $error['line'];
+
+			CLI::write($c . $padFile . CLI::color($filepath, 'yellow'));
+		}
+		else
+		{
+			CLI::write($c . $padFile . CLI::color('[internal function]', 'yellow'));
+		}
+
+		$function = '';
+
+		if (isset($error['class']))
+		{
+			$type = ($error['type'] === '->') ? '()' . $error['type'] : $error['type'];
+			$function .= $padClass . $error['class'] . $type . $error['function'];
+		}
+		elseif (! isset($error['class']) && isset($error['function']))
+		{
+			$function .= $padClass . $error['function'];
+		}
+
+		$args = implode(', ', array_map(function ($value) {
+			switch (true)
+			{
+				case is_object($value):
+					return 'Object(' . get_class($value) . ')';
+				case is_array($value):
+					return count($value) ? '[...]' : '[]';
+				case is_null($value):
+					return 'null'; // return the lowercased version
+				default:
+					return var_export($value, true);
+			}
+		}, array_values($error['args'] ?? [])));
+
+		$function .= '(' . $args . ')';
+
+		CLI::write($function);
+		CLI::newLine();
+	}
+}
diff --git a/app/Views/errors/cli/production.php b/app/Views/errors/cli/production.php
new file mode 100644
index 0000000..7db744e
--- /dev/null
+++ b/app/Views/errors/cli/production.php
@@ -0,0 +1,5 @@
+<?php
+
+// On the CLI, we still want errors in productions
+// so just use the exception template.
+include __DIR__ . '/error_exception.php';
diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
new file mode 100644
index 0000000..384d66d
--- /dev/null
+++ b/app/Views/errors/html/debug.css
@@ -0,0 +1,197 @@
+:root {
+	--main-bg-color: #fff;
+	--main-text-color: #555;
+	--dark-text-color: #222;
+	--light-text-color: #c7c7c7;
+	--brand-primary-color: #E06E3F;
+	--light-bg-color: #ededee;
+	--dark-bg-color: #404040;
+}
+
+body {
+	height: 100%;
+	background: var(--main-bg-color);
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	color: var(--main-text-color);
+	font-weight: 300;
+	margin: 0;
+	padding: 0;
+}
+h1 {
+	font-weight: lighter;
+	letter-spacing: 0.8;
+	font-size: 3rem;
+	color: var(--dark-text-color);
+	margin: 0;
+}
+h1.headline {
+	margin-top: 20%;
+	font-size: 5rem;
+}
+.text-center {
+	text-align: center;
+}
+p.lead {
+	font-size: 1.6rem;
+}
+.container {
+	max-width: 75rem;
+	margin: 0 auto;
+	padding: 1rem;
+}
+.header {
+	background: var(--light-bg-color);
+	color: var(--dark-text-color);
+}
+.header .container {
+	padding: 1rem 1.75rem 1.75rem 1.75rem;
+}
+.header h1 {
+	font-size: 2.5rem;
+	font-weight: 500;
+}
+.header p {
+	font-size: 1.2rem;
+	margin: 0;
+	line-height: 2.5;
+}
+.header a {
+	color: var(--brand-primary-color);
+	margin-left: 2rem;
+	display: none;
+	text-decoration: none;
+}
+.header:hover a {
+	display: inline;
+}
+
+.footer {
+	background: var(--dark-bg-color);
+	color: var(--light-text-color);
+}
+.footer .container {
+	border-top: 1px solid #e7e7e7;
+	margin-top: 1rem;
+	text-align: center;
+}
+
+.source {
+	background: #343434;
+	color: var(--light-text-color);
+	padding: 0.5em 1em;
+	border-radius: 5px;
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	font-size: 0.85rem;
+	margin: 0;
+	overflow-x: scroll;
+}
+.source span.line {
+	line-height: 1.4;
+}
+.source span.line .number {
+	color: #666;
+}
+.source .line .highlight {
+	display: block;
+	background: var(--dark-text-color);
+	color: var(--light-text-color);
+}
+.source span.highlight .number {
+	color: #fff;
+}
+
+.tabs {
+	list-style: none;
+	list-style-position: inside;
+	margin: 0;
+	padding: 0;
+	margin-bottom: -1px;
+}
+.tabs li {
+	display: inline;
+}
+.tabs a:link,
+.tabs a:visited {
+	padding: 0rem 1rem;
+	line-height: 2.7;
+	text-decoration: none;
+	color: var(--dark-text-color);
+	background: var(--light-bg-color);
+	border: 1px solid rgba(0,0,0,0.15);
+	border-bottom: 0;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	display: inline-block;
+}
+.tabs a:hover {
+	background: var(--light-bg-color);
+	border-color: rgba(0,0,0,0.15);
+}
+.tabs a.active {
+	background: var(--main-bg-color);
+	color: var(--main-text-color);
+}
+.tab-content {
+	background: var(--main-bg-color);
+	border: 1px solid rgba(0,0,0,0.15);
+}
+.content {
+	padding: 1rem;
+}
+.hide {
+	display: none;
+}
+
+.alert {
+	margin-top: 2rem;
+	display: block;
+	text-align: center;
+	line-height: 3.0;
+	background: #d9edf7;
+	border: 1px solid #bcdff1;
+	border-radius: 5px;
+	color: #31708f;
+}
+ul, ol {
+	line-height: 1.8;
+}
+
+table {
+	width: 100%;
+	overflow: hidden;
+}
+th {
+	text-align: left;
+	border-bottom: 1px solid #e7e7e7;
+	padding-bottom: 0.5rem;
+}
+td {
+	padding: 0.2rem 0.5rem 0.2rem 0;
+}
+tr:hover td {
+	background: #f1f1f1;
+}
+td pre {
+	white-space: pre-wrap;
+}
+
+.trace a {
+	color: inherit;
+}
+.trace table {
+	width: auto;
+}
+.trace tr td:first-child {
+	min-width: 5em;
+	font-weight: bold;
+}
+.trace td {
+	background: var(--light-bg-color);
+	padding: 0 1rem;
+}
+.trace td pre {
+	margin: 0;
+}
+.args {
+	display: none;
+}
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
new file mode 100644
index 0000000..f36f8b5
--- /dev/null
+++ b/app/Views/errors/html/debug.js
@@ -0,0 +1,128 @@
+//--------------------------------------------------------------------
+// Tabs
+//--------------------------------------------------------------------
+
+var tabLinks    = new Array();
+var contentDivs = new Array();
+
+function init()
+{
+	// Grab the tab links and content divs from the page
+	var tabListItems = document.getElementById('tabs').childNodes;
+	console.log(tabListItems);
+	for (var i = 0; i < tabListItems.length; i ++)
+	{
+		if (tabListItems[i].nodeName == "LI")
+		{
+			var tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
+			var id          = getHash(tabLink.getAttribute('href'));
+			tabLinks[id]    = tabLink;
+			contentDivs[id] = document.getElementById(id);
+		}
+	}
+
+	// Assign onclick events to the tab links, and
+	// highlight the first tab
+	var i = 0;
+
+	for (var id in tabLinks)
+	{
+		tabLinks[id].onclick = showTab;
+		tabLinks[id].onfocus = function () {
+			this.blur()
+		};
+		if (i == 0)
+		{
+			tabLinks[id].className = 'active';
+		}
+		i ++;
+	}
+
+	// Hide all content divs except the first
+	var i = 0;
+
+	for (var id in contentDivs)
+	{
+		if (i != 0)
+		{
+			console.log(contentDivs[id]);
+			contentDivs[id].className = 'content hide';
+		}
+		i ++;
+	}
+}
+
+//--------------------------------------------------------------------
+
+function showTab()
+{
+	var selectedId = getHash(this.getAttribute('href'));
+
+	// Highlight the selected tab, and dim all others.
+	// Also show the selected content div, and hide all others.
+	for (var id in contentDivs)
+	{
+		if (id == selectedId)
+		{
+			tabLinks[id].className    = 'active';
+			contentDivs[id].className = 'content';
+		}
+		else
+		{
+			tabLinks[id].className    = '';
+			contentDivs[id].className = 'content hide';
+		}
+	}
+
+	// Stop the browser following the link
+	return false;
+}
+
+//--------------------------------------------------------------------
+
+function getFirstChildWithTagName(element, tagName)
+{
+	for (var i = 0; i < element.childNodes.length; i ++)
+	{
+		if (element.childNodes[i].nodeName == tagName)
+		{
+			return element.childNodes[i];
+		}
+	}
+}
+
+//--------------------------------------------------------------------
+
+function getHash(url)
+{
+	var hashPos = url.lastIndexOf('#');
+	return url.substring(hashPos + 1);
+}
+
+//--------------------------------------------------------------------
+
+function toggle(elem)
+{
+	elem = document.getElementById(elem);
+
+	if (elem.style && elem.style['display'])
+	{
+		// Only works with the "style" attr
+		var disp = elem.style['display'];
+	}
+	else if (elem.currentStyle)
+	{
+		// For MSIE, naturally
+		var disp = elem.currentStyle['display'];
+	}
+	else if (window.getComputedStyle)
+	{
+		// For most other browsers
+		var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+	}
+
+	// Toggle the state of the "display" style
+	elem.style.display = disp == 'block' ? 'none' : 'block';
+
+	return false;
+}
\ No newline at end of file
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
new file mode 100644
index 0000000..1cca20c
--- /dev/null
+++ b/app/Views/errors/html/error_404.php
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>404 Page Not Found</title>
+
+	<style>
+		div.logo {
+			height: 200px;
+			width: 155px;
+			display: inline-block;
+			opacity: 0.08;
+			position: absolute;
+			top: 2rem;
+			left: 50%;
+			margin-left: -73px;
+		}
+		body {
+			height: 100%;
+			background: #fafafa;
+			font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+			color: #777;
+			font-weight: 300;
+		}
+		h1 {
+			font-weight: lighter;
+			letter-spacing: 0.8;
+			font-size: 3rem;
+			margin-top: 0;
+			margin-bottom: 0;
+			color: #222;
+		}
+		.wrap {
+			max-width: 1024px;
+			margin: 5rem auto;
+			padding: 2rem;
+			background: #fff;
+			text-align: center;
+			border: 1px solid #efefef;
+			border-radius: 0.5rem;
+			position: relative;
+		}
+		pre {
+			white-space: normal;
+			margin-top: 1.5rem;
+		}
+		code {
+			background: #fafafa;
+			border: 1px solid #efefef;
+			padding: 0.5rem 1rem;
+			border-radius: 5px;
+			display: block;
+		}
+		p {
+			margin-top: 1.5rem;
+		}
+		.footer {
+			margin-top: 2rem;
+			border-top: 1px solid #efefef;
+			padding: 1em 2em 0 2em;
+			font-size: 85%;
+			color: #999;
+		}
+		a:active,
+		a:link,
+		a:visited {
+			color: #dd4814;
+		}
+	</style>
+</head>
+<body>
+	<div class="wrap">
+		<h1>404 - File Not Found</h1>
+
+		<p>
+			<?php if (! empty($message) && $message !== '(null)') : ?>
+				<?= nl2br(esc($message)) ?>
+			<?php else : ?>
+				Sorry! Cannot seem to find the page you were looking for.
+			<?php endif ?>
+		</p>
+	</div>
+</body>
+</html>
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
new file mode 100644
index 0000000..22b4ecd
--- /dev/null
+++ b/app/Views/errors/html/error_exception.php
@@ -0,0 +1,400 @@
+<?php $error_id = uniqid('error', true); ?>
+<!doctype html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="robots" content="noindex">
+
+	<title><?= esc($title) ?></title>
+	<style type="text/css">
+		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+	</style>
+
+	<script type="text/javascript">
+		<?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
+	</script>
+</head>
+<body onload="init()">
+
+	<!-- Header -->
+	<div class="header">
+		<div class="container">
+			<h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
+			<p>
+				<?= nl2br(esc($exception->getMessage())) ?>
+				<a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
+				   rel="noreferrer" target="_blank">search &rarr;</a>
+			</p>
+		</div>
+	</div>
+
+	<!-- Source -->
+	<div class="container">
+		<p><b><?= esc(static::cleanPath($file, $line)) ?></b> at line <b><?= esc($line) ?></b></p>
+
+		<?php if (is_file($file)) : ?>
+			<div class="source">
+				<?= static::highlightFile($file, $line, 15); ?>
+			</div>
+		<?php endif; ?>
+	</div>
+
+	<div class="container">
+
+		<ul class="tabs" id="tabs">
+			<li><a href="#backtrace">Backtrace</a></li>
+			<li><a href="#server">Server</a></li>
+			<li><a href="#request">Request</a></li>
+			<li><a href="#response">Response</a></li>
+			<li><a href="#files">Files</a></li>
+			<li><a href="#memory">Memory</a></li>
+		</ul>
+
+		<div class="tab-content">
+
+			<!-- Backtrace -->
+			<div class="content" id="backtrace">
+
+				<ol class="trace">
+				<?php foreach ($trace as $index => $row) : ?>
+
+					<li>
+						<p>
+							<!-- Trace info -->
+							<?php if (isset($row['file']) && is_file($row['file'])) :?>
+								<?php
+								if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true))
+								{
+									echo esc($row['function'] . ' ' . static::cleanPath($row['file']));
+								}
+								else
+								{
+									echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']);
+								}
+								?>
+							<?php else : ?>
+								{PHP internal code}
+							<?php endif; ?>
+
+							<!-- Class/Method -->
+							<?php if (isset($row['class'])) : ?>
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
+								<?php if (! empty($row['args'])) : ?>
+									<?php $args_id = $error_id . 'args' . $index ?>
+									( <a href="#" onclick="return toggle('<?= esc($args_id, 'attr') ?>');">arguments</a> )
+									<div class="args" id="<?= esc($args_id, 'attr') ?>">
+										<table cellspacing="0">
+
+										<?php
+										$params = null;
+										// Reflection by name is not available for closure function
+										if (substr($row['function'], -1) !== '}')
+										{
+											$mirror = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
+											$params = $mirror->getParameters();
+										}
+										foreach ($row['args'] as $key => $value) : ?>
+											<tr>
+												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#$key") ?></code></td>
+												<td><pre><?= esc(print_r($value, true)) ?></pre></td>
+											</tr>
+										<?php endforeach ?>
+
+										</table>
+									</div>
+								<?php else : ?>
+									()
+								<?php endif; ?>
+							<?php endif; ?>
+
+							<?php if (! isset($row['class']) && isset($row['function'])) : ?>
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;	<?= esc($row['function']) ?>()
+							<?php endif; ?>
+						</p>
+
+						<!-- Source? -->
+						<?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
+							<div class="source">
+								<?= static::highlightFile($row['file'], $row['line']) ?>
+							</div>
+						<?php endif; ?>
+					</li>
+
+				<?php endforeach; ?>
+				</ol>
+
+			</div>
+
+			<!-- Server -->
+			<div class="content" id="server">
+				<?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
+					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
+					{
+						continue;
+					} ?>
+
+					<h3>$<?= esc($var) ?></h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Key</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+							<tr>
+								<td><?= esc($key) ?></td>
+								<td>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
+									<?php else: ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
+									<?php endif; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endforeach ?>
+
+				<!-- Constants -->
+				<?php $constants = get_defined_constants(true); ?>
+				<?php if (! empty($constants['user'])) : ?>
+					<h3>Constants</h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Key</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($constants['user'] as $key => $value) : ?>
+							<tr>
+								<td><?= esc($key) ?></td>
+								<td>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
+									<?php else: ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
+									<?php endif; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+				<?php endif; ?>
+			</div>
+
+			<!-- Request -->
+			<div class="content" id="request">
+				<?php $request = \Config\Services::request(); ?>
+
+				<table>
+					<tbody>
+						<tr>
+							<td style="width: 10em">Path</td>
+							<td><?= esc($request->uri) ?></td>
+						</tr>
+						<tr>
+							<td>HTTP Method</td>
+							<td><?= esc($request->getMethod(true)) ?></td>
+						</tr>
+						<tr>
+							<td>IP Address</td>
+							<td><?= esc($request->getIPAddress()) ?></td>
+						</tr>
+						<tr>
+							<td style="width: 10em">Is AJAX Request?</td>
+							<td><?= $request->isAJAX() ? 'yes' : 'no' ?></td>
+						</tr>
+						<tr>
+							<td>Is CLI Request?</td>
+							<td><?= $request->isCLI() ? 'yes' : 'no' ?></td>
+						</tr>
+						<tr>
+							<td>Is Secure Request?</td>
+							<td><?= $request->isSecure() ? 'yes' : 'no' ?></td>
+						</tr>
+						<tr>
+							<td>User Agent</td>
+							<td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
+						</tr>
+
+					</tbody>
+				</table>
+
+
+				<?php $empty = true; ?>
+				<?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
+					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
+					{
+						continue;
+					} ?>
+
+					<?php $empty = false; ?>
+
+					<h3>$<?= esc($var) ?></h3>
+
+					<table style="width: 100%">
+						<thead>
+							<tr>
+								<th>Key</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+							<tr>
+								<td><?= esc($key) ?></td>
+								<td>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
+									<?php else: ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
+									<?php endif; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endforeach ?>
+
+				<?php if ($empty) : ?>
+
+					<div class="alert">
+						No $_GET, $_POST, or $_COOKIE Information to show.
+					</div>
+
+				<?php endif; ?>
+
+				<?php $headers = $request->getHeaders(); ?>
+				<?php if (! empty($headers)) : ?>
+
+					<h3>Headers</h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Header</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($headers as $value) : ?>
+							<?php if (empty($value))
+							{
+								continue;
+							} ?>
+							<?php if (! is_array($value))
+							{
+								$value = [$value];
+							} ?>
+							<?php foreach ($value as $h) : ?>
+								<tr>
+									<td><?= esc($h->getName(), 'html') ?></td>
+									<td><?= esc($h->getValueLine(), 'html') ?></td>
+								</tr>
+							<?php endforeach; ?>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endif; ?>
+			</div>
+
+			<!-- Response -->
+			<?php
+				$response = \Config\Services::response();
+				$response->setStatusCode(http_response_code());
+			?>
+			<div class="content" id="response">
+				<table>
+					<tr>
+						<td style="width: 15em">Response Status</td>
+						<td><?= esc($response->getStatusCode() . ' - ' . $response->getReason()) ?></td>
+					</tr>
+				</table>
+
+				<?php $headers = $response->getHeaders(); ?>
+				<?php if (! empty($headers)) : ?>
+					<?php natsort($headers) ?>
+
+					<h3>Headers</h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Header</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($headers as $name => $value) : ?>
+							<tr>
+								<td><?= esc($name, 'html') ?></td>
+								<td><?= esc($response->getHeaderLine($name), 'html') ?></td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endif; ?>
+			</div>
+
+			<!-- Files -->
+			<div class="content" id="files">
+				<?php $files = get_included_files(); ?>
+
+				<ol>
+				<?php foreach ($files as $file) :?>
+					<li><?= esc(static::cleanPath($file)) ?></li>
+				<?php endforeach ?>
+				</ol>
+			</div>
+
+			<!-- Memory -->
+			<div class="content" id="memory">
+
+				<table>
+					<tbody>
+						<tr>
+							<td>Memory Usage</td>
+							<td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
+						</tr>
+						<tr>
+							<td style="width: 12em">Peak Memory Usage:</td>
+							<td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
+						</tr>
+						<tr>
+							<td>Memory Limit:</td>
+							<td><?= esc(ini_get('memory_limit')) ?></td>
+						</tr>
+					</tbody>
+				</table>
+
+			</div>
+
+		</div>  <!-- /tab-content -->
+
+	</div> <!-- /container -->
+
+	<div class="footer">
+		<div class="container">
+
+			<p>
+				Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+				PHP: <?= esc(phpversion()) ?>  &mdash;
+				CodeIgniter: <?= esc(\CodeIgniter\CodeIgniter::CI_VERSION) ?>
+			</p>
+
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php
new file mode 100644
index 0000000..cca49c2
--- /dev/null
+++ b/app/Views/errors/html/production.php
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="robots" content="noindex">
+
+	<title>Whoops!</title>
+
+	<style type="text/css">
+		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+	</style>
+</head>
+<body>
+
+	<div class="container text-center">
+
+		<h1 class="headline">Whoops!</h1>
+
+		<p class="lead">We seem to have hit a snag. Please try again later...</p>
+
+	</div>
+
+</body>
+
+</html>
diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
new file mode 100644
index 0000000..7050aa9
--- /dev/null
+++ b/app/Views/welcome_message.php
@@ -0,0 +1,324 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Welcome to CodeIgniter 4!</title>
+	<meta name="description" content="The small framework with powerful features">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="shortcut icon" type="image/png" href="/favicon.ico"/>
+
+	<!-- STYLES -->
+
+	<style {csp-style-nonce}>
+		* {
+			transition: background-color 300ms ease, color 300ms ease;
+		}
+		*:focus {
+			background-color: rgba(221, 72, 20, .2);
+			outline: none;
+		}
+		html, body {
+			color: rgba(33, 37, 41, 1);
+			font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+			font-size: 16px;
+			margin: 0;
+			padding: 0;
+			-webkit-font-smoothing: antialiased;
+			-moz-osx-font-smoothing: grayscale;
+			text-rendering: optimizeLegibility;
+		}
+		header {
+			background-color: rgba(247, 248, 249, 1);
+			padding: .4rem 0 0;
+		}
+		.menu {
+			padding: .4rem 2rem;
+		}
+		header ul {
+			border-bottom: 1px solid rgba(242, 242, 242, 1);
+			list-style-type: none;
+			margin: 0;
+			overflow: hidden;
+			padding: 0;
+			text-align: right;
+		}
+		header li {
+			display: inline-block;
+		}
+		header li a {
+			border-radius: 5px;
+			color: rgba(0, 0, 0, .5);
+			display: block;
+			height: 44px;
+			text-decoration: none;
+		}
+		header li.menu-item a {
+			border-radius: 5px;
+			margin: 5px 0;
+			height: 38px;
+			line-height: 36px;
+			padding: .4rem .65rem;
+			text-align: center;
+		}
+		header li.menu-item a:hover,
+		header li.menu-item a:focus {
+			background-color: rgba(221, 72, 20, .2);
+			color: rgba(221, 72, 20, 1);
+		}
+		header .logo {
+			float: left;
+			height: 44px;
+			padding: .4rem .5rem;
+		}
+		header .menu-toggle {
+			display: none;
+			float: right;
+			font-size: 2rem;
+			font-weight: bold;
+		}
+		header .menu-toggle button {
+			background-color: rgba(221, 72, 20, .6);
+			border: none;
+			border-radius: 3px;
+			color: rgba(255, 255, 255, 1);
+			cursor: pointer;
+			font: inherit;
+			font-size: 1.3rem;
+			height: 36px;
+			padding: 0;
+			margin: 11px 0;
+			overflow: visible;
+			width: 40px;
+		}
+		header .menu-toggle button:hover,
+		header .menu-toggle button:focus {
+			background-color: rgba(221, 72, 20, .8);
+			color: rgba(255, 255, 255, .8);
+		}
+		header .heroe {
+			margin: 0 auto;
+			max-width: 1100px;
+			padding: 1rem 1.75rem 1.75rem 1.75rem;
+		}
+		header .heroe h1 {
+			font-size: 2.5rem;
+			font-weight: 500;
+		}
+		header .heroe h2 {
+			font-size: 1.5rem;
+			font-weight: 300;
+		}
+		section {
+			margin: 0 auto;
+			max-width: 1100px;
+			padding: 2.5rem 1.75rem 3.5rem 1.75rem;
+		}
+		section h1 {
+			margin-bottom: 2.5rem;
+		}
+		section h2 {
+			font-size: 120%;
+			line-height: 2.5rem;
+			padding-top: 1.5rem;
+		}
+		section pre {
+			background-color: rgba(247, 248, 249, 1);
+			border: 1px solid rgba(242, 242, 242, 1);
+			display: block;
+			font-size: .9rem;
+			margin: 2rem 0;
+			padding: 1rem 1.5rem;
+			white-space: pre-wrap;
+			word-break: break-all;
+		}
+		section code {
+			display: block;
+		}
+		section a {
+			color: rgba(221, 72, 20, 1);
+		}
+		section svg {
+			margin-bottom: -5px;
+			margin-right: 5px;
+			width: 25px;
+		}
+		.further {
+			background-color: rgba(247, 248, 249, 1);
+			border-bottom: 1px solid rgba(242, 242, 242, 1);
+			border-top: 1px solid rgba(242, 242, 242, 1);
+		}
+		.further h2:first-of-type {
+			padding-top: 0;
+		}
+		footer {
+			background-color: rgba(221, 72, 20, .8);
+			text-align: center;
+		}
+		footer .environment {
+			color: rgba(255, 255, 255, 1);
+			padding: 2rem 1.75rem;
+		}
+		footer .copyrights {
+			background-color: rgba(62, 62, 62, 1);
+			color: rgba(200, 200, 200, 1);
+			padding: .25rem 1.75rem;
+		}
+		@media (max-width: 559px) {
+			header ul {
+				padding: 0;
+			}
+			header .menu-toggle {
+				padding: 0 1rem;
+			}
+			header .menu-item {
+				background-color: rgba(244, 245, 246, 1);
+				border-top: 1px solid rgba(242, 242, 242, 1);
+				margin: 0 15px;
+				width: calc(100% - 30px);
+			}
+			header .menu-toggle {
+				display: block;
+			}
+			header .hidden {
+				display: none;
+			}
+			header li.menu-item a {
+				background-color: rgba(221, 72, 20, .1);
+			}
+			header li.menu-item a:hover,
+			header li.menu-item a:focus {
+				background-color: rgba(221, 72, 20, .7);
+				color: rgba(255, 255, 255, .8);
+			}
+		}
+	</style>
+</head>
+<body>
+
+<!-- HEADER: MENU + HEROE SECTION -->
+<header>
+
+	<div class="menu">
+		<ul>
+			<li class="logo"><a href="https://codeigniter.com" target="_blank"><img height="44" title="CodeIgniter Logo"
+																					alt="Visit CodeIgniter.com official website!"
+																					src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAlgAAAClCAMAAAC3K3MAAAACJVBMVEUAAADdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBTdSBQGpOIGAAAAt3RSTlMAAwYlGxGPQwXR7ATQ/wcBzci0GoP2UgA143tmAjyjECfato0IKmCthAo0bXaqgQlH7VtIC1B0DokyoZEvSzOFTp6XeT2YORiKIn9MHDHk2VpEd0rHWTtRiGUwRfVJHQ9BxnBGqSMevWxXb25caIZ6lLUpoC4mYxmOLCh1Laimll5zvj8+QkANHzo2n7w3a10gogx8gmfPX7I4F6vYT4t4JCtyWGScu84hjLNim2lqU02sYROAkFWpUS6tAAAVU0lEQVR4Aeza+VITQRSF8ZMRFQ2HcZQYhCwiokZFHUFxUVTEfX//lxHKEkMW0pPc//x+jzD11dyu263/BAAAAAAAAAAAAGqZFA84NScg3ukzZxUOmD93Pr4soL5gLwoIll+wi0xA/B/LFy8JCD5j+cBSLiA+rMblpoBAyw0fujKnOEC+4j9WWwKCJ+GhtsIAbf/VURSgtuIjXQUBrq75yLVcIYDmuvtcVwhgw/1uKAKQFe53s64AwC0f19PsgNsecEfRwCA8cFfArLJNDyqaAmaT3/Ow+wJmkj8oPawnYLauGg4PC3hYOjwsYKt0eFjAsh0eFrDlcTJNCcj/na/CFqTA9qPS4zzWdICdJx7vqaYC1J55hLDFO7gfHOF5rikALzZ9kpeaArDrk/UUB6zbeTSDuOcMI7wSUNX269ITdAVU1HrjScp5AdW09jxRR0A19T1P9lZAJfUlJ9gXKmIOhocF1N45yXsB6XbWnaT4ICBZ/tFp1j4JSPbZqdoCUm2UTrWvIa1cwAi7pZOtakj25WtTwKBv352uoyHznR8/MwHHLS64iq4GzRV28YsPid/snf9fFEeax6snRLq3KesGaEel6aFxjHSEYGM8XxBlXy9ss5c9meAXccWVcRskd4jx2MSgwRzGDQaTze1ijCb3JcldvOSSve97d3/fATPz9NT0U033dM8iC+/faNvqrqrPPFX11FNPc0gQL1qryTpDVxkIb7S22XaMIpwlPLJZvH7uPCObFLmMvhl6TC6jkmcXNmrTIDTN7yM9Jfi4gH3hKNmU6D81ivzMIs8+F40yY+TZ5VKwrn5+GUm8lh/PEECvtHgDhc257UBLKJtBWAYtc4U8s6R+QYOwz2dc5PKel3aSIuogv3XdPEE2IVlaYlLaTMKyr6JdOtVCNp4f00D6dOKiA+QbB8etFc4P7amW4iBJGssa/wt3jb+0LL2uwnI3w7idBvsq+9vqktvTWXjmPaM7dFItLMBUVtCQcTJRZUnj066imGU9K0rXNYskTleNwtIthFz9x21cWKo14yo2XN5I1AM0CDNFQFgRSE5ZO4+nsWQ3Y3UbXK5F/oqjn9N1H7fLTHLm+7VyWzWpZKNx6fpHni2FRsQ+nND877roAW9KdRKWlYCwrPoLC7WvTvnyjQzZYNY5QpiW18z9X9Go2IcYiY0+kqZCZkcZSQ7ZrFEUv7Q3QFgDAmG9Vb7c+Gy73GG7+e18dGU9F38mcTFQ9eZNkhxWrXl0Gqmf/M4/1KJQG8Gvb7QTIrNLC1ZHeSozQ6MS359VeGO9J0h1ENYrEQeRV5UVbG+trKzwzh/M26BY6HUzSzaWuT00EEMuD0p7aWSadRIH9RZdj9Y6JPHtjvqa8gq34ZfYKK+QInXm3VdLDHOP2ml7a8UNRb9Igzmjc5s2EbmcXH55c8BxnPZ2x3EMkwJ2ckPOPC0xH2synXyPbq7XgFiXCKGiNSirN14jAZ13JAL0nqTANZIU3eApiPWy72Wejd0DtsFbmVFikKUbNCoHdFIrqqd5u0viFxx/jT8gFt2xFnSHk3fbb+LXIJIZKbidTUVeG9buzToe4MbXFxJf11vxSjSS79FN/BrkTtRTE7nWiNLqScX+8mZ+GPHGw2scSlpYthynR/ODz4SwtPMba7A66XrsYoRDHVTq6oBHvohxlyC8D1PtpIVlkBrQO5+JkBu28a/hTfVCuhsAecimEbinklrI3QO3kk4QxkXOAbnwq8YSHwQFV+ry3GLpvsU5NRMgLKbKg+Ui78tqTbFcTM5eKZdxEyJUny9dyWGvd7/4b+1R4lk/DBdSJnsV+qCgrifW8s1LJDRvhrA4b/vr/KCZhkf7iNTCDPhtx3EDgwrLOugqJgWUJndYxQMSZoYUb1DPN7VOvVz+4+MqhR9qbVK0iiJnejPinyg+9FvTkxWvZStDMxZbueqWr+UIyd1111gqPnTm1wo8cWiwUlp/7nKUk2gsuav0QKsPuRV8wlXob9zKgBSzya3WdYtb5EWywmKXokWdtslhTM9FxFufbYtgtGbVWElvZlloYeVmFH804sIp5D9DYwEm9Mltbi7X11RdVa3pmuzfcA2YNB9zfa+lKdPWjFKZMn8w781pU4fvaVwdpnVsrcxV36EBLFW20T3/oDLDG0XHq4vsQvUjCGuYhiCtoyOVQcOSh56tKWIgS1BS2RLPgxZ/k8eff7qqBtLusAfb9N/iRaZ9VRoQtn7qBShDxPGKEJNlQiy/b7FN90wjLqyPQ52o0i/jL7NjDhPWAhusuN1ujO65CaRNEBSRpiE5w0hkGqNNpYM3Bs7gH9wQ8DBEkWZv2GV+RwjbblUIy2BomFC3SFgvwguE+KnI4gq9hgjrR2crX16xoi/o1wv0Q0m10XAYcozTaG0kJJ8G1KA3QjRHmoXZaVgOGcvVYVIERDQuPB+vQk4gLAsXFmqwcgEvs5cA8jIFahLWOMVB7DCKPvWGFkqZHSQqBTNiWpvgLfJOrwZHByonL8oqgm4I3hud4N1qXkdH1hUdwYMFFc7W3YExFxWWaq7vitTRNZd/ainjIl3QSUiu0ZBcEtq8R3toCI6QqDyA3+9ceDc9TK5b3VXuaYgM2BEKKO6gtYrrNtmIsD6rnGv7ikyrIdz2skkBs1hEa0WL5SfXlmeWX1jmpHvQmqh8noFbpnzJkhUCTHBLSVdtvjZqfaxxPz5UWJqyRvi5e6aVhuTcOBHAxsO4S5dJVJyIw+ipvPeyu9WiO0DtP0d9vrAxkJD9xCta7fgcWvhn5SLtiiJlVrzvRa/I3/LCQp1uL3i28US2WASbO+G9lSTLxx60s2phzV7JFotRp+G17JKC9j9Y5dV81dzr5bXLXyyU9fbBqw/KdJTG9ikKNPcX2ygj7drj/0kM2xUKP9m4W17j/tXQLsgmGpYmcWZI+UYdksJLEIh1gZEQqAveuP23BGhJ+1ptB3QUH9ast1YNHOrfeQ6Xn/BFIv6zGfRqDuSebtC9R7Uh5m13hW1yVO/eLu9etORuPBq4OzDLepv3gEzD35evvgC/ak/hF7ISiUTU8xEndLEI/sGkQuDXFg3ZiJad2VsVf6lzhoyWmSleeGjDBV6x+q+rnthPy9ziilyqHISAeYHcQFfcs6DBBpHw5q9k9HHUQkuex/1H3UFtdKOyQpkRX5wICKs5y0gNjMGTapvAAzdnk/7wTks6Uth8ZgFdwSJeAPi7RxL4zcyviyOWqMgMeuSiG4tszDUJEqh85vdNNOJKISlcWC561XuN9wM8zqaE+wagrIsxIyRcGoW9gW7yhIXlRIuDlBVRkE4BBvPetZkITHkGRUUYcpU5PytyhU5goWMWNiSkVcFbuX73ihMmSkydxK5iNwPv2qInzOOei3oLC/jH4K9ZbKSwFpFdAnRvGEzFkEp4nrM9YfFupVSIzRt8UQhldBGhsHw/jfYwwvJkbwU7PQD2RLgc+ieInK0OvfmmLsKy37P5FbBa+/d3npJofAV2Uo+0r3gRjUIFYTGIEuoTanOfxHtR9xFcFbiw7J1YAxfCCys9F0lYoZwevHIvVjfpQRg/kQig5IVl9zEDdQniqIH+7H+uNQ6yMdJIaA+jJUEj5cQND8JyxBZELKwpdP0rFNZtXxFZU2BPJHSQnTLR9bbFW27UImu+NpqGGX8y2ZzYtzQA8xJjnVE+Wy+d3DBh9WtYryDCWhKGeGXu8sL6qFzkbIFU8RIiLBcTFvtWJCzYMpnG/XbiU7To84Dz+GXx5AJd0WZhXlrbCSj9OyqmOZshvdFO3Ej7NkpYju+oGsC4oRCa8E99BhcWcKP8Is1+dI1n+kdBwhqofPafCISVsiHUzF8FJhBWJ8OEdR0fgwxx52i+CoGLdL5KWK2ZxIXV3AB1Cp+O4KZJRUQ8Fwz2375JcPBGc/CoLRBWNxefhHsb1kSgBjtQxMK6je5sXCYcM/6fqiOqwnDwIJvFhdUmdgwGMCHO5hRfWLASii4siBCJvSp8OdKi0Gu0B6SagiescHNbRYY/12MacVhxFXXxKc+gPxZGXcaFhRshUbCatCBs77k0xUH61+ArGBm2INSVSmoSlv5pQsI6GklY/2LC3WJhPU5VVsh34yj/xKt2mH5AVv9H8dXRWTy5z5j/t/GJSFiHUWEV8K2ULDJbiC4sK+G0WPZEVRqA0A9S71GcQj2F1Y7ejay/pkLMbW8w+LMGYaUlwZ7Z8rAsZUhGlTtuea3aw3hhIVVgraAV1JtL0OfZvTGEJZv1EtZTwVGLAypZjxFNPLTWTVgOFeewW64UlhtCWI2kBmFNgHdV6NyzjY+POO8McGknHvLTU6zCvagR+iXyPMQJEVFYB2Cgqo+wBsCcw44t7H6vh94ljm6ov7DuZsTLyxFs7QZI3wuEpT3+TsRjdd3V2FJwXjqkCj9IRGCEcuK4bfFrAF9CYvXvhPyuOgKIkdo4z5sXJK8SJxMbN1hhmnIHiUavXZOwFv1js42FldOfCuf/2jBf5BNJFyEhPfolNunE0Q4x3GDiwjIIJqwLuLCWxT+wVl2ICl2IREjED5u5yyqTgHiWu7MjZCIPBKfm8+rjZH3ewYXFm/Uc6glH5jhIR4dfBjmhjwOlK3VFLoqe1we+X1SvDi6sI3Hy9s7XR1iv8wvY0ZJDx76RjRwiHCOhoyHSCjB8EAzov4pv7uPMulhYd3gTqf9Z9C0lpKPVR3kq4NYphtb3vmi6MoA/D186OeIG/TciBo8Aig57j/JgitaPXjaMrmwqtFrxUzpJe95Tj+mBO+sPhfPeyT2xsJD5v1OjsL4IFUxkvnVUtPEki4TlCJ6HXA4U1vW6ZnMSz96VXhITI4GRkDzFZ+98CK79SBILC1vghBCWS+IIy5CR6MN8d/cBCuS731+Cu9YVlt4jEBY8D7uc/om4V/593fktjS+sY5g3Ofmvp+Rbaj9LYaMzuw8HSuNDB6u8eUgnHOwRf1bQFYaWnQkvLP2URKq4gphmCFh4vNLLzAJykVbBnhEaFZ80EV9Gfqmuv0I3uWazas/7jOSYAsbqkMDmU51ExTuysO8o0g+weF6Wgxyk469zIyFx8bQfyC4G9NFJn4oup7/vVzP4qe19kt9v60ZpswUmEFZ6DlPQWyryGiAsVHRdrFpXfWbbmIrnxKiZeZ9xUZMXlvk8wQkXKfGl/x8hOFi7tNrDhc7yn/2CuCA7xUdNzeoCYZlTpcm8JkpqPZ5fPZT3m+fRHnWQvuxiMb4O9TwapgUqOZJBX2MZFxbaG2z1gJk2ewWOTYwkISxwWcQuDMnQJPyNRAqxovZ9XgVs/2Mo+gcddnD9eeXZLq1KnBYVRDdIs1WhbbKCGiHCBs+V+mfMq5XaDMJCqqA9eVeWa/061CJmhNQd6PNQi6XrJel2gmeOcRX6D61Uof+EiXf8hHYQhAocSiynHGAukUhAfBQwNCx51/sXbC+4p6ijzBG48rm3ek31ga7Mq6XqvgJnKd7mchT2UBBWdYS43ZciQMo7P3oHnwhhVbAVxXW/sSwWvOCBXVpMK2cYFs3RpqM328dgXJtsVavSBWh9KgEaHmnVvi8X//FF5DNk+yvhZWGXTmogM2FTIL8wY62x5A7lK1xuDd40uUzPcG5NGNahHq+AI+VeOQuXHpdzmenWSMXHFifLjb7fhl7q6c8VZ6TWtR7NM2R4LBdSBTin3uoesnpBIMIwV9EgiwjL7nJdN+e7mTZbxRd2Fao9Ynz4BrUnT/eS0r+/TqFCH5aM97eJaKHXrLew0qm6fVS/EQ8Aml/hv+AvbgKeqqjuK/OHLev9+VdoJS76+Hz3KkiaE9ZrrfAULv935bpPP4Hu9HaftaqXW7IoyFxWcGHhffYB9eheIV98+Smwnx6+CjWp2PmfGBxPVFhI2pPdBCd2AoC0jHQAxmMJqy6Oi5wbDkglJyviMjpmqRDjcgqduzflcGHxHhu9DU+kj74NeGymAis0hUYAxUA+l6CwkFXhm6RmxvZQMTaf6nNYfO+3b0dIujpCgG+okKbxgK5UrDD5i9LfZ5l4UYjHtQIOvt7KvKQJzi8UnXoaFfHGMClzGo/Iic43dj2F9YsUqZ1h8WhojsikErZX9Hsc4m9MNaM3fe6vv7RgU5yFY3wWL0xYoKufTzYpqOo7R9m63ssOPMqjZQ8qLEg0zaO1tgQfKraHUshZsLjCUnckLKw7la98msRBemLjhnuvL1lFZgodB5RRnfAU7mq+hl3Us53++rP9eJG/8oq8TwXC0mEcnGaqfGpxsUkxxfFY+JF2NEwLHCnAXd7JVo02u7vcVvoVtDlf369j23w/jm1hzESFBa0EmYJiwL7elfYZK8Np0LFB/Uxndc8tX5CRModv2dxdN57zXGE5vshd/iKPyPgXMPkvND+pdgioctZx9hkmuq6BJpsKjmsFWP8OvMtO7a0acZf7VeLx9Ve+Cu1oL+ARQFkSEzZhx59qe8h2op/uZS1Om2FAOxlvHemQRbdmnVuGJ78dzrCKP1899o7RWS6w7Zi0+n+vfrTKF8xX5D4jDQ8f+N0YX+TvP/LTANmrfJlqJPk158JsZbLkIs+V/2911Qrlf/i9rw7OvFHE4o38gxOGXQ6GHnBOVZWor7aRDW207BxTq2p8u/zIXPy+e5Sk532QAv/DSBLostzurNE+J6uZ4C9SfuIUuSqrRExGLow6q7TIOglGkuecIi3Yw3FGxDnyWeGincg0JiMX0X3NdcxZ446s4m10B9pIJvUBSU8dW6eed+RwhmxRpAU8aTcemv5HjHogsT0dCx9VtxZooDrSRmbmj15ZYLN6VBIHOKVjDxIR28LaGhaLd+/Yl0gM4JRv8wTZeoR1Mo5vIWGRwkDZCRvHZGWLfnztZIFsXXAnI/7PW4CjF+yiKA7WPvDre0tuBomQbYvF78Bj/vHPyFaA9RWbY09DzboqRkA1jzGytcES4wK6t2eXJVuDXNEVuKzG+SC+eVwnZFtYwrXx3C0+8cCWQL1uQtau6Fxe29TqJdsQlwIvWDoBmHU2jZyK2wKk/hcONUbl+mrw3NK2uSp/1QKYNQaeFla4PQC7Q3DkYeugL3XlYes0AmobzQ8NbssKOwONc65hqzXK4FCe9kWTSKbhluLCPvo24HEODhbcauinGpUbhSj/4fKnizLZBk1OjvPDONmSFEb/76EeOhVt4TmJbMMjQSwXgtGub92GyeVYyAm/jNy4DcvuMmw0Jnlv+7Z53yYWDw8bvN0yjLMFiWyzTWzYTssjtd0e/98eHAsAAAAADPK3nsWuagEAAAAAAAAAAAAAAABA2mzFN1m8MFwAAAAASUVORK5CYII="></a>
+			</li>
+			<li class="menu-toggle">
+				<button onclick="toggleMenu();">&#9776;</button>
+			</li>
+			<li class="menu-item hidden"><a href="#">Home</a></li>
+			<li class="menu-item hidden"><a href="https://codeigniter4.github.io/userguide/" target="_blank">Docs</a>
+			</li>
+			<li class="menu-item hidden"><a href="https://forum.codeigniter.com/" target="_blank">Community</a></li>
+			<li class="menu-item hidden"><a
+					href="https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md" target="_blank">Contribute</a>
+			</li>
+		</ul>
+	</div>
+
+	<div class="heroe">
+
+		<h1>Welcome to CodeIgniter <?= CodeIgniter\CodeIgniter::CI_VERSION ?></h1>
+
+		<h2>The small framework with powerful features</h2>
+
+	</div>
+
+</header>
+
+<!-- CONTENT -->
+
+<section>
+
+	<h1>About this page</h1>
+
+	<p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
+
+	<p>If you would like to edit this page you will find it located at:</p>
+
+	<pre><code>app/Views/welcome_message.php</code></pre>
+
+	<p>The corresponding controller for this page can be found at:</p>
+
+	<pre><code>app/Controllers/Home.php</code></pre>
+
+</section>
+
+<div class="further">
+
+	<section>
+
+		<h1>Go further</h1>
+
+		<h2>
+			<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><rect x='32' y='96' width='64' height='368' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><line x1='112' y1='224' x2='240' y2='224' style='fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px'/><line x1='112' y1='400' x2='240' y2='400' style='fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px'/><rect x='112' y='160' width='128' height='304' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><rect x='256' y='48' width='96' height='416' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><path d='M422.46,96.11l-40.4,4.25c-11.12,1.17-19.18,11.57-17.93,23.1l34.92,321.59c1.26,11.53,11.37,20,22.49,18.84l40.4-4.25c11.12-1.17,19.18-11.57,17.93-23.1L445,115C443.69,103.42,433.58,94.94,422.46,96.11Z' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/></svg>
+			Learn
+		</h2>
+
+		<p>The User Guide contains an introduction, tutorial, a number of "how to"
+			guides, and then reference documentation for the components that make up
+			the framework. Check the <a href="https://codeigniter4.github.io/userguide"
+			target="_blank">User Guide</a> !</p>
+
+		<h2>
+			<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path d='M431,320.6c-1-3.6,1.2-8.6,3.3-12.2a33.68,33.68,0,0,1,2.1-3.1A162,162,0,0,0,464,215c.3-92.2-77.5-167-173.7-167C206.4,48,136.4,105.1,120,180.9a160.7,160.7,0,0,0-3.7,34.2c0,92.3,74.8,169.1,171,169.1,15.3,0,35.9-4.6,47.2-7.7s22.5-7.2,25.4-8.3a26.44,26.44,0,0,1,9.3-1.7,26,26,0,0,1,10.1,2L436,388.6a13.52,13.52,0,0,0,3.9,1,8,8,0,0,0,8-8,12.85,12.85,0,0,0-.5-2.7Z' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><path d='M66.46,232a146.23,146.23,0,0,0,6.39,152.67c2.31,3.49,3.61,6.19,3.21,8s-11.93,61.87-11.93,61.87a8,8,0,0,0,2.71,7.68A8.17,8.17,0,0,0,72,464a7.26,7.26,0,0,0,2.91-.6l56.21-22a15.7,15.7,0,0,1,12,.2c18.94,7.38,39.88,12,60.83,12A159.21,159.21,0,0,0,284,432.11' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/></svg>
+			Discuss
+		</h2>
+
+		<p>CodeIgniter is a community-developed open source project, with several
+			 venues for the community members to gather and exchange ideas. View all
+			 the threads on <a href="https://forum.codeigniter.com/"
+			 target="_blank">CodeIgniter's forum</a>, or <a href="https://codeigniterchat.slack.com/"
+			 target="_blank">chat on Slack</a> !</p>
+
+		<h2>
+			 <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><line x1='176' y1='48' x2='336' y2='48' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><line x1='118' y1='304' x2='394' y2='304' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><path d='M208,48v93.48a64.09,64.09,0,0,1-9.88,34.18L73.21,373.49C48.4,412.78,76.63,464,123.08,464H388.92c46.45,0,74.68-51.22,49.87-90.51L313.87,175.66A64.09,64.09,0,0,1,304,141.48V48' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/></svg>
+			 Contribute
+		</h2>
+
+		<p>CodeIgniter is a community driven project and accepts contributions
+			 of code and documentation from the community. Why not
+			 <a href="https://codeigniter.com/en/contribute" target="_blank">
+			 join us</a> ?</p>
+
+	</section>
+
+</div>
+
+<!-- FOOTER: DEBUG INFO + COPYRIGHTS -->
+
+<footer>
+	<div class="environment">
+
+		<p>Page rendered in {elapsed_time} seconds</p>
+
+		<p>Environment: <?= ENVIRONMENT ?></p>
+
+	</div>
+
+	<div class="copyrights">
+
+		<p>&copy; <?= date('Y') ?> CodeIgniter Foundation. CodeIgniter is open source project released under the MIT
+			open source licence.</p>
+
+	</div>
+
+</footer>
+
+<!-- SCRIPTS -->
+
+<script>
+	function toggleMenu() {
+		var menuItems = document.getElementsByClassName('menu-item');
+		for (var i = 0; i < menuItems.length; i++) {
+			var menuItem = menuItems[i];
+			menuItem.classList.toggle("hidden");
+		}
+	}
+</script>
+
+<!-- -->
+
+</body>
+</html>
diff --git a/app/index.html b/app/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/app/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..e5e8848
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,47 @@
+{
+	"name": "codeigniter4/framework",
+	"type": "project",
+	"description": "The CodeIgniter framework v4",
+	"homepage": "https://codeigniter.com",
+	"license": "MIT",
+	"require": {
+		"php": "^7.3||^8.0",
+		"ext-curl": "*",
+		"ext-intl": "*",
+		"ext-json": "*",
+		"ext-mbstring": "*",
+		"kint-php/kint": "^3.3",
+		"laminas/laminas-escaper": "^2.6",
+		"psr/log": "^1.1"
+	},
+	"require-dev": {
+		"codeigniter4/codeigniter4-standard": "^1.0",
+		"fakerphp/faker": "^1.9",
+		"mikey179/vfsstream": "^1.6",
+		"phpunit/phpunit": "^9.1",
+		"predis/predis": "^1.1",
+		"squizlabs/php_codesniffer": "^3.3"
+	},
+	"suggest": {
+		"ext-fileinfo": "Improves mime type detection for files"
+	},
+	"autoload": {
+		"psr-4": {
+			"CodeIgniter\\": "system/"
+		},
+		"exclude-from-classmap": [
+			"**/Database/Migrations/**"
+		]
+	},
+	"scripts": {
+		"post-update-cmd": [
+			"CodeIgniter\\ComposerScripts::postUpdate"
+		],
+		"test": "phpunit"
+	},
+	"support": {
+		"forum": "http://forum.codeigniter.com/",
+		"source": "https://github.com/codeigniter4/CodeIgniter4",
+		"slack": "https://codeigniterchat.slack.com"
+	}
+}
diff --git a/env b/env
new file mode 100644
index 0000000..1106ce4
--- /dev/null
+++ b/env
@@ -0,0 +1,125 @@
+#--------------------------------------------------------------------
+# Example Environment Configuration file
+#
+# This file can be used as a starting point for your own
+# custom .env files, and contains most of the possible settings
+# available in a default install.
+#
+# By default, all of the settings are commented out. If you want
+# to override the setting, you must un-comment it by removing the '#'
+# at the beginning of the line.
+#--------------------------------------------------------------------
+
+#--------------------------------------------------------------------
+# ENVIRONMENT
+#--------------------------------------------------------------------
+
+# CI_ENVIRONMENT = production
+
+#--------------------------------------------------------------------
+# APP
+#--------------------------------------------------------------------
+
+# app.baseURL = ''
+# app.forceGlobalSecureRequests = false
+
+# app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'
+# app.sessionCookieName = 'ci_session'
+# app.sessionExpiration = 7200
+# app.sessionSavePath = NULL
+# app.sessionMatchIP = false
+# app.sessionTimeToUpdate = 300
+# app.sessionRegenerateDestroy = false
+
+# app.CSPEnabled = false
+
+#--------------------------------------------------------------------
+# DATABASE
+#--------------------------------------------------------------------
+
+# database.default.hostname = localhost
+# database.default.database = ci4
+# database.default.username = root
+# database.default.password = root
+# database.default.DBDriver = MySQLi
+# database.default.DBPrefix =
+
+# database.tests.hostname = localhost
+# database.tests.database = ci4
+# database.tests.username = root
+# database.tests.password = root
+# database.tests.DBDriver = MySQLi
+# database.tests.DBPrefix =
+
+#--------------------------------------------------------------------
+# CONTENT SECURITY POLICY
+#--------------------------------------------------------------------
+
+# contentsecuritypolicy.reportOnly = false
+# contentsecuritypolicy.defaultSrc = 'none'
+# contentsecuritypolicy.scriptSrc = 'self'
+# contentsecuritypolicy.styleSrc = 'self'
+# contentsecuritypolicy.imageSrc = 'self'
+# contentsecuritypolicy.base_uri = null
+# contentsecuritypolicy.childSrc = null
+# contentsecuritypolicy.connectSrc = 'self'
+# contentsecuritypolicy.fontSrc = null
+# contentsecuritypolicy.formAction = null
+# contentsecuritypolicy.frameAncestors = null
+# contentsecuritypolicy.frameSrc = null
+# contentsecuritypolicy.mediaSrc = null
+# contentsecuritypolicy.objectSrc = null
+# contentsecuritypolicy.pluginTypes = null
+# contentsecuritypolicy.reportURI = null
+# contentsecuritypolicy.sandbox = false
+# contentsecuritypolicy.upgradeInsecureRequests = false
+
+#--------------------------------------------------------------------
+# COOKIE
+#--------------------------------------------------------------------
+
+# cookie.prefix = ''
+# cookie.expires = 0
+# cookie.path = '/'
+# cookie.domain = ''
+# cookie.secure = false
+# cookie.httponly = false
+# cookie.samesite = 'Lax'
+# cookie.raw = false
+
+#--------------------------------------------------------------------
+# ENCRYPTION
+#--------------------------------------------------------------------
+
+# encryption.key =
+# encryption.driver = OpenSSL
+# encryption.blockSize = 16
+# encryption.digest = SHA512
+
+#--------------------------------------------------------------------
+# HONEYPOT
+#--------------------------------------------------------------------
+
+# honeypot.hidden = 'true'
+# honeypot.label = 'Fill This Field'
+# honeypot.name = 'honeypot'
+# honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
+# honeypot.container = '<div style="display:none">{template}</div>'
+
+#--------------------------------------------------------------------
+# SECURITY
+#--------------------------------------------------------------------
+
+# security.tokenName = 'csrf_token_name'
+# security.headerName = 'X-CSRF-TOKEN'
+# security.cookieName = 'csrf_cookie_name'
+# security.expires = 7200
+# security.regenerate = true
+# security.redirect = true
+# security.samesite = 'Lax'
+
+#--------------------------------------------------------------------
+# LOGGER
+#--------------------------------------------------------------------
+
+# logger.threshold = 4
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..7ecfce2
Binary files /dev/null and b/favicon.ico differ
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..76786d0
--- /dev/null
+++ b/index.php
@@ -0,0 +1,37 @@
+<?php
+
+// Path to the front controller (this file)
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
+
+/*
+ *---------------------------------------------------------------
+ * BOOTSTRAP THE APPLICATION
+ *---------------------------------------------------------------
+ * This process sets up the path constants, loads and registers
+ * our autoloader, along with Composer's, loads our constants
+ * and fires up an environment-specific bootstrapping.
+ */
+
+// Ensure the current directory is pointing to the front controller's directory
+chdir(__DIR__);
+
+// Load our paths config file
+// This is the line that might need to be changed, depending on your folder structure.
+$pathsConfig = FCPATH . './app/Config/Paths.php';
+// ^^^ Change this if you move your application folder
+require realpath($pathsConfig) ?: $pathsConfig;
+
+$paths = new Config\Paths();
+
+// Location of the framework bootstrap file.
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
+
+/*
+ *---------------------------------------------------------------
+ * LAUNCH THE APPLICATION
+ *---------------------------------------------------------------
+ * Now that everything is setup, it's time to actually fire
+ * up the engines and make this app do its thang.
+ */
+$app->run();
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..51c5fdd
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		bootstrap="system/Test/bootstrap.php"
+		backupGlobals="false"
+		colors="true"
+		convertErrorsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertWarningsToExceptions="true"
+		stopOnError="false"
+		stopOnFailure="false"
+		stopOnIncomplete="false"
+		stopOnSkipped="false"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+	<coverage includeUncoveredFiles="true" processUncoveredFiles="true">
+		<include>
+			<directory suffix=".php">./app</directory>
+		</include>
+		<exclude>
+			<directory suffix=".php">./app/Views</directory>
+			<file>./app/Config/Routes.php</file>
+		</exclude>
+		<report>
+			<clover outputFile="build/logs/clover.xml"/>
+			<html outputDirectory="build/logs/html"/>
+			<php outputFile="build/logs/coverage.serialized"/>
+			<text outputFile="php://stdout" showUncoveredFiles="false"/>
+		</report>
+	</coverage>
+	<testsuites>
+		<testsuite name="App">
+			<directory>./tests</directory>
+		</testsuite>
+	</testsuites>
+	<logging>
+		<testdoxHtml outputFile="build/logs/testdox.html"/>
+		<testdoxText outputFile="build/logs/testdox.txt"/>
+		<junit outputFile="build/logs/logfile.xml"/>
+	</logging>
+	<php>
+		<server name="app.baseURL" value="http://example.com/"/>
+		<!-- Directory containing phpunit.xml -->
+		<const name="HOMEPATH" value="./"/>
+		<!-- Directory containing the Paths config file -->
+		<const name="CONFIGPATH" value="./app/Config/"/>
+		<!-- Directory containing the front controller (index.php) -->
+		<const name="PUBLICPATH" value="./public/"/>
+		<!-- Database configuration -->
+		<!-- Uncomment to provide your own database for testing
+		<env name="database.tests.hostname" value="localhost"/>
+		<env name="database.tests.database" value="tests"/>
+		<env name="database.tests.username" value="tests_user"/>
+		<env name="database.tests.password" value=""/>
+		<env name="database.tests.DBDriver" value="MySQLi"/>
+		<env name="database.tests.DBPrefix" value="tests_"/>
+		-->
+	</php>
+</phpunit>
diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000..a5d6c2a
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,49 @@
+# Disable directory browsing
+Options All -Indexes
+
+# ----------------------------------------------------------------------
+# Rewrite engine
+# ----------------------------------------------------------------------
+
+# Turning on the rewrite engine is necessary for the following rules and features.
+# FollowSymLinks must be enabled for this to work.
+<IfModule mod_rewrite.c>
+	Options +FollowSymlinks
+	RewriteEngine On
+
+	# If you installed CodeIgniter in a subfolder, you will need to
+	# change the following line to match the subfolder you need.
+	# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
+	# RewriteBase /
+
+	# Redirect Trailing Slashes...
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteCond %{REQUEST_URI} (.+)/$
+	RewriteRule ^ %1 [L,R=301]
+
+	# Rewrite "www.example.com -> example.com"
+	RewriteCond %{HTTPS} !=on
+	RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+	RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
+
+	# Checks to see if the user is attempting to access a valid file,
+	# such as an image or css document, if this isn't true it sends the
+	# request to the front controller, index.php
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^([\s\S]*)$ index.php/$1 [L,NC,QSA]
+
+	# Ensure Authorization header is passed along
+	RewriteCond %{HTTP:Authorization} .
+	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+</IfModule>
+
+<IfModule !mod_rewrite.c>
+	# If we don't have mod_rewrite installed, all 404's
+	# can be sent to index.php, and everything works as normal.
+	ErrorDocument 404 index.php
+</IfModule>
+
+# Disable server signature start
+	ServerSignature Off
+# Disable server signature end
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..7ecfce2
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 0000000..7737302
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,37 @@
+<?php
+
+// Path to the front controller (this file)
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
+
+/*
+ *---------------------------------------------------------------
+ * BOOTSTRAP THE APPLICATION
+ *---------------------------------------------------------------
+ * This process sets up the path constants, loads and registers
+ * our autoloader, along with Composer's, loads our constants
+ * and fires up an environment-specific bootstrapping.
+ */
+
+// Ensure the current directory is pointing to the front controller's directory
+chdir(__DIR__);
+
+// Load our paths config file
+// This is the line that might need to be changed, depending on your folder structure.
+$pathsConfig = FCPATH . '../app/Config/Paths.php';
+// ^^^ Change this if you move your application folder
+require realpath($pathsConfig) ?: $pathsConfig;
+
+$paths = new Config\Paths();
+
+// Location of the framework bootstrap file.
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
+
+/*
+ *---------------------------------------------------------------
+ * LAUNCH THE APPLICATION
+ *---------------------------------------------------------------
+ * Now that everything is setup, it's time to actually fire
+ * up the engines and make this app do its thang.
+ */
+$app->run();
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 0000000..9e60f97
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: 
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000..9e60f97
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: 
diff --git a/spark b/spark
new file mode 100644
index 0000000..f62aedd
--- /dev/null
+++ b/spark
@@ -0,0 +1,69 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * --------------------------------------------------------------------
+ * CodeIgniter command-line tools
+ * --------------------------------------------------------------------
+ * The main entry point into the CLI system and allows you to run
+ * commands and perform maintenance on your application.
+ *
+ * Because CodeIgniter can handle CLI requests as just another web request
+ * this class mainly acts as a passthru to the framework itself.
+ */
+
+define('SPARKED', true);
+
+/*
+ *---------------------------------------------------------------
+ * BOOTSTRAP THE APPLICATION
+ *---------------------------------------------------------------
+ * This process sets up the path constants, loads and registers
+ * our autoloader, along with Composer's, loads our constants
+ * and fires up an environment-specific bootstrapping.
+ */
+
+// Refuse to run when called from php-cgi
+if (strpos(PHP_SAPI, 'cgi') === 0)
+{
+	die("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
+}
+
+// Path to the front controller
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
+
+// Load our paths config file
+$pathsConfig = 'app/Config/Paths.php';
+// ^^^ Change this line if you move your application folder
+require realpath($pathsConfig) ?: $pathsConfig;
+
+$paths = new Config\Paths();
+
+// Ensure the current directory is pointing to the front controller's directory
+chdir(FCPATH);
+
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
+
+// Grab our Console
+$console = new CodeIgniter\CLI\Console($app);
+
+// We want errors to be shown when using it from the CLI.
+error_reporting(-1);
+ini_set('display_errors', '1');
+
+// Show basic information before we do anything else.
+if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true)))
+{
+	unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
+	$suppress = true;
+}
+
+$console->showHeader($suppress);
+
+// fire off the command in the main framework.
+$response = $console->run();
+if ($response->getStatusCode() >= 300)
+{
+	exit($response->getStatusCode());
+}
diff --git a/system/.htaccess b/system/.htaccess
new file mode 100644
index 0000000..3462048
--- /dev/null
+++ b/system/.htaccess
@@ -0,0 +1,6 @@
+<IfModule authz_core_module>
+	Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+	Deny from all
+</IfModule>
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
new file mode 100644
index 0000000..8aa8682
--- /dev/null
+++ b/system/API/ResponseTrait.php
@@ -0,0 +1,439 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\API;
+
+use CodeIgniter\Format\FormatterInterface;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Response;
+use Config\Services;
+
+/**
+ * Response trait.
+ *
+ * Provides common, more readable, methods to provide
+ * consistent HTTP responses under a variety of common
+ * situations when working as an API.
+ *
+ * @property IncomingRequest $request
+ * @property Response        $response
+ */
+trait ResponseTrait
+{
+	/**
+	 * Allows child classes to override the
+	 * status code that is used in their API.
+	 *
+	 * @var array
+	 */
+	protected $codes = [
+		'created'                   => 201,
+		'deleted'                   => 200,
+		'updated'                   => 200,
+		'no_content'                => 204,
+		'invalid_request'           => 400,
+		'unsupported_response_type' => 400,
+		'invalid_scope'             => 400,
+		'temporarily_unavailable'   => 400,
+		'invalid_grant'             => 400,
+		'invalid_credentials'       => 400,
+		'invalid_refresh'           => 400,
+		'no_data'                   => 400,
+		'invalid_data'              => 400,
+		'access_denied'             => 401,
+		'unauthorized'              => 401,
+		'invalid_client'            => 401,
+		'forbidden'                 => 403,
+		'resource_not_found'        => 404,
+		'not_acceptable'            => 406,
+		'resource_exists'           => 409,
+		'conflict'                  => 409,
+		'resource_gone'             => 410,
+		'payload_too_large'         => 413,
+		'unsupported_media_type'    => 415,
+		'too_many_requests'         => 429,
+		'server_error'              => 500,
+		'unsupported_grant_type'    => 501,
+		'not_implemented'           => 501,
+	];
+
+	/**
+	 * How to format the response data.
+	 * Either 'json' or 'xml'. If blank will be
+	 * determine through content negotiation.
+	 *
+	 * @var string
+	 */
+	protected $format = 'json';
+
+	/**
+	 * Current Formatter instance. This is usually set by ResponseTrait::format
+	 *
+	 * @var FormatterInterface
+	 */
+	protected $formatter;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a single, simple method to return an API response, formatted
+	 * to match the requested format, with proper content-type and status code.
+	 *
+	 * @param array|string|null $data
+	 * @param integer           $status
+	 * @param string            $message
+	 *
+	 * @return mixed
+	 */
+	public function respond($data = null, int $status = null, string $message = '')
+	{
+		// If data is null and status code not provided, exit and bail
+		if ($data === null && $status === null)
+		{
+			$status = 404;
+
+			// Create the output var here in case of $this->response([]);
+			$output = null;
+		}
+		// If data is null but status provided, keep the output empty.
+		elseif ($data === null && is_numeric($status))
+		{
+			$output = null;
+		}
+		else
+		{
+			$status = empty($status) ? 200 : $status;
+			$output = $this->format($data);
+		}
+
+		if (! is_null($output))
+		{
+			if ($this->format === 'json')
+			{
+				return $this->response->setJSON($output)->setStatusCode($status, $message);
+			}
+
+			if ($this->format === 'xml')
+			{
+				return $this->response->setXML($output)->setStatusCode($status, $message);
+			}
+		}
+
+		return $this->response->setBody($output)->setStatusCode($status, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used for generic failures that no custom methods exist for.
+	 *
+	 * @param string|array $messages
+	 * @param integer      $status        HTTP status code
+	 * @param string|null  $code          Custom, API-specific, error code
+	 * @param string       $customMessage
+	 *
+	 * @return mixed
+	 */
+	public function fail($messages, int $status = 400, string $code = null, string $customMessage = '')
+	{
+		if (! is_array($messages))
+		{
+			$messages = ['error' => $messages];
+		}
+
+		$response = [
+			'status'   => $status,
+			'error'    => $code ?? $status,
+			'messages' => $messages,
+		];
+
+		return $this->respond($response, $status, $customMessage);
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Response Helpers
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used after successfully creating a new resource.
+	 *
+	 * @param mixed  $data    Data.
+	 * @param string $message Message.
+	 *
+	 * @return mixed
+	 */
+	public function respondCreated($data = null, string $message = '')
+	{
+		return $this->respond($data, $this->codes['created'], $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used after a resource has been successfully deleted.
+	 *
+	 * @param mixed  $data    Data.
+	 * @param string $message Message.
+	 *
+	 * @return mixed
+	 */
+	public function respondDeleted($data = null, string $message = '')
+	{
+		return $this->respond($data, $this->codes['deleted'], $message);
+	}
+
+	/**
+	 * Used after a resource has been successfully updated.
+	 *
+	 * @param mixed  $data    Data.
+	 * @param string $message Message.
+	 *
+	 * @return mixed
+	 */
+	public function respondUpdated($data = null, string $message = '')
+	{
+		return $this->respond($data, $this->codes['updated'], $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used after a command has been successfully executed but there is no
+	 * meaningful reply to send back to the client.
+	 *
+	 * @param string $message Message.
+	 *
+	 * @return mixed
+	 */
+	public function respondNoContent(string $message = 'No Content')
+	{
+		return $this->respond(null, $this->codes['no_content'], $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used when the client is either didn't send authorization information,
+	 * or had bad authorization credentials. User is encouraged to try again
+	 * with the proper information.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 */
+	public function failUnauthorized(string $description = 'Unauthorized', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['unauthorized'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used when access is always denied to this resource and no amount
+	 * of trying again will help.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 */
+	public function failForbidden(string $description = 'Forbidden', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['forbidden'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used when a specified resource cannot be found.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 */
+	public function failNotFound(string $description = 'Not Found', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used when the data provided by the client cannot be validated.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 *
+	 * @deprecated Use failValidationErrors instead
+	 */
+	public function failValidationError(string $description = 'Bad Request', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['invalid_data'], $code, $message);
+	}
+
+	/**
+	 * Used when the data provided by the client cannot be validated on one or more fields.
+	 *
+	 * @param string|string[] $errors
+	 * @param string|null 	  $code
+	 * @param string		  $message
+	 *
+	 * @return mixed
+	 */
+	public function failValidationErrors($errors, string $code = null, string $message = '')
+	{
+		return $this->fail($errors, $this->codes['invalid_data'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Use when trying to create a new resource and it already exists.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 */
+	public function failResourceExists(string $description = 'Conflict', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['resource_exists'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Use when a resource was previously deleted. This is different than
+	 * Not Found, because here we know the data previously existed, but is now gone,
+	 * where Not Found means we simply cannot find any information about it.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 */
+	public function failResourceGone(string $description = 'Gone', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['resource_gone'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used when the user has made too many requests for the resource recently.
+	 *
+	 * @param string $description
+	 * @param string $code
+	 * @param string $message
+	 *
+	 * @return mixed
+	 */
+	public function failTooManyRequests(string $description = 'Too Many Requests', string $code = null, string $message = '')
+	{
+		return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used when there is a server error.
+	 *
+	 * @param string      $description The error message to show the user.
+	 * @param string|null $code        A custom, API-specific, error code.
+	 * @param string      $message     A custom "reason" message to return.
+	 *
+	 * @return Response The value of the Response's send() method.
+	 */
+	public function failServerError(string $description = 'Internal Server Error', string $code = null, string $message = ''): Response
+	{
+		return $this->fail($description, $this->codes['server_error'], $code, $message);
+	}
+
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles formatting a response. Currently makes some heavy assumptions
+	 * and needs updating! :)
+	 *
+	 * @param string|array|null $data
+	 *
+	 * @return string|null
+	 */
+	protected function format($data = null)
+	{
+		// If the data is a string, there's not much we can do to it...
+		if (is_string($data))
+		{
+			// The content type should be text/... and not application/...
+			$contentType = $this->response->getHeaderLine('Content-Type');
+			$contentType = str_replace('application/json', 'text/html', $contentType);
+			$contentType = str_replace('application/', 'text/', $contentType);
+			$this->response->setContentType($contentType);
+			$this->format = 'html';
+
+			return $data;
+		}
+
+		$format = Services::format();
+		$mime   = "application/{$this->format}";
+
+		// Determine correct response type through content negotiation if not explicitly declared
+		if (empty($this->format) || ! in_array($this->format, ['json', 'xml'], true))
+		{
+			$mime = $this->request->negotiate('media', $format->getConfig()->supportedResponseFormats, false);
+		}
+
+		$this->response->setContentType($mime);
+
+		// if we don't have a formatter, make one
+		if (! isset($this->formatter))
+		{
+			// if no formatter, use the default
+			$this->formatter = $format->getFormatter($mime);
+		}
+
+		if ($mime !== 'application/json')
+		{
+			// Recursively convert objects into associative arrays
+			// Conversion not required for JSONFormatter
+			$data = json_decode(json_encode($data), true);
+		}
+
+		return $this->formatter->format($data);
+	}
+
+	/**
+	 * Sets the format the response should be in.
+	 *
+	 * @param string $format
+	 *
+	 * @return $this
+	 */
+	public function setResponseFormat(string $format = null)
+	{
+		$this->format = strtolower($format);
+
+		return $this;
+	}
+}
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
new file mode 100644
index 0000000..162d898
--- /dev/null
+++ b/system/Autoloader/Autoloader.php
@@ -0,0 +1,372 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Autoloader;
+
+use Composer\Autoload\ClassLoader;
+use Config\Autoload;
+use Config\Modules;
+use InvalidArgumentException;
+
+/**
+ * CodeIgniter Autoloader
+ *
+ * An autoloader that uses both PSR4 autoloading, and traditional classmaps.
+ *
+ * Given a foo-bar package of classes in the file system at the following paths:
+ * ```
+ *      /path/to/packages/foo-bar/
+ *          /src
+ *              Baz.php         # Foo\Bar\Baz
+ *              Qux/
+ *                  Quux.php    # Foo\Bar\Qux\Quux
+ * ```
+ * you can add the path to the configuration array that is passed in the constructor.
+ * The Config array consists of 2 primary keys, both of which are associative arrays:
+ * 'psr4', and 'classmap'.
+ * ```
+ *      $Config = [
+ *          'psr4' => [
+ *              'Foo\Bar'   => '/path/to/packages/foo-bar'
+ *          ],
+ *          'classmap' => [
+ *              'MyClass'   => '/path/to/class/file.php'
+ *          ]
+ *      ];
+ * ```
+ * Example:
+ * ```
+ *      <?php
+ *      // our configuration array
+ *      $Config = [ ... ];
+ *      $loader = new \CodeIgniter\Autoloader\Autoloader($Config);
+ *
+ *      // register the autoloader
+ *      $loader->register();
+ * ```
+ */
+class Autoloader
+{
+	/**
+	 * Stores namespaces as key, and path as values.
+	 *
+	 * @var array<string, array<string>>
+	 */
+	protected $prefixes = [];
+
+	/**
+	 * Stores class name as key, and path as values.
+	 *
+	 * @var array<string, string>
+	 */
+	protected $classmap = [];
+
+	/**
+	 * Stores files as a list.
+	 *
+	 * @var array<int, string>
+	 */
+	protected $files = [];
+
+	/**
+	 * Reads in the configuration array (described above) and stores
+	 * the valid parts that we'll need.
+	 *
+	 * @param Autoload $config
+	 * @param Modules  $modules
+	 *
+	 * @return $this
+	 */
+	public function initialize(Autoload $config, Modules $modules)
+	{
+		// We have to have one or the other, though we don't enforce the need
+		// to have both present in order to work.
+		if (empty($config->psr4) && empty($config->classmap))
+		{
+			throw new InvalidArgumentException('Config array must contain either the \'psr4\' key or the \'classmap\' key.');
+		}
+
+		if (isset($config->psr4))
+		{
+			$this->addNamespace($config->psr4);
+		}
+
+		if (isset($config->classmap))
+		{
+			$this->classmap = $config->classmap;
+		}
+
+		if (isset($config->files))
+		{
+			$this->files = $config->files;
+		}
+
+		// Should we load through Composer's namespaces, also?
+		if ($modules->discoverInComposer)
+		{
+			$this->discoverComposerNamespaces();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Register the loader with the SPL autoloader stack.
+	 */
+	public function register()
+	{
+		// Prepend the PSR4  autoloader for maximum performance.
+		spl_autoload_register([$this, 'loadClass'], true, true); // @phpstan-ignore-line
+
+		// Now prepend another loader for the files in our class map.
+		spl_autoload_register([$this, 'loadClassmap'], true, true); // @phpstan-ignore-line
+
+		// Load our non-class files
+		foreach ($this->files as $file)
+		{
+			if (is_string($file))
+			{
+				$this->includeFile($file);
+			}
+		}
+	}
+
+	/**
+	 * Registers namespaces with the autoloader.
+	 *
+	 * @param array|string $namespace
+	 * @param string       $path
+	 *
+	 * @return $this
+	 */
+	public function addNamespace($namespace, string $path = null)
+	{
+		if (is_array($namespace))
+		{
+			foreach ($namespace as $prefix => $path)
+			{
+				$prefix = trim($prefix, '\\');
+
+				if (is_array($path))
+				{
+					foreach ($path as $dir)
+					{
+						$this->prefixes[$prefix][] = rtrim($dir, '\\/') . DIRECTORY_SEPARATOR;
+					}
+
+					continue;
+				}
+
+				$this->prefixes[$prefix][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
+			}
+		}
+		else
+		{
+			$this->prefixes[trim($namespace, '\\')][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get namespaces with prefixes as keys and paths as values.
+	 *
+	 * If a prefix param is set, returns only paths to the given prefix.
+	 *
+	 * @param string|null $prefix
+	 *
+	 * @return array
+	 */
+	public function getNamespace(string $prefix = null)
+	{
+		if ($prefix === null)
+		{
+			return $this->prefixes;
+		}
+
+		return $this->prefixes[trim($prefix, '\\')] ?? [];
+	}
+
+	/**
+	 * Removes a single namespace from the psr4 settings.
+	 *
+	 * @param string $namespace
+	 *
+	 * @return $this
+	 */
+	public function removeNamespace(string $namespace)
+	{
+		if (isset($this->prefixes[trim($namespace, '\\')]))
+		{
+			unset($this->prefixes[trim($namespace, '\\')]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Load a class using available class mapping.
+	 *
+	 * @param string $class
+	 *
+	 * @return string|false
+	 */
+	public function loadClassmap(string $class)
+	{
+		$file = $this->classmap[$class] ?? '';
+
+		if (is_string($file) && $file !== '')
+		{
+			return $this->includeFile($file);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Loads the class file for a given class name.
+	 *
+	 * @param string $class The fully qualified class name.
+	 *
+	 * @return string|false The mapped file on success, or boolean false
+	 *                          on failure.
+	 */
+	public function loadClass(string $class)
+	{
+		$class = trim($class, '\\');
+		$class = str_ireplace('.php', '', $class);
+
+		return $this->loadInNamespace($class);
+	}
+
+	/**
+	 * Loads the class file for a given class name.
+	 *
+	 * @param string $class The fully-qualified class name
+	 *
+	 * @return string|false The mapped file name on success, or boolean false on fail
+	 */
+	protected function loadInNamespace(string $class)
+	{
+		if (strpos($class, '\\') === false)
+		{
+			return false;
+		}
+
+		foreach ($this->prefixes as $namespace => $directories)
+		{
+			foreach ($directories as $directory)
+			{
+				$directory = rtrim($directory, '\\/');
+
+				if (strpos($class, $namespace) === 0)
+				{
+					$filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
+					$filename = $this->includeFile($filePath);
+
+					if ($filename)
+					{
+						return $filename;
+					}
+				}
+			}
+		}
+
+		// never found a mapped file
+		return false;
+	}
+
+	/**
+	 * A central way to include a file. Split out primarily for testing purposes.
+	 *
+	 * @param string $file
+	 *
+	 * @return string|false The filename on success, false if the file is not loaded
+	 */
+	protected function includeFile(string $file)
+	{
+		$file = $this->sanitizeFilename($file);
+
+		if (is_file($file))
+		{
+			include_once $file;
+
+			return $file;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sanitizes a filename, replacing spaces with dashes.
+	 *
+	 * Removes special characters that are illegal in filenames on certain
+	 * operating systems and special characters requiring special escaping
+	 * to manipulate at the command line. Replaces spaces and consecutive
+	 * dashes with a single dash. Trim period, dash and underscore from beginning
+	 * and end of filename.
+	 *
+	 * @param string $filename
+	 *
+	 * @return string The sanitized filename
+	 */
+	public function sanitizeFilename(string $filename): string
+	{
+		// Only allow characters deemed safe for POSIX portable filenames.
+		// Plus the forward slash for directory separators since this might be a path.
+		// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_278
+		// Modified to allow backslash and colons for on Windows machines.
+		$filename = preg_replace('/[^0-9\p{L}\s\/\-\_\.\:\\\\]/u', '', $filename);
+
+		// Clean up our filename edges.
+		$filename = trim($filename, '.-_');
+
+		return $filename;
+	}
+
+	/**
+	 * Locates autoload information from Composer, if available.
+	 *
+	 * @return void
+	 */
+	protected function discoverComposerNamespaces()
+	{
+		if (! is_file(COMPOSER_PATH))
+		{
+			return;
+		}
+
+		/**
+		 * @var ClassLoader $composer
+		 */
+		$composer = include COMPOSER_PATH;
+		$paths    = $composer->getPrefixesPsr4();
+		$classes  = $composer->getClassMap();
+
+		unset($composer);
+
+		// Get rid of CodeIgniter so we don't have duplicates
+		if (isset($paths['CodeIgniter\\']))
+		{
+			unset($paths['CodeIgniter\\']);
+		}
+
+		$newPaths = [];
+		foreach ($paths as $key => $value)
+		{
+			// Composer stores namespaces with trailing slash. We don't.
+			$newPaths[rtrim($key, '\\ ')] = $value;
+		}
+
+		$this->prefixes = array_merge($this->prefixes, $newPaths);
+		$this->classmap = array_merge($this->classmap, $classes);
+	}
+}
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
new file mode 100644
index 0000000..1774c51
--- /dev/null
+++ b/system/Autoloader/FileLocator.php
@@ -0,0 +1,452 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Autoloader;
+
+/**
+ * Class FileLocator
+ *
+ * Allows loading non-class files in a namespaced manner.
+ * Works with Helpers, Views, etc.
+ */
+class FileLocator
+{
+	/**
+	 * The Autoloader to use.
+	 *
+	 * @var Autoloader
+	 */
+	protected $autoloader;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Autoloader $autoloader
+	 */
+	public function __construct(Autoloader $autoloader)
+	{
+		$this->autoloader = $autoloader;
+	}
+
+	/**
+	 * Attempts to locate a file by examining the name for a namespace
+	 * and looking through the PSR-4 namespaced files that we know about.
+	 *
+	 * @param string      $file   The namespaced file to locate
+	 * @param string|null $folder The folder within the namespace that we should look for the file.
+	 * @param string      $ext    The file extension the file should have.
+	 *
+	 * @return string|false The path to the file, or false if not found.
+	 */
+	public function locateFile(string $file, string $folder = null, string $ext = 'php')
+	{
+		$file = $this->ensureExt($file, $ext);
+
+		// Clears the folder name if it is at the beginning of the filename
+		if (! empty($folder) && strpos($file, $folder) === 0)
+		{
+			$file = substr($file, strlen($folder . '/'));
+		}
+
+		// Is not namespaced? Try the application folder.
+		if (strpos($file, '\\') === false)
+		{
+			return $this->legacyLocate($file, $folder);
+		}
+
+		// Standardize slashes to handle nested directories.
+		$file = strtr($file, '/', '\\');
+
+		$segments = explode('\\', $file);
+
+		// The first segment will be empty if a slash started the filename.
+		if (empty($segments[0]))
+		{
+			unset($segments[0]);
+		}
+
+		$paths    = [];
+		$prefix   = '';
+		$filename = '';
+
+		// Namespaces always comes with arrays of paths
+		$namespaces = $this->autoloader->getNamespace();
+
+		while (! empty($segments))
+		{
+			$prefix .= empty($prefix) ? array_shift($segments) : '\\' . array_shift($segments);
+
+			if (empty($namespaces[$prefix]))
+			{
+				continue;
+			}
+
+			$paths = $namespaces[$prefix];
+
+			$filename = implode('/', $segments);
+			break;
+		}
+
+		// if no namespaces matched then quit
+		if (empty($paths))
+		{
+			return false;
+		}
+
+		// Check each path in the namespace
+		foreach ($paths as $path)
+		{
+			// Ensure trailing slash
+			$path = rtrim($path, '/') . '/';
+
+			// If we have a folder name, then the calling function
+			// expects this file to be within that folder, like 'Views',
+			// or 'libraries'.
+			if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false)
+			{
+				$path .= trim($folder, '/') . '/';
+			}
+
+			$path .= $filename;
+			if (is_file($path))
+			{
+				return $path;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Examines a file and returns the fully qualified domain name.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	public function getClassname(string $file) : string
+	{
+		$php       = file_get_contents($file);
+		$tokens    = token_get_all($php);
+		$dlm       = false;
+		$namespace = '';
+		$className = '';
+
+		foreach ($tokens as $i => $token)
+		{
+			if ($i < 2)
+			{
+				continue;
+			}
+
+			if ((isset($tokens[$i - 2][1]) && ($tokens[$i - 2][1] === 'phpnamespace' || $tokens[$i - 2][1] === 'namespace')) || ($dlm && $tokens[$i - 1][0] === T_NS_SEPARATOR && $token[0] === T_STRING))
+			{
+				if (! $dlm)
+				{
+					$namespace = 0;
+				}
+				if (isset($token[1]))
+				{
+					$namespace = $namespace ? $namespace . '\\' . $token[1] : $token[1];
+					$dlm       = true;
+				}
+			}
+			elseif ($dlm && ($token[0] !== T_NS_SEPARATOR) && ($token[0] !== T_STRING))
+			{
+				$dlm = false;
+			}
+
+			if (($tokens[$i - 2][0] === T_CLASS || (isset($tokens[$i - 2][1]) && $tokens[$i - 2][1] === 'phpclass'))
+				&& $tokens[$i - 1][0] === T_WHITESPACE
+				&& $token[0] === T_STRING)
+			{
+				$className = $token[1];
+				break;
+			}
+		}
+
+		if (empty($className))
+		{
+			return '';
+		}
+
+		return $namespace . '\\' . $className;
+	}
+
+	/**
+	 * Searches through all of the defined namespaces looking for a file.
+	 * Returns an array of all found locations for the defined file.
+	 *
+	 * Example:
+	 *
+	 *  $locator->search('Config/Routes.php');
+	 *  // Assuming PSR4 namespaces include foo and bar, might return:
+	 *  [
+	 *      'app/Modules/foo/Config/Routes.php',
+	 *      'app/Modules/bar/Config/Routes.php',
+	 *  ]
+	 *
+	 * @param string  $path
+	 * @param string  $ext
+	 * @param boolean $prioritizeApp
+	 *
+	 * @return array
+	 */
+	public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
+	{
+		$path = $this->ensureExt($path, $ext);
+
+		$foundPaths = [];
+		$appPaths   = [];
+
+		foreach ($this->getNamespaces() as $namespace)
+		{
+			if (isset($namespace['path']) && is_file($namespace['path'] . $path))
+			{
+				$fullPath = $namespace['path'] . $path;
+				$fullPath = realpath($fullPath) ?: $fullPath;
+
+				if ($prioritizeApp)
+				{
+					$foundPaths[] = $fullPath;
+				}
+				elseif (strpos($fullPath, APPPATH) === 0)
+				{
+					$appPaths[] = $fullPath;
+				}
+				else
+				{
+					$foundPaths[] = $fullPath;
+				}
+			}
+		}
+
+		if (! $prioritizeApp && ! empty($appPaths))
+		{
+			$foundPaths = array_merge($foundPaths, $appPaths);
+		}
+
+		// Remove any duplicates
+		$foundPaths = array_unique($foundPaths);
+
+		return $foundPaths;
+	}
+
+	/**
+	 * Ensures a extension is at the end of a filename
+	 *
+	 * @param string $path
+	 * @param string $ext
+	 *
+	 * @return string
+	 */
+	protected function ensureExt(string $path, string $ext): string
+	{
+		if ($ext)
+		{
+			$ext = '.' . $ext;
+
+			if (substr($path, -strlen($ext)) !== $ext)
+			{
+				$path .= $ext;
+			}
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Return the namespace mappings we know about.
+	 *
+	 * @return array|string
+	 */
+	protected function getNamespaces()
+	{
+		$namespaces = [];
+
+		// Save system for last
+		$system = [];
+
+		foreach ($this->autoloader->getNamespace() as $prefix => $paths)
+		{
+			foreach ($paths as $path)
+			{
+				if ($prefix === 'CodeIgniter')
+				{
+					$system = [
+						'prefix' => $prefix,
+						'path'   => rtrim($path, '\\/') . DIRECTORY_SEPARATOR,
+					];
+
+					continue;
+				}
+
+				$namespaces[] = [
+					'prefix' => $prefix,
+					'path'   => rtrim($path, '\\/') . DIRECTORY_SEPARATOR,
+				];
+			}
+		}
+
+		$namespaces[] = $system;
+
+		return $namespaces;
+	}
+
+	/**
+	 * Find the qualified name of a file according to
+	 * the namespace of the first matched namespace path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string|false The qualified name or false if the path is not found
+	 */
+	public function findQualifiedNameFromPath(string $path)
+	{
+		$path = realpath($path) ?: $path;
+
+		if (! is_file($path))
+		{
+			return false;
+		}
+
+		foreach ($this->getNamespaces() as $namespace)
+		{
+			$namespace['path'] = realpath($namespace['path']) ?: $namespace['path'];
+
+			if (empty($namespace['path']))
+			{
+				continue;
+			}
+
+			if (mb_strpos($path, $namespace['path']) === 0)
+			{
+				$className = '\\' . $namespace['prefix'] . '\\' .
+						ltrim(str_replace('/', '\\', mb_substr(
+							$path, mb_strlen($namespace['path']))
+						), '\\');
+
+				// Remove the file extension (.php)
+				$className = mb_substr($className, 0, -4);
+
+				// Check if this exists
+				if (class_exists($className))
+				{
+					return $className;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Scans the defined namespaces, returning a list of all files
+	 * that are contained within the subpath specified by $path.
+	 *
+	 * @param string $path
+	 *
+	 * @return array
+	 */
+	public function listFiles(string $path): array
+	{
+		if (empty($path))
+		{
+			return [];
+		}
+
+		$files = [];
+		helper('filesystem');
+
+		foreach ($this->getNamespaces() as $namespace)
+		{
+			$fullPath = $namespace['path'] . $path;
+			$fullPath = realpath($fullPath) ?: $fullPath;
+
+			if (! is_dir($fullPath))
+			{
+				continue;
+			}
+
+			$tempFiles = get_filenames($fullPath, true);
+
+			if (! empty($tempFiles))
+			{
+				$files = array_merge($files, $tempFiles);
+			}
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Scans the provided namespace, returning a list of all files
+	 * that are contained within the subpath specified by $path.
+	 *
+	 * @param string $prefix
+	 * @param string $path
+	 *
+	 * @return array
+	 */
+	public function listNamespaceFiles(string $prefix, string $path): array
+	{
+		if (empty($path) || empty($prefix))
+		{
+			return [];
+		}
+
+		$files = [];
+		helper('filesystem');
+
+		// autoloader->getNamespace($prefix) returns an array of paths for that namespace
+		foreach ($this->autoloader->getNamespace($prefix) as $namespacePath)
+		{
+			$fullPath = rtrim($namespacePath, '/') . '/' . $path;
+			$fullPath = realpath($fullPath) ?: $fullPath;
+
+			if (! is_dir($fullPath))
+			{
+				continue;
+			}
+
+			$tempFiles = get_filenames($fullPath, true);
+
+			if (! empty($tempFiles))
+			{
+				$files = array_merge($files, $tempFiles);
+			}
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Checks the app folder to see if the file can be found.
+	 * Only for use with filenames that DO NOT include namespacing.
+	 *
+	 * @param string      $file
+	 * @param string|null $folder
+	 *
+	 * @return string|false The path to the file, or false if not found.
+	 */
+	protected function legacyLocate(string $file, string $folder = null)
+	{
+		$path = APPPATH . (empty($folder) ? $file : $folder . '/' . $file);
+		$path = realpath($path) ?: $path;
+
+		if (is_file($path))
+		{
+			return $path;
+		}
+
+		return false;
+	}
+}
diff --git a/system/BaseModel.php b/system/BaseModel.php
new file mode 100644
index 0000000..75947ad
--- /dev/null
+++ b/system/BaseModel.php
@@ -0,0 +1,1812 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use Closure;
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Exceptions\ModelException;
+use CodeIgniter\I18n\Time;
+use CodeIgniter\Pager\Pager;
+use CodeIgniter\Validation\Validation;
+use CodeIgniter\Validation\ValidationInterface;
+use Config\Services;
+use InvalidArgumentException;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionProperty;
+use stdClass;
+
+/**
+ * Class Model
+ *
+ * The BaseModel class provides a number of convenient features that
+ * makes working with a databases less painful. Extending this class
+ * provide means of implementing various database systems
+ *
+ * It will:
+ *      - simplifies pagination
+ *      - allow specifying the return type (array, object, etc) with each call
+ *      - automatically set and update timestamps
+ *      - handle soft deletes
+ *      - ensure validation is run against objects when saving items
+ *      - process various callbacks
+ *      - allow intermingling calls to the db connection
+ */
+abstract class BaseModel
+{
+	/**
+	 * Pager instance.
+	 * Populated after calling $this->paginate()
+	 *
+	 * @var Pager
+	 */
+	public $pager;
+
+	/**
+	 * Last insert ID
+	 *
+	 * @var integer|string
+	 */
+	protected $insertID = 0;
+
+	/**
+	 * The Database connection group that
+	 * should be instantiated.
+	 *
+	 * @var string
+	 */
+	protected $DBGroup;
+
+	/**
+	 * The format that the results should be returned as.
+	 * Will be overridden if the as* methods are used.
+	 *
+	 * @var string
+	 */
+	protected $returnType = 'array';
+
+	/**
+	 * If this model should use "softDeletes" and
+	 * simply set a date when rows are deleted, or
+	 * do hard deletes.
+	 *
+	 * @var boolean
+	 */
+	protected $useSoftDeletes = false;
+
+	/**
+	 * An array of field names that are allowed
+	 * to be set by the user in inserts/updates.
+	 *
+	 * @var array
+	 */
+	protected $allowedFields = [];
+
+	/**
+	 * If true, will set created_at, and updated_at
+	 * values during insert and update routines.
+	 *
+	 * @var boolean
+	 */
+	protected $useTimestamps = false;
+
+	/**
+	 * The type of column that created_at and updated_at
+	 * are expected to.
+	 *
+	 * Allowed: 'datetime', 'date', 'int'
+	 *
+	 * @var string
+	 */
+	protected $dateFormat = 'datetime';
+
+	/**
+	 * The column used for insert timestamps
+	 *
+	 * @var string
+	 */
+	protected $createdField = 'created_at';
+
+	/**
+	 * The column used for update timestamps
+	 *
+	 * @var string
+	 */
+	protected $updatedField = 'updated_at';
+
+	/**
+	 * Used by withDeleted to override the
+	 * model's softDelete setting.
+	 *
+	 * @var boolean
+	 */
+	protected $tempUseSoftDeletes;
+
+	/**
+	 * The column used to save soft delete state
+	 *
+	 * @var string
+	 */
+	protected $deletedField = 'deleted_at';
+
+	/**
+	 * Used by asArray and asObject to provide
+	 * temporary overrides of model default.
+	 *
+	 * @var string
+	 */
+	protected $tempReturnType;
+
+	/**
+	 * Whether we should limit fields in inserts
+	 * and updates to those available in $allowedFields or not.
+	 *
+	 * @var boolean
+	 */
+	protected $protectFields = true;
+
+	/**
+	 * Database Connection
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * Rules used to validate data in insert, update, and save methods.
+	 * The array must match the format of data passed to the Validation
+	 * library.
+	 *
+	 * @var array|string
+	 */
+	protected $validationRules = [];
+
+	/**
+	 * Contains any custom error messages to be
+	 * used during data validation.
+	 *
+	 * @var array
+	 */
+	protected $validationMessages = [];
+
+	/**
+	 * Skip the model's validation. Used in conjunction with skipValidation()
+	 * to skip data validation for any future calls.
+	 *
+	 * @var boolean
+	 */
+	protected $skipValidation = false;
+
+	/**
+	 * Whether rules should be removed that do not exist
+	 * in the passed in data. Used between inserts/updates.
+	 *
+	 * @var boolean
+	 */
+	protected $cleanValidationRules = true;
+
+	/**
+	 * Our validator instance.
+	 *
+	 * @var Validation
+	 */
+	protected $validation;
+
+	/*
+	 * Callbacks.
+	 *
+	 * Each array should contain the method names (within the model)
+	 * that should be called when those events are triggered.
+	 *
+	 * "Update" and "delete" methods are passed the same items that
+	 * are given to their respective method.
+	 *
+	 * "Find" methods receive the ID searched for (if present), and
+	 * 'afterFind' additionally receives the results that were found.
+	 */
+
+	/**
+	 * Whether to trigger the defined callbacks
+	 *
+	 * @var boolean
+	 */
+	protected $allowCallbacks = true;
+
+	/**
+	 * Used by allowCallbacks() to override the
+	 * model's allowCallbacks setting.
+	 *
+	 * @var boolean
+	 */
+	protected $tempAllowCallbacks;
+
+	/**
+	 * Callbacks for beforeInsert
+	 *
+	 * @var array
+	 */
+	protected $beforeInsert = [];
+
+	/**
+	 * Callbacks for afterInsert
+	 *
+	 * @var array
+	 */
+	protected $afterInsert = [];
+
+	/**
+	 * Callbacks for beforeUpdate
+	 *
+	 * @var array
+	 */
+	protected $beforeUpdate = [];
+
+	/**
+	 * Callbacks for afterUpdate
+	 *
+	 * @var array
+	 */
+	protected $afterUpdate = [];
+
+	/**
+	 * Callbacks for beforeFind
+	 *
+	 * @var array
+	 */
+	protected $beforeFind = [];
+
+	/**
+	 * Callbacks for afterFind
+	 *
+	 * @var array
+	 */
+	protected $afterFind = [];
+
+	/**
+	 * Callbacks for beforeDelete
+	 *
+	 * @var array
+	 */
+	protected $beforeDelete = [];
+
+	/**
+	 * Callbacks for afterDelete
+	 *
+	 * @var array
+	 */
+	protected $afterDelete = [];
+
+	/**
+	 * BaseModel constructor.
+	 *
+	 * @param ValidationInterface|null $validation Validation
+	 */
+	public function __construct(ValidationInterface $validation = null)
+	{
+		$this->tempReturnType     = $this->returnType;
+		$this->tempUseSoftDeletes = $this->useSoftDeletes;
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		/**
+		 * @var Validation $validation
+		 */
+		$validation       = $validation ?? Services::validation(null, false);
+		$this->validation = $validation;
+
+		$this->initialize();
+	}
+
+	/**
+	 * Initializes the instance with any additional steps.
+	 * Optionally implemented by child classes.
+	 */
+	protected function initialize()
+	{
+	}
+
+	/**
+	 * Fetches the row of database
+	 * This methods works only with dbCalls
+	 *
+	 * @param boolean                   $singleton Single or multiple results
+	 * @param array|integer|string|null $id        One primary key or an array of primary keys
+	 *
+	 * @return array|object|null The resulting row of data, or null.
+	 */
+	abstract protected function doFind(bool $singleton, $id = null);
+
+	/**
+	 * Fetches the column of database
+	 * This methods works only with dbCalls
+	 *
+	 * @param string $columnName Column Name
+	 *
+	 * @return array|null The resulting row of data, or null if no data found.
+	 *
+	 * @throws DataException
+	 */
+	abstract protected function doFindColumn(string $columnName);
+
+	/**
+	 * Fetches all results, while optionally limiting them.
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer $limit  Limit
+	 * @param integer $offset Offset
+	 *
+	 * @return array
+	 */
+	abstract protected function doFindAll(int $limit = 0, int $offset = 0);
+
+	/**
+	 * Returns the first row of the result set.
+	 * This methods works only with dbCalls
+	 *
+	 * @return array|object|null
+	 */
+	abstract protected function doFirst();
+
+	/**
+	 * Inserts data into the current database
+	 * This methods works only with dbCalls
+	 *
+	 * @param array $data Data
+	 *
+	 * @return integer|string|boolean
+	 */
+	abstract protected function doInsert(array $data);
+
+	/**
+	 * Compiles batch insert and runs the queries, validating each row prior.
+	 * This methods works only with dbCalls
+	 *
+	 * @param array|null   $set       An associative array of insert values
+	 * @param boolean|null $escape    Whether to escape values and identifiers
+	 * @param integer      $batchSize The size of the batch to run
+	 * @param boolean      $testing   True means only number of records is returned, false will execute the query
+	 *
+	 * @return integer|boolean Number of rows inserted or FALSE on failure
+	 */
+	abstract protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false);
+
+	/**
+	 * Updates a single record in the database.
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer|array|string|null $id   ID
+	 * @param array|null                $data Data
+	 *
+	 * @return boolean
+	 */
+	abstract protected function doUpdate($id = null, $data = null): bool;
+
+	/**
+	 * Compiles an update and runs the query
+	 * This methods works only with dbCalls
+	 *
+	 * @param array|null  $set       An associative array of update values
+	 * @param string|null $index     The where key
+	 * @param integer     $batchSize The size of the batch to run
+	 * @param boolean     $returnSQL True means SQL is returned, false will execute the query
+	 *
+	 * @return mixed    Number of rows affected or FALSE on failure
+	 *
+	 * @throws DatabaseException
+	 */
+	abstract protected function doUpdateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false);
+
+	/**
+	 * Deletes a single record from the database where $id matches
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer|string|array|null $id    The rows primary key(s)
+	 * @param boolean                   $purge Allows overriding the soft deletes setting.
+	 *
+	 * @return string|boolean
+	 *
+	 * @throws DatabaseException
+	 */
+	abstract protected function doDelete($id = null, bool $purge = false);
+
+	/**
+	 * Permanently deletes all rows that have been marked as deleted
+	 * through soft deletes (deleted = 1)
+	 * This methods works only with dbCalls
+	 *
+	 * @return boolean|mixed
+	 */
+	abstract protected function doPurgeDeleted();
+
+	/**
+	 * Works with the find* methods to return only the rows that
+	 * have been deleted.
+	 * This methods works only with dbCalls
+	 *
+	 * @return void
+	 */
+	abstract protected function doOnlyDeleted();
+
+	/**
+	 * Compiles a replace and runs the query
+	 * This methods works only with dbCalls
+	 *
+	 * @param array|null $data      Data
+	 * @param boolean    $returnSQL Set to true to return Query String
+	 *
+	 * @return mixed
+	 */
+	abstract protected function doReplace(array $data = null, bool $returnSQL = false);
+
+	/**
+	 * Grabs the last error(s) that occurred from the Database connection.
+	 * This methods works only with dbCalls
+	 *
+	 * @return array|null
+	 */
+	abstract protected function doErrors();
+
+	/**
+	 * Returns the id value for the data array or object
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return integer|array|string|null
+	 *
+	 * @deprecated Add an override on getIdValue() instead. Will be removed in version 5.0.
+	 */
+	abstract protected function idValue($data);
+
+	/**
+	 * Public getter to return the id value using the idValue() method
+	 * For example with SQL this will return $data->$this->primaryKey
+	 *
+	 * @param array|object $data
+	 *
+	 * @return array|integer|string|null
+	 *
+	 * @todo: Make abstract in version 5.0
+	 */
+	public function getIdValue($data)
+	{
+		return $this->idValue($data);
+	}
+
+	/**
+	 * Override countAllResults to account for soft deleted accounts.
+	 * This methods works only with dbCalls
+	 *
+	 * @param boolean $reset Reset
+	 * @param boolean $test  Test
+	 *
+	 * @return mixed
+	 */
+	abstract public function countAllResults(bool $reset = true, bool $test = false);
+
+	/**
+	 * Loops over records in batches, allowing you to operate on them.
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer $size     Size
+	 * @param Closure $userFunc Callback Function
+	 *
+	 * @return void
+	 *
+	 * @throws DataException
+	 */
+	abstract public function chunk(int $size, Closure $userFunc);
+
+	/**
+	 * Fetches the row of database
+	 *
+	 * @param array|integer|string|null $id One primary key or an array of primary keys
+	 *
+	 * @return array|object|null The resulting row of data, or null.
+	 */
+	public function find($id = null)
+	{
+		$singleton = is_numeric($id) || is_string($id);
+
+		if ($this->tempAllowCallbacks)
+		{
+			// Call the before event and check for a return
+			$eventData = $this->trigger('beforeFind', [
+				'id'        => $id,
+				'method'    => 'find',
+				'singleton' => $singleton,
+			]);
+
+			if (! empty($eventData['returnData']))
+			{
+				return $eventData['data'];
+			}
+		}
+
+		$eventData = [
+			'id'        => $id,
+			'data'      => $this->doFind($singleton, $id),
+			'method'    => 'find',
+			'singleton' => $singleton,
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$eventData = $this->trigger('afterFind', $eventData);
+		}
+
+		$this->tempReturnType     = $this->returnType;
+		$this->tempUseSoftDeletes = $this->useSoftDeletes;
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		return $eventData['data'];
+	}
+
+	/**
+	 * Fetches the column of database
+	 *
+	 * @param string $columnName Column Name
+	 *
+	 * @return array|null The resulting row of data, or null if no data found.
+	 *
+	 * @throws DataException
+	 */
+	public function findColumn(string $columnName)
+	{
+		if (strpos($columnName, ',') !== false)
+		{
+			throw DataException::forFindColumnHaveMultipleColumns();
+		}
+
+		$resultSet = $this->doFindColumn($columnName);
+
+		return $resultSet ? array_column($resultSet, $columnName) : null;
+	}
+
+	/**
+	 * Fetches all results, while optionally limiting them.
+	 *
+	 * @param integer $limit  Limit
+	 * @param integer $offset Offset
+	 *
+	 * @return array
+	 */
+	public function findAll(int $limit = 0, int $offset = 0)
+	{
+		if ($this->tempAllowCallbacks)
+		{
+			// Call the before event and check for a return
+			$eventData = $this->trigger('beforeFind', [
+				'method'    => 'findAll',
+				'limit'     => $limit,
+				'offset'    => $offset,
+				'singleton' => false,
+			]);
+
+			if (! empty($eventData['returnData']))
+			{
+				return $eventData['data'];
+			}
+		}
+
+		$eventData = [
+			'data'      => $this->doFindAll($limit, $offset),
+			'limit'     => $limit,
+			'offset'    => $offset,
+			'method'    => 'findAll',
+			'singleton' => false,
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$eventData = $this->trigger('afterFind', $eventData);
+		}
+
+		$this->tempReturnType     = $this->returnType;
+		$this->tempUseSoftDeletes = $this->useSoftDeletes;
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		return $eventData['data'];
+	}
+
+	/**
+	 * Returns the first row of the result set.
+	 *
+	 * @return array|object|null
+	 */
+	public function first()
+	{
+		if ($this->tempAllowCallbacks)
+		{
+			// Call the before event and check for a return
+			$eventData = $this->trigger('beforeFind', [
+				'method'    => 'first',
+				'singleton' => true,
+			]);
+
+			if (! empty($eventData['returnData']))
+			{
+				return $eventData['data'];
+			}
+		}
+
+		$eventData = [
+			'data'      => $this->doFirst(),
+			'method'    => 'first',
+			'singleton' => true,
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$eventData = $this->trigger('afterFind', $eventData);
+		}
+
+		$this->tempReturnType     = $this->returnType;
+		$this->tempUseSoftDeletes = $this->useSoftDeletes;
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		return $eventData['data'];
+	}
+
+	/**
+	 * A convenience method that will attempt to determine whether the
+	 * data should be inserted or updated. Will work with either
+	 * an array or object. When using with custom class objects,
+	 * you must ensure that the class will provide access to the class
+	 * variables, even if through a magic method.
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return boolean
+	 *
+	 * @throws ReflectionException
+	 */
+	public function save($data): bool
+	{
+		if (empty($data))
+		{
+			return true;
+		}
+
+		if ($this->shouldUpdate($data))
+		{
+			$response = $this->update($this->getIdValue($data), $data);
+		}
+		else
+		{
+			$response = $this->insert($data, false);
+
+			if ($response !== false)
+			{
+				$response = true;
+			}
+		}
+		return $response;
+	}
+
+	/**
+	 * This method is called on save to determine if entry have to be updated
+	 * If this method return false insert operation will be executed
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return boolean
+	 */
+	protected function shouldUpdate($data) : bool
+	{
+		return ! empty($this->getIdValue($data));
+	}
+
+	/**
+	 * Returns last insert ID or 0.
+	 *
+	 * @return integer|string
+	 */
+	public function getInsertID()
+	{
+		return is_numeric($this->insertID) ? (int) $this->insertID : $this->insertID;
+	}
+
+	/**
+	 * Inserts data into the database. If an object is provided,
+	 * it will attempt to convert it to an array.
+	 *
+	 * @param array|object|null $data     Data
+	 * @param boolean           $returnID Whether insert ID should be returned or not.
+	 *
+	 * @return integer|string|boolean
+	 *
+	 * @throws ReflectionException
+	 */
+	public function insert($data = null, bool $returnID = true)
+	{
+		$this->insertID = 0;
+
+		$data = $this->transformDataToArray($data, 'insert');
+
+		// Validate data before saving.
+		if (! $this->skipValidation && ! $this->cleanRules()->validate($data))
+		{
+			return false;
+		}
+
+		// Must be called first so we don't
+		// strip out created_at values.
+		$data = $this->doProtectFields($data);
+
+		// doProtectFields() can further remove elements from
+		// $data so we need to check for empty dataset again
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset('insert');
+		}
+
+		// Set created_at and updated_at with same time
+		$date = $this->setDate();
+
+		if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $data))
+		{
+			$data[$this->createdField] = $date;
+		}
+
+		if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data))
+		{
+			$data[$this->updatedField] = $date;
+		}
+
+		$eventData = ['data' => $data];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$eventData = $this->trigger('beforeInsert', $eventData);
+		}
+
+		$result = $this->doInsert($eventData['data']);
+
+		$eventData = [
+			'id'     => $this->insertID,
+			'data'   => $eventData['data'],
+			'result' => $result,
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			// Trigger afterInsert events with the inserted data and new ID
+			$this->trigger('afterInsert', $eventData);
+		}
+
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		// If insertion failed, get out of here
+		if (! $result)
+		{
+			return $result;
+		}
+
+		// otherwise return the insertID, if requested.
+		return $returnID ? $this->insertID : $result;
+	}
+
+	/**
+	 * Compiles batch insert runs the queries, validating each row prior.
+	 *
+	 * @param array|null   $set       an associative array of insert values
+	 * @param boolean|null $escape    Whether to escape values and identifiers
+	 * @param integer      $batchSize The size of the batch to run
+	 * @param boolean      $testing   True means only number of records is returned, false will execute the query
+	 *
+	 * @return integer|boolean Number of rows inserted or FALSE on failure
+	 *
+	 * @throws ReflectionException
+	 */
+	public function insertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
+	{
+		if (is_array($set))
+		{
+			foreach ($set as &$row)
+			{
+				// If $data is using a custom class with public or protected
+				// properties representing the collection elements, we need to grab
+				// them as an array.
+				if (is_object($row) && ! $row instanceof stdClass)
+				{
+					$row = $this->objectToArray($row, false, true);
+				}
+
+				// If it's still a stdClass, go ahead and convert to
+				// an array so doProtectFields and other model methods
+				// don't have to do special checks.
+				if (is_object($row))
+				{
+					$row = (array) $row;
+				}
+
+				// Validate every row..
+				if (! $this->skipValidation && ! $this->cleanRules()->validate($row))
+				{
+					return false;
+				}
+
+				// Must be called first so we don't
+				// strip out created_at values.
+				$row = $this->doProtectFields($row);
+
+				// Set created_at and updated_at with same time
+				$date = $this->setDate();
+
+				if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $row))
+				{
+					$row[$this->createdField] = $date;
+				}
+
+				if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row))
+				{
+					$row[$this->updatedField] = $date;
+				}
+			}
+		}
+
+		return $this->doInsertBatch($set, $escape, $batchSize, $testing);
+	}
+
+	/**
+	 * Updates a single record in the database. If an object is provided,
+	 * it will attempt to convert it into an array.
+	 *
+	 * @param integer|array|string|null $id   ID
+	 * @param array|object|null         $data Data
+	 *
+	 * @return boolean
+	 *
+	 * @throws ReflectionException
+	 */
+	public function update($id = null, $data = null): bool
+	{
+		if (is_numeric($id) || is_string($id))
+		{
+			$id = [$id];
+		}
+
+		$data = $this->transformDataToArray($data, 'update');
+
+		// Validate data before saving.
+		if (! $this->skipValidation && ! $this->cleanRules(true)->validate($data))
+		{
+			return false;
+		}
+
+		// Must be called first so we don't
+		// strip out updated_at values.
+		$data = $this->doProtectFields($data);
+
+		// doProtectFields() can further remove elements from
+		// $data so we need to check for empty dataset again
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset('update');
+		}
+
+		if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data))
+		{
+			$data[$this->updatedField] = $this->setDate();
+		}
+
+		$eventData = [
+			'id'   => $id,
+			'data' => $data,
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$eventData = $this->trigger('beforeUpdate', $eventData);
+		}
+
+		$eventData = [
+			'id'     => $id,
+			'data'   => $eventData['data'],
+			'result' => $this->doUpdate($id, $eventData['data']),
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$this->trigger('afterUpdate', $eventData);
+		}
+
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		return $eventData['result'];
+	}
+
+	/**
+	 * Compiles an update and runs the query
+	 *
+	 * @param array|null  $set       An associative array of update values
+	 * @param string|null $index     The where key
+	 * @param integer     $batchSize The size of the batch to run
+	 * @param boolean     $returnSQL True means SQL is returned, false will execute the query
+	 *
+	 * @return mixed    Number of rows affected or FALSE on failure
+	 *
+	 * @throws DatabaseException
+	 * @throws ReflectionException
+	 */
+	public function updateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
+	{
+		if (is_array($set))
+		{
+			foreach ($set as &$row)
+			{
+				// If $data is using a custom class with public or protected
+				// properties representing the collection elements, we need to grab
+				// them as an array.
+				if (is_object($row) && ! $row instanceof stdClass)
+				{
+					$row = $this->objectToArray($row, true, true);
+				}
+
+				// If it's still a stdClass, go ahead and convert to
+				// an array so doProtectFields and other model methods
+				// don't have to do special checks.
+				if (is_object($row))
+				{
+					$row = (array) $row;
+				}
+
+				// Validate data before saving.
+				if (! $this->skipValidation && ! $this->cleanRules(true)->validate($row))
+				{
+					return false;
+				}
+
+				// Save updateIndex for later
+				$updateIndex = $row[$index] ?? null;
+
+				// Must be called first so we don't
+				// strip out updated_at values.
+				$row = $this->doProtectFields($row);
+
+				// Restore updateIndex value in case it was wiped out
+				if ($updateIndex !== null)
+				{
+					$row[$index] = $updateIndex;
+				}
+
+				if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row))
+				{
+					$row[$this->updatedField] = $this->setDate();
+				}
+			}
+		}
+
+		return $this->doUpdateBatch($set, $index, $batchSize, $returnSQL);
+	}
+
+	/**
+	 * Deletes a single record from the database where $id matches
+	 *
+	 * @param integer|string|array|null $id    The rows primary key(s)
+	 * @param boolean                   $purge Allows overriding the soft deletes setting.
+	 *
+	 * @return BaseResult|boolean
+	 *
+	 * @throws DatabaseException
+	 */
+	public function delete($id = null, bool $purge = false)
+	{
+		if ($id && (is_numeric($id) || is_string($id)))
+		{
+			$id = [$id];
+		}
+
+		$eventData = [
+			'id'    => $id,
+			'purge' => $purge,
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$this->trigger('beforeDelete', $eventData);
+		}
+
+		$eventData = [
+			'id'     => $id,
+			'data'   => null,
+			'purge'  => $purge,
+			'result' => $this->doDelete($id, $purge),
+		];
+
+		if ($this->tempAllowCallbacks)
+		{
+			$this->trigger('afterDelete', $eventData);
+		}
+
+		$this->tempAllowCallbacks = $this->allowCallbacks;
+
+		return $eventData['result'];
+	}
+
+	/**
+	 * Permanently deletes all rows that have been marked as deleted
+	 * through soft deletes (deleted = 1)
+	 *
+	 * @return boolean|mixed
+	 */
+	public function purgeDeleted()
+	{
+		if (! $this->useSoftDeletes)
+		{
+			return true;
+		}
+
+		return $this->doPurgeDeleted();
+	}
+
+	/**
+	 * Sets $useSoftDeletes value so that we can temporarily override
+	 * the soft deletes settings. Can be used for all find* methods.
+	 *
+	 * @param boolean $val Value
+	 *
+	 * @return $this
+	 */
+	public function withDeleted(bool $val = true)
+	{
+		$this->tempUseSoftDeletes = ! $val;
+
+		return $this;
+	}
+
+	/**
+	 * Works with the find* methods to return only the rows that
+	 * have been deleted.
+	 *
+	 * @return $this
+	 */
+	public function onlyDeleted()
+	{
+		$this->tempUseSoftDeletes = false;
+		$this->doOnlyDeleted();
+
+		return $this;
+	}
+
+	/**
+	 * Compiles a replace and runs the query
+	 *
+	 * @param array|null $data      Data
+	 * @param boolean    $returnSQL Set to true to return Query String
+	 *
+	 * @return mixed
+	 */
+	public function replace(array $data = null, bool $returnSQL = false)
+	{
+		// Validate data before saving.
+		if ($data && ! $this->skipValidation && ! $this->cleanRules(true)->validate($data))
+		{
+			return false;
+		}
+
+		return $this->doReplace($data, $returnSQL);
+	}
+
+	/**
+	 * Grabs the last error(s) that occurred. If data was validated,
+	 * it will first check for errors there, otherwise will try to
+	 * grab the last error from the Database connection.
+	 * The return array should be in the following format:
+	 *  ['source' => 'message']
+	 *
+	 * @param boolean $forceDB Always grab the db error, not validation
+	 *
+	 * @return array<string,string>
+	 */
+	public function errors(bool $forceDB = false)
+	{
+		// Do we have validation errors?
+		if (! $forceDB && ! $this->skipValidation && ($errors = $this->validation->getErrors()))
+		{
+			return $errors;
+		}
+
+		return $this->doErrors();
+	}
+
+	/**
+	 * Works with Pager to get the size and offset parameters.
+	 * Expects a GET variable (?page=2) that specifies the page of results
+	 * to display.
+	 *
+	 * @param integer|null $perPage Items per page
+	 * @param string       $group   Will be used by the pagination library to identify a unique pagination set.
+	 * @param integer|null $page    Optional page number (useful when the page number is provided in different way)
+	 * @param integer      $segment Optional URI segment number (if page number is provided by URI segment)
+	 *
+	 * @return array|null
+	 */
+	public function paginate(int $perPage = null, string $group = 'default', int $page = null, int $segment = 0)
+	{
+		$pager = Services::pager(null, null, false);
+
+		if ($segment)
+		{
+			$pager->setSegment($segment);
+		}
+
+		$page = $page >= 1 ? $page : $pager->getCurrentPage($group);
+		// Store it in the Pager library, so it can be paginated in the views.
+		$this->pager = $pager->store($group, $page, $perPage, $this->countAllResults(false), $segment);
+		$perPage     = $this->pager->getPerPage($group);
+		$offset      = ($page - 1) * $perPage;
+
+		return $this->findAll($perPage, $offset);
+	}
+
+	/**
+	 * It could be used when you have to change default or override current allowed fields.
+	 *
+	 * @param array $allowedFields Array with names of fields
+	 *
+	 * @return $this
+	 */
+	public function setAllowedFields(array $allowedFields)
+	{
+		$this->allowedFields = $allowedFields;
+
+		return $this;
+	}
+
+	/**
+	 * Sets whether or not we should whitelist data set during
+	 * updates or inserts against $this->availableFields.
+	 *
+	 * @param boolean $protect Value
+	 *
+	 * @return $this
+	 */
+	public function protect(bool $protect = true)
+	{
+		$this->protectFields = $protect;
+
+		return $this;
+	}
+
+	/**
+	 * Ensures that only the fields that are allowed to be updated
+	 * are in the data array.
+	 *
+	 * Used by insert() and update() to protect against mass assignment
+	 * vulnerabilities.
+	 *
+	 * @param array $data Data
+	 *
+	 * @return array
+	 *
+	 * @throws DataException
+	 */
+	protected function doProtectFields(array $data): array
+	{
+		if (! $this->protectFields)
+		{
+			return $data;
+		}
+
+		if (empty($this->allowedFields))
+		{
+			throw DataException::forInvalidAllowedFields(get_class($this));
+		}
+
+		foreach (array_keys($data) as $key)
+		{
+			if (! in_array($key, $this->allowedFields, true))
+			{
+				unset($data[$key]);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Sets the date or current date if null value is passed
+	 *
+	 * @param integer|null $userData An optional PHP timestamp to be converted.
+	 *
+	 * @return mixed
+	 *
+	 * @throws ModelException
+	 */
+	protected function setDate(?int $userData = null)
+	{
+		$currentDate = $userData ?? time();
+		return $this->intToDate($currentDate);
+	}
+
+	/**
+	 * A utility function to allow child models to use the type of
+	 * date/time format that they prefer. This is primarily used for
+	 * setting created_at, updated_at and deleted_at values, but can be
+	 * used by inheriting classes.
+	 *
+	 * The available time formats are:
+	 *  - 'int'      - Stores the date as an integer timestamp
+	 *  - 'datetime' - Stores the data in the SQL datetime format
+	 *  - 'date'     - Stores the date (only) in the SQL date format.
+	 *
+	 * @param integer $value value
+	 *
+	 * @return integer|string
+	 *
+	 * @throws ModelException
+	 */
+	protected function intToDate(int $value)
+	{
+		switch ($this->dateFormat)
+		{
+			case 'int':
+				return $value;
+			case 'datetime':
+				return date('Y-m-d H:i:s', $value);
+			case 'date':
+				return date('Y-m-d', $value);
+			default:
+				throw ModelException::forNoDateFormat(static::class);
+		}
+	}
+
+	/**
+	 * Converts Time value to string using $this->dateFormat
+	 *
+	 * The available time formats are:
+	 *  - 'int'      - Stores the date as an integer timestamp
+	 *  - 'datetime' - Stores the data in the SQL datetime format
+	 *  - 'date'     - Stores the date (only) in the SQL date format.
+	 *
+	 * @param Time $value value
+	 *
+	 * @return string|integer
+	 */
+	protected function timeToDate(Time $value)
+	{
+		switch ($this->dateFormat)
+		{
+			case 'datetime':
+				return $value->format('Y-m-d H:i:s');
+			case 'date':
+				return $value->format('Y-m-d');
+			case 'int':
+				return $value->getTimestamp();
+			default:
+				return (string) $value;
+		}
+	}
+
+	/**
+	 * Set the value of the skipValidation flag.
+	 *
+	 * @param boolean $skip Value
+	 *
+	 * @return $this
+	 */
+	public function skipValidation(bool $skip = true)
+	{
+		$this->skipValidation = $skip;
+
+		return $this;
+	}
+
+	/**
+	 * Allows to set validation messages.
+	 * It could be used when you have to change default or override current validate messages.
+	 *
+	 * @param array $validationMessages Value
+	 *
+	 * @return $this
+	 */
+	public function setValidationMessages(array $validationMessages)
+	{
+		$this->validationMessages = $validationMessages;
+
+		return $this;
+	}
+
+	/**
+	 * Allows to set field wise validation message.
+	 * It could be used when you have to change default or override current validate messages.
+	 *
+	 * @param string $field         Field Name
+	 * @param array  $fieldMessages Validation messages
+	 *
+	 * @return $this
+	 */
+	public function setValidationMessage(string $field, array $fieldMessages)
+	{
+		$this->validationMessages[$field] = $fieldMessages;
+
+		return $this;
+	}
+
+	/**
+	 * Allows to set validation rules.
+	 * It could be used when you have to change default or override current validate rules.
+	 *
+	 * @param array $validationRules Value
+	 *
+	 * @return $this
+	 */
+	public function setValidationRules(array $validationRules)
+	{
+		$this->validationRules = $validationRules;
+
+		return $this;
+	}
+
+	/**
+	 * Allows to set field wise validation rules.
+	 * It could be used when you have to change default or override current validate rules.
+	 *
+	 * @param string       $field      Field Name
+	 * @param string|array $fieldRules Validation rules
+	 *
+	 * @return $this
+	 */
+	public function setValidationRule(string $field, $fieldRules)
+	{
+		$this->validationRules[$field] = $fieldRules;
+
+		return $this;
+	}
+
+	/**
+	 * Should validation rules be removed before saving?
+	 * Most handy when doing updates.
+	 *
+	 * @param boolean $choice Value
+	 *
+	 * @return $this
+	 */
+	public function cleanRules(bool $choice = false)
+	{
+		$this->cleanValidationRules = $choice;
+
+		return $this;
+	}
+
+	/**
+	 * Validate the data against the validation rules (or the validation group)
+	 * specified in the class property, $validationRules.
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return boolean
+	 */
+	public function validate($data): bool
+	{
+		$rules = $this->getValidationRules();
+
+		if ($this->skipValidation || empty($rules) || empty($data))
+		{
+			return true;
+		}
+
+		//Validation requires array, so cast away.
+		if (is_object($data))
+		{
+			$data = (array) $data;
+		}
+
+		$rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $data) : $rules;
+
+		// If no data existed that needs validation
+		// our job is done here.
+		if (empty($rules))
+		{
+			return true;
+		}
+
+		return $this->validation->setRules($rules, $this->validationMessages)->run($data, null, $this->DBGroup);
+	}
+
+	/**
+	 * Returns the model's defined validation rules so that they
+	 * can be used elsewhere, if needed.
+	 *
+	 * @param array $options Options
+	 *
+	 * @return array
+	 */
+	public function getValidationRules(array $options = []): array
+	{
+		$rules = $this->validationRules;
+
+		// ValidationRules can be either a string, which is the group name,
+		// or an array of rules.
+		if (is_string($rules))
+		{
+			$rules = $this->validation->loadRuleGroup($rules);
+		}
+
+		if (isset($options['except']))
+		{
+			$rules = array_diff_key($rules, array_flip($options['except']));
+		}
+		elseif (isset($options['only']))
+		{
+			$rules = array_intersect_key($rules, array_flip($options['only']));
+		}
+
+		return $rules;
+	}
+
+	/**
+	 * Returns the model's define validation messages so they
+	 * can be used elsewhere, if needed.
+	 *
+	 * @return array
+	 */
+	public function getValidationMessages(): array
+	{
+		return $this->validationMessages;
+	}
+
+	/**
+	 * Removes any rules that apply to fields that have not been set
+	 * currently so that rules don't block updating when only updating
+	 * a partial row.
+	 *
+	 * @param array      $rules Array containing field name and rule
+	 * @param array|null $data  Data
+	 *
+	 * @return array
+	 */
+	protected function cleanValidationRules(array $rules, array $data = null): array
+	{
+		if (empty($data))
+		{
+			return [];
+		}
+
+		foreach (array_keys($rules) as $field)
+		{
+			if (! array_key_exists($field, $data))
+			{
+				unset($rules[$field]);
+			}
+		}
+
+		return $rules;
+	}
+
+	/**
+	 * Sets $tempAllowCallbacks value so that we can temporarily override
+	 * the setting. Resets after the next method that uses triggers.
+	 *
+	 * @param boolean $val value
+	 *
+	 * @return $this
+	 */
+	public function allowCallbacks(bool $val = true)
+	{
+		$this->tempAllowCallbacks = $val;
+
+		return $this;
+	}
+
+	/**
+	 * A simple event trigger for Model Events that allows additional
+	 * data manipulation within the model. Specifically intended for
+	 * usage by child models this can be used to format data,
+	 * save/load related classes, etc.
+	 *
+	 * It is the responsibility of the callback methods to return
+	 * the data itself.
+	 *
+	 * Each $eventData array MUST have a 'data' key with the relevant
+	 * data for callback methods (like an array of key/value pairs to insert
+	 * or update, an array of results, etc)
+	 *
+	 * If callbacks are not allowed then returns $eventData immediately.
+	 *
+	 * @param string $event     Event
+	 * @param array  $eventData Event Data
+	 *
+	 * @return mixed
+	 *
+	 * @throws DataException
+	 */
+	protected function trigger(string $event, array $eventData)
+	{
+		// Ensure it's a valid event
+		if (! isset($this->{$event}) || empty($this->{$event}))
+		{
+			return $eventData;
+		}
+
+		foreach ($this->{$event} as $callback)
+		{
+			if (! method_exists($this, $callback))
+			{
+				throw DataException::forInvalidMethodTriggered($callback);
+			}
+
+			$eventData = $this->{$callback}($eventData);
+		}
+
+		return $eventData;
+	}
+
+	/**
+	 * Sets the return type of the results to be as an associative array.
+	 *
+	 * @return $this
+	 */
+	public function asArray()
+	{
+		$this->tempReturnType = 'array';
+
+		return $this;
+	}
+
+	/**
+	 * Sets the return type to be of the specified type of object.
+	 * Defaults to a simple object, but can be any class that has
+	 * class vars with the same name as the collection columns,
+	 * or at least allows them to be created.
+	 *
+	 * @param string $class Class Name
+	 *
+	 * @return $this
+	 */
+	public function asObject(string $class = 'object')
+	{
+		$this->tempReturnType = $class;
+
+		return $this;
+	}
+
+	/**
+	 * Takes a class an returns an array of it's public and protected
+	 * properties as an array suitable for use in creates and updates.
+	 * This method use objectToRawArray internally and does conversion
+	 * to string on all Time instances
+	 *
+	 * @param string|object $data        Data
+	 * @param boolean       $onlyChanged Only Changed Property
+	 * @param boolean       $recursive   If true, inner entities will be casted as array as well
+	 *
+	 * @return array Array
+	 *
+	 * @throws ReflectionException
+	 */
+	protected function objectToArray($data, bool $onlyChanged = true, bool $recursive = false): array
+	{
+		$properties = $this->objectToRawArray($data, $onlyChanged, $recursive);
+
+		// Convert any Time instances to appropriate $dateFormat
+		if ($properties)
+		{
+			$properties = array_map(function ($value) {
+				if ($value instanceof Time)
+				{
+					return $this->timeToDate($value);
+				}
+				return $value;
+			}, $properties);
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Takes a class an returns an array of it's public and protected
+	 * properties as an array with raw values.
+	 *
+	 * @param string|object $data        Data
+	 * @param boolean       $onlyChanged Only Changed Property
+	 * @param boolean       $recursive   If true, inner entities will be casted as array as well
+	 *
+	 * @return array|null Array
+	 *
+	 * @throws ReflectionException
+	 */
+	protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
+	{
+		if (method_exists($data, 'toRawArray'))
+		{
+			$properties = $data->toRawArray($onlyChanged, $recursive);
+		}
+		else
+		{
+			$mirror = new ReflectionClass($data);
+			$props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
+
+			$properties = [];
+
+			// Loop over each property,
+			// saving the name/value in a new array we can return.
+			foreach ($props as $prop)
+			{
+				// Must make protected values accessible.
+				$prop->setAccessible(true);
+				$properties[$prop->getName()] = $prop->getValue($data);
+			}
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Transform data to array
+	 *
+	 * @param array|object|null $data Data
+	 * @param string            $type Type of data (insert|update)
+	 *
+	 * @return array
+	 *
+	 * @throws DataException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	protected function transformDataToArray($data, string $type): array
+	{
+		if (! in_array($type, ['insert', 'update'], true))
+		{
+			throw new InvalidArgumentException(sprintf('Invalid type "%s" used upon transforming data to array.', $type));
+		}
+
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset($type);
+		}
+
+		// If $data is using a custom class with public or protected
+		// properties representing the collection elements, we need to grab
+		// them as an array.
+		if (is_object($data) && ! $data instanceof stdClass)
+		{
+			$data = $this->objectToArray($data, true, true);
+		}
+
+		// If it's still a stdClass, go ahead and convert to
+		// an array so doProtectFields and other model methods
+		// don't have to do special checks.
+		if (is_object($data))
+		{
+			$data = (array) $data;
+		}
+
+		// If it's still empty here, means $data is no change or is empty object
+		if (empty($data))
+		{
+			throw DataException::forEmptyDataset($type);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Provides the db connection and model's properties.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	public function __get(string $name)
+	{
+		if (property_exists($this, $name))
+		{
+			return $this->$name;
+		}
+
+		if (isset($this->db->$name))
+		{
+			return $this->db->$name;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Checks for the existence of properties across this model, and db connection.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return boolean
+	 */
+	public function __isset(string $name): bool
+	{
+		if (property_exists($this, $name))
+		{
+			return true;
+		}
+		return isset($this->db->$name);
+	}
+
+	/**
+	 * Provides direct access to method in the database connection.
+	 *
+	 * @param string $name   Name
+	 * @param array  $params Params
+	 *
+	 * @return $this|null
+	 */
+	public function __call(string $name, array $params)
+	{
+		if (method_exists($this->db, $name))
+		{
+			return $this->db->{$name}(...$params);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Replace any placeholders within the rules with the values that
+	 * match the 'key' of any properties being set. For example, if
+	 * we had the following $data array:
+	 *
+	 * [ 'id' => 13 ]
+	 *
+	 * and the following rule:
+	 *
+	 *  'required|is_unique[users,email,id,{id}]'
+	 *
+	 * The value of {id} would be replaced with the actual id in the form data:
+	 *
+	 *  'required|is_unique[users,email,id,13]'
+	 *
+	 * @param array $rules Validation rules
+	 * @param array $data  Data
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @deprecated use fillPlaceholders($rules, $data) from Validation instead
+	 *
+	 * @return array
+	 */
+	protected function fillPlaceholders(array $rules, array $data): array
+	{
+		$replacements = [];
+
+		foreach ($data as $key => $value)
+		{
+			$replacements['{' . $key . '}'] = $value;
+		}
+
+		if (! empty($replacements))
+		{
+			foreach ($rules as &$rule)
+			{
+				if (is_array($rule))
+				{
+					foreach ($rule as &$row)
+					{
+						// Should only be an `errors` array
+						// which doesn't take placeholders.
+						if (is_array($row))
+						{
+							continue;
+						}
+
+						$row = strtr($row, $replacements);
+					}
+
+					continue;
+				}
+
+				$rule = strtr($rule, $replacements);
+			}
+		}
+
+		return $rules;
+	}
+}
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
new file mode 100644
index 0000000..54bf4c9
--- /dev/null
+++ b/system/CLI/BaseCommand.php
@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use Psr\Log\LoggerInterface;
+use ReflectionException;
+use Throwable;
+
+/**
+ * BaseCommand is the base class used in creating CLI commands.
+ *
+ * @property string          $group
+ * @property string          $name
+ * @property string          $usage
+ * @property string          $description
+ * @property array           $options
+ * @property array           $arguments
+ * @property LoggerInterface $logger
+ * @property Commands        $commands
+ */
+abstract class BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group;
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * the Command's usage description
+	 *
+	 * @var string
+	 */
+	protected $usage;
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description;
+
+	/**
+	 * the Command's options description
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	/**
+	 * the Command's Arguments description
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * The Logger to use for a command
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Instance of Commands so
+	 * commands can call other commands.
+	 *
+	 * @var Commands
+	 */
+	protected $commands;
+
+	/**
+	 * BaseCommand constructor.
+	 *
+	 * @param LoggerInterface $logger
+	 * @param Commands        $commands
+	 */
+	public function __construct(LoggerInterface $logger, Commands $commands)
+	{
+		$this->logger   = $logger;
+		$this->commands = $commands;
+	}
+
+	/**
+	 * Actually execute a command.
+	 * This has to be over-ridden in any concrete implementation.
+	 *
+	 * @param array $params
+	 */
+	abstract public function run(array $params);
+
+	/**
+	 * Can be used by a command to run other commands.
+	 *
+	 * @param string $command
+	 * @param array  $params
+	 *
+	 * @return mixed
+	 * @throws ReflectionException
+	 */
+	protected function call(string $command, array $params = [])
+	{
+		return $this->commands->run($command, $params);
+	}
+
+	/**
+	 * A simple method to display an error with line/file, in child commands.
+	 *
+	 * @param Throwable $e
+	 */
+	protected function showError(Throwable $e)
+	{
+		$exception = $e;
+		$message   = $e->getMessage();
+
+		require APPPATH . 'Views/errors/cli/error_exception.php';
+	}
+
+	/**
+	 * Show Help includes (Usage, Arguments, Description, Options).
+	 */
+	public function showHelp()
+	{
+		CLI::write(lang('CLI.helpUsage'), 'yellow');
+
+		if (! empty($this->usage))
+		{
+			$usage = $this->usage;
+		}
+		else
+		{
+			$usage = $this->name;
+
+			if (! empty($this->arguments))
+			{
+				$usage .= ' [arguments]';
+			}
+		}
+
+		CLI::write($this->setPad($usage, 0, 0, 2));
+
+		if (! empty($this->description))
+		{
+			CLI::newLine();
+			CLI::write(lang('CLI.helpDescription'), 'yellow');
+			CLI::write($this->setPad($this->description, 0, 0, 2));
+		}
+
+		if (! empty($this->arguments))
+		{
+			CLI::newLine();
+			CLI::write(lang('CLI.helpArguments'), 'yellow');
+			$length = max(array_map('strlen', array_keys($this->arguments)));
+
+			foreach ($this->arguments as $argument => $description)
+			{
+				CLI::write(CLI::color($this->setPad($argument, $length, 2, 2), 'green') . $description);
+			}
+		}
+
+		if (! empty($this->options))
+		{
+			CLI::newLine();
+			CLI::write(lang('CLI.helpOptions'), 'yellow');
+			$length = max(array_map('strlen', array_keys($this->options)));
+
+			foreach ($this->options as $option => $description)
+			{
+				CLI::write(CLI::color($this->setPad($option, $length, 2, 2), 'green') . $description);
+			}
+		}
+	}
+
+	/**
+	 * Pads our string out so that all titles are the same length to nicely line up descriptions.
+	 *
+	 * @param string  $item
+	 * @param integer $max
+	 * @param integer $extra  How many extra spaces to add at the end
+	 * @param integer $indent
+	 *
+	 * @return string
+	 */
+	public function setPad(string $item, int $max, int $extra = 2, int $indent = 0): string
+	{
+		$max += $extra + $indent;
+
+		return str_pad(str_repeat(' ', $indent) . $item, $max);
+	}
+
+	/**
+	 * Get pad for $key => $value array output
+	 *
+	 * @param array   $array
+	 * @param integer $pad
+	 *
+	 * @return integer
+	 *
+	 * @deprecated Use setPad() instead.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getPad(array $array, int $pad): int
+	{
+		$max = 0;
+
+		foreach (array_keys($array) as $key)
+		{
+			$max = max($max, strlen($key));
+		}
+
+		return $max + $pad;
+	}
+
+	/**
+	 * Makes it simple to access our protected properties.
+	 *
+	 * @param string $key
+	 *
+	 * @return mixed
+	 */
+	public function __get(string $key)
+	{
+		if (isset($this->$key))
+		{
+			return $this->$key;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Makes it simple to check our protected properties.
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function __isset(string $key): bool
+	{
+		return isset($this->$key);
+	}
+}
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
new file mode 100644
index 0000000..a477f71
--- /dev/null
+++ b/system/CLI/CLI.php
@@ -0,0 +1,1185 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use CodeIgniter\CLI\Exceptions\CLIException;
+use Config\Services;
+use InvalidArgumentException;
+use Throwable;
+
+/**
+ * Set of static methods useful for CLI request handling.
+ *
+ * Portions of this code were initially from the FuelPHP Framework,
+ * version 1.7.x, and used here under the MIT license they were
+ * originally made available under. Reference: http://fuelphp.com
+ *
+ * Some of the code in this class is Windows-specific, and not
+ * possible to test using travis-ci. It has been phpunit-annotated
+ * to prevent messing up code coverage.
+ *
+ * Some of the methods require keyboard input, and are not unit-testable
+ * as a result: input() and prompt().
+ * validate() is internal, and not testable if prompt() isn't.
+ * The wait() method is mostly testable, as long as you don't give it
+ * an argument of "0".
+ * These have been flagged to ignore for code coverage purposes.
+ */
+class CLI
+{
+	/**
+	 * Is the readline library on the system?
+	 *
+	 * @var boolean
+	 */
+	public static $readline_support = false;
+
+	/**
+	 * The message displayed at prompts.
+	 *
+	 * @var string
+	 */
+	public static $wait_msg = 'Press any key to continue...';
+
+	/**
+	 * Has the class already been initialized?
+	 *
+	 * @var boolean
+	 */
+	protected static $initialized = false;
+
+	/**
+	 * Foreground color list
+	 *
+	 * @var array
+	 */
+	protected static $foreground_colors = [
+		'black'        => '0;30',
+		'dark_gray'    => '1;30',
+		'blue'         => '0;34',
+		'dark_blue'    => '0;34',
+		'light_blue'   => '1;34',
+		'green'        => '0;32',
+		'light_green'  => '1;32',
+		'cyan'         => '0;36',
+		'light_cyan'   => '1;36',
+		'red'          => '0;31',
+		'light_red'    => '1;31',
+		'purple'       => '0;35',
+		'light_purple' => '1;35',
+		'yellow'       => '0;33',
+		'light_yellow' => '1;33',
+		'light_gray'   => '0;37',
+		'white'        => '1;37',
+	];
+
+	/**
+	 * Background color list
+	 *
+	 * @var array
+	 */
+	protected static $background_colors = [
+		'black'      => '40',
+		'red'        => '41',
+		'green'      => '42',
+		'yellow'     => '43',
+		'blue'       => '44',
+		'magenta'    => '45',
+		'cyan'       => '46',
+		'light_gray' => '47',
+	];
+
+	/**
+	 * List of array segments.
+	 *
+	 * @var array
+	 */
+	protected static $segments = [];
+
+	/**
+	 * @var array
+	 */
+	protected static $options = [];
+
+	/**
+	 * Helps track internally whether the last
+	 * output was a "write" or a "print" to
+	 * keep the output clean and as expected.
+	 *
+	 * @var string|null
+	 */
+	protected static $lastWrite;
+
+	/**
+	 * Height of the CLI window
+	 *
+	 * @var integer|null
+	 */
+	protected static $height;
+
+	/**
+	 * Width of the CLI window
+	 *
+	 * @var integer|null
+	 */
+	protected static $width;
+
+	/**
+	 * Whether the current stream supports colored output.
+	 *
+	 * @var boolean
+	 */
+	protected static $isColored = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Static "constructor".
+	 */
+	public static function init()
+	{
+		if (is_cli())
+		{
+			// Readline is an extension for PHP that makes interactivity with PHP
+			// much more bash-like.
+			// http://www.php.net/manual/en/readline.installation.php
+			static::$readline_support = extension_loaded('readline');
+
+			// clear segments & options to keep testing clean
+			static::$segments = [];
+			static::$options  = [];
+
+			// Check our stream resource for color support
+			static::$isColored = static::hasColorSupport(STDOUT);
+
+			static::parseCommandLine();
+
+			static::$initialized = true;
+		}
+		else
+		{
+			// If the command is being called from a controller
+			// we need to define STDOUT ourselves
+			// @codeCoverageIgnoreStart
+			define('STDOUT', 'php://output');
+			// @codeCoverageIgnoreEnd
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get input from the shell, using readline or the standard STDIN
+	 *
+	 * Named options must be in the following formats:
+	 * php index.php user -v --v -name=John --name=John
+	 *
+	 * @param  string $prefix
+	 * @return string
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function input(string $prefix = null): string
+	{
+		if (static::$readline_support)
+		{
+			return readline($prefix);
+		}
+
+		echo $prefix;
+
+		return fgets(STDIN);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asks the user for input.
+	 *
+	 * Usage:
+	 *
+	 * // Takes any input
+	 * $color = CLI::prompt('What is your favorite color?');
+	 *
+	 * // Takes any input, but offers default
+	 * $color = CLI::prompt('What is your favourite color?', 'white');
+	 *
+	 * // Will validate options with the in_list rule and accept only if one of the list
+	 * $color = CLI::prompt('What is your favourite color?', array('red','blue'));
+	 *
+	 * // Do not provide options but requires a valid email
+	 * $email = CLI::prompt('What is your email?', null, 'required|valid_email');
+	 *
+	 * @param string       $field      Output "field" question
+	 * @param string|array $options    String to a default value, array to a list of options (the first option will be the default value)
+	 * @param string|array $validation Validation rules
+	 *
+	 * @return string The user input
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function prompt(string $field, $options = null, $validation = null): string
+	{
+		$extraOutput = '';
+		$default     = '';
+
+		if ($validation && ! is_array($validation) && ! is_string($validation))
+		{
+			throw new InvalidArgumentException('$rules can only be of type string|array');
+		}
+
+		if (! is_array($validation))
+		{
+			$validation = $validation ? explode('|', $validation) : [];
+		}
+
+		if (is_string($options))
+		{
+			$extraOutput = ' [' . static::color($options, 'white') . ']';
+			$default     = $options;
+		}
+
+		if (is_array($options) && $options)
+		{
+			$opts               = $options;
+			$extraOutputDefault = static::color($opts[0], 'white');
+
+			unset($opts[0]);
+
+			if (empty($opts))
+			{
+				$extraOutput = $extraOutputDefault;
+			}
+			else
+			{
+				$extraOutput  = ' [' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
+				$validation[] = 'in_list[' . implode(',', $options) . ']';
+			}
+
+			$default = $options[0];
+		}
+
+		static::fwrite(STDOUT, $field . $extraOutput . ': ');
+
+		// Read the input from keyboard.
+		$input = trim(static::input()) ?: $default;
+
+		if ($validation)
+		{
+			while (! static::validate($field, $input, $validation))
+			{
+				$input = static::prompt($field, $options, $validation);
+			}
+		}
+
+		return empty($input) ? '' : $input;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate one prompt "field" at a time
+	 *
+	 * @param string       $field Prompt "field" output
+	 * @param string       $value Input value
+	 * @param string|array $rules Validation rules
+	 *
+	 * @return boolean
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected static function validate(string $field, string $value, $rules): bool
+	{
+		$label      = $field;
+		$field      = 'temp';
+		$validation = Services::validation(null, false);
+		$validation->setRules([
+			$field => [
+				'label' => $label,
+				'rules' => $rules,
+			],
+		]);
+		$validation->run([$field => $value]);
+
+		if ($validation->hasError($field))
+		{
+			static::error($validation->getError($field));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs a string to the CLI without any surrounding newlines.
+	 * Useful for showing repeating elements on a single line.
+	 *
+	 * @param string      $text
+	 * @param string|null $foreground
+	 * @param string|null $background
+	 */
+	public static function print(string $text = '', string $foreground = null, string $background = null)
+	{
+		if ($foreground || $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		static::$lastWrite = null;
+
+		static::fwrite(STDOUT, $text);
+	}
+
+	/**
+	 * Outputs a string to the cli on it's own line.
+	 *
+	 * @param string $text       The text to output
+	 * @param string $foreground
+	 * @param string $background
+	 */
+	public static function write(string $text = '', string $foreground = null, string $background = null)
+	{
+		if ($foreground || $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		if (static::$lastWrite !== 'write')
+		{
+			$text              = PHP_EOL . $text;
+			static::$lastWrite = 'write';
+		}
+
+		static::fwrite(STDOUT, $text . PHP_EOL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs an error to the CLI using STDERR instead of STDOUT
+	 *
+	 * @param string      $text       The text to output, or array of errors
+	 * @param string      $foreground
+	 * @param string|null $background
+	 */
+	public static function error(string $text, string $foreground = 'light_red', string $background = null)
+	{
+		// Check color support for STDERR
+		$stdout            = static::$isColored;
+		static::$isColored = static::hasColorSupport(STDERR);
+
+		if ($foreground || $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		static::fwrite(STDERR, $text . PHP_EOL);
+
+		// return STDOUT color support
+		static::$isColored = $stdout;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Beeps a certain number of times.
+	 *
+	 * @param integer $num The number of times to beep
+	 */
+	public static function beep(int $num = 1)
+	{
+		echo str_repeat("\x07", $num);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Waits a certain number of seconds, optionally showing a wait message and
+	 * waiting for a key press.
+	 *
+	 * @param integer $seconds   Number of seconds
+	 * @param boolean $countdown Show a countdown or not
+	 */
+	public static function wait(int $seconds, bool $countdown = false)
+	{
+		if ($countdown === true)
+		{
+			$time = $seconds;
+			while ($time > 0)
+			{
+				static::fwrite(STDOUT, $time . '... ');
+				sleep(1);
+				$time --;
+			}
+			static::write();
+		}
+		elseif ($seconds > 0)
+		{
+			sleep($seconds);
+		}
+		else
+		{
+			// this chunk cannot be tested because of keyboard input
+			// @codeCoverageIgnoreStart
+			static::write(static::$wait_msg);
+			static::input();
+			// @codeCoverageIgnoreEnd
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * if operating system === windows
+	 *
+	 * @return boolean
+	 */
+	public static function isWindows(): bool
+	{
+		return stripos(PHP_OS, 'WIN') === 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enter a number of empty lines
+	 *
+	 * @param integer $num Number of lines to output
+	 *
+	 * @return void
+	 */
+	public static function newLine(int $num = 1)
+	{
+		// Do it once or more, write with empty string gives us a new line
+		for ($i = 0; $i < $num; $i ++)
+		{
+			static::write();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears the screen of output
+	 *
+	 * @return void
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function clearScreen()
+	{
+		// Unix systems, and Windows with VT100 Terminal support (i.e. Win10)
+		// can handle CSI sequences. For lower than Win10 we just shove in 40 new lines.
+		static::isWindows() && ! static::streamSupports('sapi_windows_vt100_support', STDOUT)
+			? static::newLine(40)
+			: static::fwrite(STDOUT, "\033[H\033[2J");
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the given text with the correct color codes for a foreground and
+	 * optionally a background color.
+	 *
+	 * @param string $text       The text to color
+	 * @param string $foreground The foreground color
+	 * @param string $background The background color
+	 * @param string $format     Other formatting to apply. Currently only 'underline' is understood
+	 *
+	 * @return string    The color coded string
+	 */
+	public static function color(string $text, string $foreground, string $background = null, string $format = null): string
+	{
+		if (! static::$isColored)
+		{
+			return $text;
+		}
+
+		if (! array_key_exists($foreground, static::$foreground_colors))
+		{
+			throw CLIException::forInvalidColor('foreground', $foreground);
+		}
+
+		if ($background !== null && ! array_key_exists($background, static::$background_colors))
+		{
+			throw CLIException::forInvalidColor('background', $background);
+		}
+
+		$string = "\033[" . static::$foreground_colors[$foreground] . 'm';
+
+		if ($background !== null)
+		{
+			$string .= "\033[" . static::$background_colors[$background] . 'm';
+		}
+
+		if ($format === 'underline')
+		{
+			$string .= "\033[4m";
+		}
+
+		// Detect if color method was already in use with this text
+		if (strpos($text, "\033[0m") !== false)
+		{
+			// Split the text into parts so that we can see
+			// if any part missing the color definition
+			$chunks = mb_split("\\033\[0m", $text);
+			// Reset text
+			$text = '';
+
+			foreach ($chunks as $chunk)
+			{
+				if ($chunk === '')
+				{
+					continue;
+				}
+
+				// If chunk doesn't have colors defined we need to add them
+				if (strpos($chunk, "\033[") === false)
+				{
+					$chunk = static::color($chunk, $foreground, $background, $format);
+					// Add color reset before chunk and clear end of the string
+					$text .= rtrim("\033[0m" . $chunk, "\033[0m");
+				}
+				else
+				{
+					$text .= $chunk;
+				}
+			}
+		}
+
+		return $string . $text . "\033[0m";
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the number of characters in string having encoded characters
+	 * and ignores styles set by the color() function
+	 *
+	 * @param string $string
+	 *
+	 * @return integer
+	 */
+	public static function strlen(?string $string): int
+	{
+		if (is_null($string))
+		{
+			return 0;
+		}
+
+		foreach (static::$foreground_colors as $color)
+		{
+			$string = strtr($string, ["\033[" . $color . 'm' => '']);
+		}
+
+		foreach (static::$background_colors as $color)
+		{
+			$string = strtr($string, ["\033[" . $color . 'm' => '']);
+		}
+
+		$string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
+
+		return mb_strwidth($string);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks whether the current stream resource supports or
+	 * refers to a valid terminal type device.
+	 *
+	 * @param string   $function
+	 * @param resource $resource
+	 *
+	 * @return boolean
+	 */
+	public static function streamSupports(string $function, $resource): bool
+	{
+		if (ENVIRONMENT === 'testing')
+		{
+			// In the current setup of the tests we cannot fully check
+			// if the stream supports the function since we are using
+			// filtered streams.
+			return function_exists($function);
+		}
+
+		// @codeCoverageIgnoreStart
+		return function_exists($function) && @$function($resource);
+		// @codeCoverageIgnoreEnd
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns true if the stream resource supports colors.
+	 *
+	 * This is tricky on Windows, because Cygwin, Msys2 etc. emulate pseudo
+	 * terminals via named pipes, so we can only check the environment.
+	 *
+	 * Reference: https://github.com/composer/xdebug-handler/blob/master/src/Process.php
+	 *
+	 * @param resource $resource
+	 *
+	 * @return boolean
+	 */
+	public static function hasColorSupport($resource): bool
+	{
+		// Follow https://no-color.org/
+		if (isset($_SERVER['NO_COLOR']) || getenv('NO_COLOR') !== false)
+		{
+			return false;
+		}
+
+		if (getenv('TERM_PROGRAM') === 'Hyper')
+		{
+			return true;
+		}
+
+		if (static::isWindows())
+		{
+			// @codeCoverageIgnoreStart
+			return static::streamSupports('sapi_windows_vt100_support', $resource)
+				|| isset($_SERVER['ANSICON'])
+				|| getenv('ANSICON') !== false
+				|| getenv('ConEmuANSI') === 'ON'
+				|| getenv('TERM') === 'xterm';
+			// @codeCoverageIgnoreEnd
+		}
+
+		return static::streamSupports('stream_isatty', $resource);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to determine the width of the viewable CLI window.
+	 *
+	 * @param integer $default
+	 *
+	 * @return integer
+	 */
+	public static function getWidth(int $default = 80): int
+	{
+		if (\is_null(static::$width))
+		{
+			static::generateDimensions();
+		}
+
+		return static::$width ?: $default;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to determine the height of the viewable CLI window.
+	 *
+	 * @param integer $default
+	 *
+	 * @return integer
+	 */
+	public static function getHeight(int $default = 32): int
+	{
+		if (\is_null(static::$height))
+		{
+			static::generateDimensions();
+		}
+
+		return static::$height ?: $default;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Populates the CLI's dimensions.
+	 *
+	 * @return void
+	 */
+	public static function generateDimensions()
+	{
+		try
+		{
+			if (static::isWindows())
+			{
+				// Shells such as `Cygwin` and `Git bash` returns incorrect values
+				// when executing `mode CON`, so we use `tput` instead
+				// @codeCoverageIgnoreStart
+				if (($shell = getenv('SHELL')) && preg_match('/(?:bash|zsh)(?:\.exe)?$/', $shell) || getenv('TERM'))
+				{
+					static::$height = (int) exec('tput lines');
+					static::$width  = (int) exec('tput cols');
+				}
+				else
+				{
+					$return = -1;
+					$output = [];
+					exec('mode CON', $output, $return);
+
+					// Look for the next lines ending in ": <number>"
+					// Searching for "Columns:" or "Lines:" will fail on non-English locales
+					if ($return === 0 && $output && preg_match('/:\s*(\d+)\n[^:]+:\s*(\d+)\n/', implode("\n", $output), $matches))
+					{
+						static::$height = (int) $matches[1];
+						static::$width  = (int) $matches[2];
+					}
+				}
+				// @codeCoverageIgnoreEnd
+			}
+			elseif (($size = exec('stty size')) && preg_match('/(\d+)\s+(\d+)/', $size, $matches))
+			{
+				static::$height = (int) $matches[1];
+				static::$width  = (int) $matches[2];
+			}
+			else
+			{
+				// @codeCoverageIgnoreStart
+				static::$height = (int) exec('tput lines');
+				static::$width  = (int) exec('tput cols');
+				// @codeCoverageIgnoreEnd
+			}
+		}
+		// @codeCoverageIgnoreStart
+		catch (Throwable $e)
+		{
+			// Reset the dimensions so that the default values will be returned later.
+			// Then let the developer know of the error.
+			static::$height = null;
+			static::$width  = null;
+			log_message('error', $e->getMessage());
+		}
+		// @codeCoverageIgnoreEnd
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays a progress bar on the CLI. You must call it repeatedly
+	 * to update it. Set $thisStep = false to erase the progress bar.
+	 *
+	 * @param integer|boolean $thisStep
+	 * @param integer         $totalSteps
+	 */
+	public static function showProgress($thisStep = 1, int $totalSteps = 10)
+	{
+		static $inProgress = false;
+
+		// restore cursor position when progress is continuing.
+		if ($inProgress !== false && $inProgress <= $thisStep)
+		{
+			static::fwrite(STDOUT, "\033[1A");
+		}
+		$inProgress = $thisStep;
+
+		if ($thisStep !== false)
+		{
+			// Don't allow div by zero or negative numbers....
+			$thisStep   = abs($thisStep);
+			$totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
+
+			$percent = (int) (($thisStep / $totalSteps) * 100);
+			$step    = (int) round($percent / 10);
+
+			// Write the progress bar
+			static::fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
+			// Textual representation...
+			static::fwrite(STDOUT, sprintf(' %3d%% Complete', $percent) . PHP_EOL);
+		}
+		else
+		{
+			static::fwrite(STDOUT, "\007");
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes a string and writes it to the command line, wrapping to a maximum
+	 * width. If no maximum width is specified, will wrap to the window's max
+	 * width.
+	 *
+	 * If an int is passed into $pad_left, then all strings after the first
+	 * will padded with that many spaces to the left. Useful when printing
+	 * short descriptions that need to start on an existing line.
+	 *
+	 * @param string  $string
+	 * @param integer $max
+	 * @param integer $padLeft
+	 *
+	 * @return string
+	 */
+	public static function wrap(string $string = null, int $max = 0, int $padLeft = 0): string
+	{
+		if (empty($string))
+		{
+			return '';
+		}
+
+		if ($max === 0)
+		{
+			$max = CLI::getWidth();
+		}
+
+		if (CLI::getWidth() < $max)
+		{
+			$max = CLI::getWidth();
+		}
+
+		$max = $max - $padLeft;
+
+		$lines = wordwrap($string, $max, PHP_EOL);
+
+		if ($padLeft > 0)
+		{
+			$lines = explode(PHP_EOL, $lines);
+
+			$first = true;
+
+			array_walk($lines, function (&$line, $index) use ($padLeft, &$first) {
+				if (! $first)
+				{
+					$line = str_repeat(' ', $padLeft) . $line;
+				}
+				else
+				{
+					$first = false;
+				}
+			});
+
+			$lines = implode(PHP_EOL, $lines);
+		}
+
+		return $lines;
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Command-Line 'URI' support
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the command line it was called from and collects all
+	 * options and valid segments.
+	 */
+	protected static function parseCommandLine()
+	{
+		$args = $_SERVER['argv'] ?? [];
+		array_shift($args); // scrap invoking program
+		$optionValue = false;
+
+		foreach ($args as $i => $arg)
+		{
+			// If there's no "-" at the beginning, then
+			// this is probably an argument or an option value
+			if (mb_strpos($arg, '-') !== 0)
+			{
+				if ($optionValue)
+				{
+					// We have already included this in the previous
+					// iteration, so reset this flag
+					$optionValue = false;
+				}
+				else
+				{
+					// Yup, it's a segment
+					static::$segments[] = $arg;
+				}
+
+				continue;
+			}
+
+			$arg   = ltrim($arg, '-');
+			$value = null;
+
+			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
+			{
+				$value       = $args[$i + 1];
+				$optionValue = true;
+			}
+
+			static::$options[$arg] = $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the command line string portions of the arguments, minus
+	 * any options, as a string. This is used to pass along to the main
+	 * CodeIgniter application.
+	 *
+	 * @return string
+	 */
+	public static function getURI(): string
+	{
+		return implode('/', static::$segments);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an individual segment.
+	 *
+	 * This ignores any options that might have been dispersed between
+	 * valid segments in the command:
+	 *
+	 *  // segment(3) is 'three', not '-f' or 'anOption'
+	 *  > php spark one two -f anOption three
+	 *
+	 * **IMPORTANT:** The index here is one-based instead of zero-based.
+	 *
+	 * @param integer $index
+	 *
+	 * @return mixed|null
+	 */
+	public static function getSegment(int $index)
+	{
+		if (! isset(static::$segments[$index - 1]))
+		{
+			return null;
+		}
+
+		return static::$segments[$index - 1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the raw array of segments found.
+	 *
+	 * @return array
+	 */
+	public static function getSegments(): array
+	{
+		return static::$segments;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets a single command-line option. Returns TRUE if the option
+	 * exists, but doesn't have a value, and is simply acting as a flag.
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean|mixed|null
+	 */
+	public static function getOption(string $name)
+	{
+		if (! array_key_exists($name, static::$options))
+		{
+			return null;
+		}
+
+		// If the option didn't have a value, simply return TRUE
+		// so they know it was set, otherwise return the actual value.
+		$val = static::$options[$name] ?? true;
+
+		return $val;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the raw array of options found.
+	 *
+	 * @return array
+	 */
+	public static function getOptions(): array
+	{
+		return static::$options;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the options as a string, suitable for passing along on
+	 * the CLI to other commands.
+	 *
+	 * @param boolean $useLongOpts Use '--' for long options?
+	 * @param boolean $trim        Trim final string output?
+	 *
+	 * @return string
+	 */
+	public static function getOptionString(bool $useLongOpts = false, bool $trim = false): string
+	{
+		if (empty(static::$options))
+		{
+			return '';
+		}
+
+		$out = '';
+
+		foreach (static::$options as $name => $value)
+		{
+			if ($useLongOpts && mb_strlen($name) > 1)
+			{
+				$out .= "--{$name} ";
+			}
+			else
+			{
+				$out .= "-{$name} ";
+			}
+
+			// If there's a space, we need to group
+			// so it will pass correctly.
+			if (mb_strpos($value, ' ') !== false)
+			{
+				$out .= '"' . $value . '" ';
+			}
+			elseif ($value !== null)
+			{
+				$out .= "{$value} ";
+			}
+		}
+
+		return $trim ? trim($out) : $out;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a well formatted table
+	 *
+	 * @param array $tbody List of rows
+	 * @param array $thead List of columns
+	 *
+	 * @return void
+	 */
+	public static function table(array $tbody, array $thead = [])
+	{
+		// All the rows in the table will be here until the end
+		$tableRows = [];
+
+		// We need only indexes and not keys
+		if (! empty($thead))
+		{
+			$tableRows[] = array_values($thead);
+		}
+
+		foreach ($tbody as $tr)
+		{
+			$tableRows[] = array_values($tr);
+		}
+
+		// Yes, it really is necessary to know this count
+		$totalRows = count($tableRows);
+
+		// Store all columns lengths
+		// $all_cols_lengths[row][column] = length
+		$allColsLengths = [];
+
+		// Store maximum lengths by column
+		// $max_cols_lengths[column] = length
+		$maxColsLengths = [];
+
+		// Read row by row and define the longest columns
+		for ($row = 0; $row < $totalRows; $row ++)
+		{
+			$column = 0; // Current column index
+			foreach ($tableRows[$row] as $col)
+			{
+				// Sets the size of this column in the current row
+				$allColsLengths[$row][$column] = static::strlen($col);
+
+				// If the current column does not have a value among the larger ones
+				// or the value of this is greater than the existing one
+				// then, now, this assumes the maximum length
+				if (! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column])
+				{
+					$maxColsLengths[$column] = $allColsLengths[$row][$column];
+				}
+
+				// We can go check the size of the next column...
+				$column ++;
+			}
+		}
+
+		// Read row by row and add spaces at the end of the columns
+		// to match the exact column length
+		for ($row = 0; $row < $totalRows; $row ++)
+		{
+			$column = 0;
+			foreach ($tableRows[$row] as $col)
+			{
+				$diff = $maxColsLengths[$column] - static::strlen($col);
+				if ($diff)
+				{
+					$tableRows[$row][$column] = $tableRows[$row][$column] . str_repeat(' ', $diff);
+				}
+				$column ++;
+			}
+		}
+
+		$table = '';
+
+		// Joins columns and append the well formatted rows to the table
+		for ($row = 0; $row < $totalRows; $row ++)
+		{
+			// Set the table border-top
+			if ($row === 0)
+			{
+				$cols = '+';
+				foreach ($tableRows[$row] as $col)
+				{
+					$cols .= str_repeat('-', static::strlen($col) + 2) . '+';
+				}
+				$table .= $cols . PHP_EOL;
+			}
+
+			// Set the columns borders
+			$table .= '| ' . implode(' | ', $tableRows[$row]) . ' |' . PHP_EOL;
+
+			// Set the thead and table borders-bottom
+			if (isset($cols) && ($row === 0 && ! empty($thead) || $row + 1 === $totalRows))
+			{
+				$table .= $cols . PHP_EOL;
+			}
+		}
+
+		static::write($table);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * While the library is intended for use on CLI commands,
+	 * commands can be called from controllers and elsewhere
+	 * so we need a way to allow them to still work.
+	 *
+	 * For now, just echo the content, but look into a better
+	 * solution down the road.
+	 *
+	 * @param resource $handle
+	 * @param string   $string
+	 *
+	 * @return void
+	 */
+	protected static function fwrite($handle, string $string)
+	{
+		if (! is_cli())
+		{
+			// @codeCoverageIgnoreStart
+			echo $string;
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		fwrite($handle, $string);
+	}
+}
+
+// Ensure the class is initialized. Done outside of code coverage
+// @codeCoverageIgnoreStart
+CLI::init();
+// @codeCoverageIgnoreEnd
diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
new file mode 100644
index 0000000..e1643b6
--- /dev/null
+++ b/system/CLI/CommandRunner.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use CodeIgniter\Controller;
+use Config\Services;
+use ReflectionException;
+
+/**
+ * Command runner
+ */
+class CommandRunner extends Controller
+{
+	/**
+	 * Instance of class managing the collection of commands
+	 *
+	 * @var Commands
+	 */
+	protected $commands;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->commands = Services::commands();
+	}
+
+	/**
+	 * We map all un-routed CLI methods through this function
+	 * so we have the chance to look for a Command first.
+	 *
+	 * @param string $method
+	 * @param array  ...$params
+	 *
+	 * @return mixed
+	 * @throws ReflectionException
+	 */
+	public function _remap($method, ...$params)
+	{
+		// The first param is usually empty, so scrap it.
+		if (empty($params[0]))
+		{
+			array_shift($params);
+		}
+
+		return $this->index($params);
+	}
+
+	/**
+	 * Default command.
+	 *
+	 * @param array $params
+	 *
+	 * @return mixed
+	 * @throws ReflectionException
+	 */
+	public function index(array $params)
+	{
+		$command = array_shift($params) ?? 'list';
+
+		return $this->commands->run($command, $params);
+	}
+
+	/**
+	 * Allows access to the current commands that have been found.
+	 *
+	 * @return array
+	 */
+	public function getCommands(): array
+	{
+		return $this->commands->getCommands();
+	}
+}
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
new file mode 100644
index 0000000..cdbbed0
--- /dev/null
+++ b/system/CLI/Commands.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Log\Logger;
+use ReflectionClass;
+use ReflectionException;
+
+/**
+ * Core functionality for running, listing, etc commands.
+ */
+class Commands
+{
+	/**
+	 * The found commands.
+	 *
+	 * @var array
+	 */
+	protected $commands = [];
+
+	/**
+	 * Logger instance.
+	 *
+	 * @var Logger
+	 */
+	protected $logger;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Logger|null $logger
+	 */
+	public function __construct($logger = null)
+	{
+		$this->logger = $logger ?? service('logger');
+		$this->discoverCommands();
+	}
+
+	/**
+	 * Runs a command given
+	 *
+	 * @param string $command
+	 * @param array  $params
+	 */
+	public function run(string $command, array $params)
+	{
+		if (! $this->verifyCommand($command, $this->commands))
+		{
+			return;
+		}
+
+		// The file would have already been loaded during the
+		// createCommandList function...
+		$className = $this->commands[$command]['class'];
+		$class     = new $className($this->logger, $this);
+
+		return $class->run($params);
+	}
+
+	/**
+	 * Provide access to the list of commands.
+	 *
+	 * @return array
+	 */
+	public function getCommands()
+	{
+		return $this->commands;
+	}
+
+	/**
+	 * Discovers all commands in the framework and within user code,
+	 * and collects instances of them to work with.
+	 *
+	 * @return void
+	 */
+	public function discoverCommands()
+	{
+		if ($this->commands !== [])
+		{
+			return;
+		}
+
+		/** @var FileLocator $locator */
+		$locator = service('locator');
+		$files   = $locator->listFiles('Commands/');
+
+		// If no matching command files were found, bail
+		// This should never happen in unit testing.
+		if ($files === [])
+		{
+			return; // @codeCoverageIgnore
+		}
+
+		// Loop over each file checking to see if a command with that
+		// alias exists in the class.
+		foreach ($files as $file)
+		{
+			$className = $locator->findQualifiedNameFromPath($file);
+
+			if (empty($className) || ! class_exists($className))
+			{
+				continue;
+			}
+
+			try
+			{
+				$class = new ReflectionClass($className);
+
+				if (! $class->isInstantiable() || ! $class->isSubclassOf(BaseCommand::class))
+				{
+					continue;
+				}
+
+				/** @var BaseCommand $class */
+				$class = new $className($this->logger, $this);
+
+				if (isset($class->group))
+				{
+					$this->commands[$class->name] = [
+						'class'       => $className,
+						'file'        => $file,
+						'group'       => $class->group,
+						'description' => $class->description,
+					];
+				}
+
+				unset($class);
+			}
+			catch (ReflectionException $e)
+			{
+				$this->logger->error($e->getMessage());
+			}
+		}
+
+		asort($this->commands);
+	}
+
+	/**
+	 * Verifies if the command being sought is found
+	 * in the commands list.
+	 *
+	 * @param string $command
+	 * @param array  $commands
+	 *
+	 * @return boolean
+	 */
+	public function verifyCommand(string $command, array $commands): bool
+	{
+		if (isset($commands[$command]))
+		{
+			return true;
+		}
+
+		$message = lang('CLI.commandNotFound', [$command]);
+
+		if ($alternatives = $this->getCommandAlternatives($command, $commands))
+		{
+			if (count($alternatives) === 1)
+			{
+				$message .= "\n\n" . lang('CLI.altCommandSingular') . "\n    ";
+			}
+			else
+			{
+				$message .= "\n\n" . lang('CLI.altCommandPlural') . "\n    ";
+			}
+
+			$message .= implode("\n    ", $alternatives);
+		}
+
+		CLI::error($message);
+		CLI::newLine();
+
+		return false;
+	}
+
+	/**
+	 * Finds alternative of `$name` among collection
+	 * of commands.
+	 *
+	 * @param string $name
+	 * @param array  $collection
+	 *
+	 * @return array
+	 */
+	protected function getCommandAlternatives(string $name, array $collection): array
+	{
+		$alternatives = [];
+
+		foreach (array_keys($collection) as $commandName)
+		{
+			$lev = levenshtein($name, $commandName);
+
+			if ($lev <= strlen($commandName) / 3 || strpos($commandName, $name) !== false)
+			{
+				$alternatives[$commandName] = $lev;
+			}
+		}
+
+		ksort($alternatives, SORT_NATURAL | SORT_FLAG_CASE);
+
+		return array_keys($alternatives);
+	}
+}
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
new file mode 100644
index 0000000..711184f
--- /dev/null
+++ b/system/CLI/Console.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use Exception;
+
+/**
+ * Console
+ */
+class Console
+{
+	/**
+	 * Main CodeIgniter instance.
+	 *
+	 * @var CodeIgniter
+	 */
+	protected $app;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Console constructor.
+	 *
+	 * @param CodeIgniter $app
+	 */
+	public function __construct(CodeIgniter $app)
+	{
+		$this->app = $app;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs the current command discovered on the CLI.
+	 *
+	 * @param boolean $useSafeOutput
+	 *
+	 * @return RequestInterface|Response|ResponseInterface|mixed
+	 * @throws Exception
+	 */
+	public function run(bool $useSafeOutput = false)
+	{
+		$path = CLI::getURI() ?: 'list';
+
+		// Set the path for the application to route to.
+		$this->app->setPath("ci{$path}");
+
+		return $this->app->useSafeOutput($useSafeOutput)->run();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays basic information about the Console.
+	 *
+	 * @param boolean $suppress
+	 */
+	public function showHeader(bool $suppress = false)
+	{
+		if ($suppress)
+		{
+			return;
+		}
+
+		CLI::write(sprintf('CodeIgniter v%s Command Line Tool - Server Time: %s UTC%s', CodeIgniter::CI_VERSION, date('Y-m-d H:i:s'), date('P')), 'green');
+		CLI::newLine();
+	}
+}
diff --git a/system/CLI/Exceptions/CLIException.php b/system/CLI/Exceptions/CLIException.php
new file mode 100644
index 0000000..2a0373d
--- /dev/null
+++ b/system/CLI/Exceptions/CLIException.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use RuntimeException;
+
+/**
+ * CLIException
+ */
+class CLIException extends RuntimeException
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Thrown when `$color` specified for `$type` is not within the
+	 * allowed list of colors.
+	 *
+	 * @param string $type
+	 * @param string $color
+	 *
+	 * @return CLIException
+	 */
+	public static function forInvalidColor(string $type, string $color)
+	{
+		return new static(lang('CLI.invalidColor', [$type, $color]));
+	}
+}
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
new file mode 100644
index 0000000..d0e6bc5
--- /dev/null
+++ b/system/CLI/GeneratorTrait.php
@@ -0,0 +1,410 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use Config\Services;
+use Throwable;
+
+/**
+ * GeneratorTrait contains a collection of methods
+ * to build the commands that generates a file.
+ */
+trait GeneratorTrait
+{
+	/**
+	 * Component Name
+	 *
+	 * @var string
+	 */
+	protected $component;
+
+	/**
+	 * File directory
+	 *
+	 * @var string
+	 */
+	protected $directory;
+
+	/**
+	 * View template name
+	 *
+	 * @var string
+	 */
+	protected $template;
+
+	/**
+	 * Language string key for required class names.
+	 *
+	 * @var string
+	 */
+	protected $classNameLang = '';
+
+	/**
+	 * Whether to require class name.
+	 *
+	 * @internal
+	 *
+	 * @var boolean
+	 */
+	private $hasClassName = true;
+
+	/**
+	 * Whether to sort class imports.
+	 *
+	 * @internal
+	 *
+	 * @var boolean
+	 */
+	private $sortImports = true;
+
+	/**
+	 * Whether the `--suffix` option has any effect.
+	 *
+	 * @internal
+	 *
+	 * @var boolean
+	 */
+	private $enabledSuffixing = true;
+
+	/**
+	 * The params array for easy access by other methods.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	private $params = [];
+
+	/**
+	 * Execute the command.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	protected function execute(array $params): void
+	{
+		$this->params = $params;
+
+		if ($this->getOption('namespace') === 'CodeIgniter')
+		{
+			// @codeCoverageIgnoreStart
+			CLI::write(lang('CLI.generator.usingCINamespace'), 'yellow');
+			CLI::newLine();
+
+			if (CLI::prompt('Are you sure you want to continue?', ['y', 'n'], 'required') === 'n')
+			{
+				CLI::newLine();
+				CLI::write(lang('CLI.generator.cancelOperation'), 'yellow');
+				CLI::newLine();
+
+				return;
+			}
+
+			CLI::newLine();
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Get the fully qualified class name from the input.
+		$class = $this->qualifyClassName();
+
+		// Get the file path from class name.
+		$path = $this->buildPath($class);
+
+		// Check if path is empty.
+		if (empty($path))
+		{
+			return;
+		}
+
+		$isFile = is_file($path);
+
+		// Overwriting files unknowingly is a serious annoyance, So we'll check if
+		// we are duplicating things, If 'force' option is not supplied, we bail.
+		if (! $this->getOption('force') && $isFile)
+		{
+			CLI::error(lang('CLI.generator.fileExist', [clean_path($path)]), 'light_gray', 'red');
+			CLI::newLine();
+
+			return;
+		}
+
+		// Check if the directory to save the file is existing.
+		$dir = dirname($path);
+
+		if (! is_dir($dir))
+		{
+			mkdir($dir, 0755, true);
+		}
+
+		helper('filesystem');
+
+		// Build the class based on the details we have, We'll be getting our file
+		// contents from the template, and then we'll do the necessary replacements.
+		if (! write_file($path, $this->buildContent($class)))
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error(lang('CLI.generator.fileError', [clean_path($path)]), 'light_gray', 'red');
+			CLI::newLine();
+
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		if ($this->getOption('force') && $isFile)
+		{
+			CLI::write(lang('CLI.generator.fileOverwrite', [clean_path($path)]), 'yellow');
+			CLI::newLine();
+
+			return;
+		}
+
+		CLI::write(lang('CLI.generator.fileCreate', [clean_path($path)]), 'green');
+		CLI::newLine();
+	}
+
+	/**
+	 * Prepare options and do the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		return $this->parseTemplate($class);
+	}
+
+	/**
+	 * Change file basename before saving.
+	 *
+	 * Useful for components where the file name has a date.
+	 *
+	 * @param string $filename
+	 *
+	 * @return string
+	 */
+	protected function basename(string $filename): string
+	{
+		return basename($filename);
+	}
+
+	/**
+	 * Parses the class name and checks if it is already qualified.
+	 *
+	 * @return string
+	 */
+	protected function qualifyClassName(): string
+	{
+		// Gets the class name from input.
+		$class = $this->params[0] ?? CLI::getSegment(2);
+
+		if (is_null($class) && $this->hasClassName)
+		{
+			// @codeCoverageIgnoreStart
+			$nameLang = $this->classNameLang ?: 'CLI.generator.className.default';
+			$class    = CLI::prompt(lang($nameLang), null, 'required');
+			CLI::newLine();
+			// @codeCoverageIgnoreEnd
+		}
+
+		helper('inflector');
+
+		$component = singular($this->component);
+
+		/**
+		 * @see https://regex101.com/r/a5KNCR/1
+		 */
+		$pattern = sprintf('/([a-z][a-z0-9_\/\\\\]+)(%s)/i', $component);
+
+		if (preg_match($pattern, $class, $matches) === 1)
+		{
+			$class = $matches[1] . ucfirst($matches[2]);
+		}
+
+		if ($this->enabledSuffixing && $this->getOption('suffix') && ! strripos($class, $component))
+		{
+			$class .= ucfirst($component);
+		}
+
+		// Trims input, normalize separators, and ensure that all paths are in Pascalcase.
+		$class = ltrim(implode('\\', array_map('pascalize', explode('\\', str_replace('/', '\\', trim($class))))), '\\/');
+
+		// Gets the namespace from input.
+		$namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
+
+		if (strncmp($class, $namespace, strlen($namespace)) === 0)
+		{
+			return $class; // @codeCoverageIgnore
+		}
+
+		return $namespace . '\\' . $this->directory . '\\' . str_replace('/', '\\', $class);
+	}
+
+	/**
+	 * Gets the generator view as defined in the `Config\Generators::$views`,
+	 * with fallback to `$template` when the defined view does not exist.
+	 *
+	 * @param array $data Data to be passed to the view.
+	 *
+	 * @return string
+	 */
+	protected function renderTemplate(array $data = []): string
+	{
+		try
+		{
+			return view(config('Generators')->views[$this->name], $data, ['debug' => false]);
+		}
+		catch (Throwable $e)
+		{
+			log_message('error', $e->getMessage());
+
+			return view("CodeIgniter\Commands\Generators\Views\\{$this->template}", $data, ['debug' => false]);
+		}
+	}
+
+	/**
+	 * Performs pseudo-variables contained within view file.
+	 *
+	 * @param string $class
+	 * @param array  $search
+	 * @param array  $replace
+	 * @param array  $data
+	 *
+	 * @return string
+	 */
+	protected function parseTemplate(string $class, array $search = [], array $replace = [], array $data = []): string
+	{
+		// Retrieves the namespace part from the fully qualified class name.
+		$namespace = trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\');
+		$search[]  = '<@php';
+		$search[]  = '{namespace}';
+		$search[]  = '{class}';
+		$replace[] = '<?php';
+		$replace[] = $namespace;
+		$replace[] = str_replace($namespace . '\\', '', $class);
+
+		return str_replace($search, $replace, $this->renderTemplate($data));
+	}
+
+	/**
+	 * Builds the contents for class being generated, doing all
+	 * the replacements necessary, and alphabetically sorts the
+	 * imports for a given template.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function buildContent(string $class): string
+	{
+		$template = $this->prepare($class);
+
+		if ($this->sortImports && preg_match('/(?P<imports>(?:^use [^;]+;$\n?)+)/m', $template, $match))
+		{
+			$imports = explode("\n", trim($match['imports']));
+			sort($imports);
+
+			return str_replace(trim($match['imports']), implode("\n", $imports), $template);
+		}
+
+		return $template;
+	}
+
+	/**
+	 * Builds the file path from the class name.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function buildPath(string $class): string
+	{
+		$namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
+
+		// Check if the namespace is actually defined and we are not just typing gibberish.
+		$base = Services::autoloader()->getNamespace($namespace);
+
+		if (! $base = reset($base))
+		{
+			CLI::error(lang('CLI.namespaceNotDefined', [$namespace]), 'light_gray', 'red');
+			CLI::newLine();
+
+			return '';
+		}
+
+		$base = realpath($base) ?: $base;
+		$file = $base . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, trim(str_replace($namespace . '\\', '', $class), '\\')) . '.php';
+
+		return implode(DIRECTORY_SEPARATOR, array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, -1)) . DIRECTORY_SEPARATOR . $this->basename($file);
+	}
+
+	/**
+	 * Allows child generators to modify the internal `$hasClassName` flag.
+	 *
+	 * @param boolean $hasClassName
+	 *
+	 * @return $this
+	 */
+	protected function setHasClassName(bool $hasClassName)
+	{
+		$this->hasClassName = $hasClassName;
+
+		return $this;
+	}
+
+	/**
+	 * Allows child generators to modify the internal `$sortImports` flag.
+	 *
+	 * @param boolean $sortImports
+	 *
+	 * @return $this
+	 */
+	protected function setSortImports(bool $sortImports)
+	{
+		$this->sortImports = $sortImports;
+
+		return $this;
+	}
+
+	/**
+	 * Allows child generators to modify the internal `$enabledSuffixing` flag.
+	 *
+	 * @param boolean $enabledSuffixing
+	 *
+	 * @return $this
+	 */
+	protected function setEnabledSuffixing(bool $enabledSuffixing)
+	{
+		$this->enabledSuffixing = $enabledSuffixing;
+
+		return $this;
+	}
+
+	/**
+	 * Gets a single command-line option. Returns TRUE if the option exists,
+	 * but doesn't have a value, and is simply acting as a flag.
+	 *
+	 * @param string $name
+	 *
+	 * @return mixed
+	 */
+	protected function getOption(string $name)
+	{
+		if (! array_key_exists($name, $this->params))
+		{
+			return CLI::getOption($name);
+		}
+
+		return is_null($this->params[$name]) ? true : $this->params[$name];
+	}
+}
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
new file mode 100644
index 0000000..e779613
--- /dev/null
+++ b/system/Cache/CacheFactory.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache;
+
+use CodeIgniter\Cache\Exceptions\CacheException;
+use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+
+/**
+ * Class Cache
+ *
+ * A factory for loading the desired
+ */
+class CacheFactory
+{
+	/**
+	 * Attempts to create the desired cache handler, based upon the
+	 *
+	 * @param Cache       $config
+	 * @param string|null $handler
+	 * @param string|null $backup
+	 *
+	 * @return CacheInterface
+	 */
+	public static function getHandler(Cache $config, string $handler = null, string $backup = null)
+	{
+		if (! isset($config->validHandlers) || ! is_array($config->validHandlers))
+		{
+			throw CacheException::forInvalidHandlers();
+		}
+
+		if (! isset($config->handler) || ! isset($config->backupHandler))
+		{
+			throw CacheException::forNoBackup();
+		}
+
+		$handler = ! empty($handler) ? $handler : $config->handler;
+		$backup  = ! empty($backup) ? $backup : $config->backupHandler;
+
+		if (! array_key_exists($handler, $config->validHandlers) || ! array_key_exists($backup, $config->validHandlers))
+		{
+			throw CacheException::forHandlerNotFound();
+		}
+
+		// Get an instance of our handler.
+		$adapter = new $config->validHandlers[$handler]($config);
+
+		if (! $adapter->isSupported())
+		{
+			$adapter = new $config->validHandlers[$backup]($config);
+
+			if (! $adapter->isSupported())
+			{
+				// Log stuff here, don't throw exception. No need to raise a fuss.
+				// Fall back to the dummy adapter.
+				$adapter = new $config->validHandlers['dummy']();
+			}
+		}
+
+		// If $adapter->initialization throws a CriticalError exception, we will attempt to
+		// use the $backup handler, if that also fails, we resort to the dummy handler.
+		try
+		{
+			$adapter->initialize();
+		}
+		catch (CriticalError $e)
+		{
+			// log the fact that an exception occurred as well what handler we are resorting to
+			log_message('critical', $e->getMessage() . ' Resorting to using ' . $backup . ' handler.');
+
+			// get the next best cache handler (or dummy if the $backup also fails)
+			$adapter = self::getHandler($config, $backup, 'dummy');
+		}
+
+		return $adapter;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Cache/CacheInterface.php b/system/Cache/CacheInterface.php
new file mode 100644
index 0000000..8a929fa
--- /dev/null
+++ b/system/Cache/CacheInterface.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache;
+
+/**
+ * Cache interface
+ */
+interface CacheInterface
+{
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return mixed
+	 */
+	public function increment(string $key, int $offset = 1);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return mixed
+	 */
+	public function decrement(string $key, int $offset = 1);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return mixed
+	 */
+	public function getCacheInfo();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|false|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 *   Some handlers may return false when an item does not exist, which is deprecated.
+	 */
+	public function getMetaData(string $key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php
new file mode 100644
index 0000000..9020e0f
--- /dev/null
+++ b/system/Cache/Exceptions/CacheException.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
+
+/**
+ * CacheException
+ */
+class CacheException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Thrown when handler has no permission to write cache.
+	 *
+	 * @param string $path
+	 *
+	 * @return CacheException
+	 */
+	public static function forUnableToWrite(string $path)
+	{
+		return new static(lang('Cache.unableToWrite', [$path]));
+	}
+
+	/**
+	 * Thrown when an unrecognized handler is used.
+	 *
+	 * @return CacheException
+	 */
+	public static function forInvalidHandlers()
+	{
+		return new static(lang('Cache.invalidHandlers'));
+	}
+
+	/**
+	 * Thrown when no backup handler is setup in config.
+	 *
+	 * @return CacheException
+	 */
+	public static function forNoBackup()
+	{
+		return new static(lang('Cache.noBackup'));
+	}
+
+	/**
+	 * Thrown when specified handler was not found.
+	 *
+	 * @return CacheException
+	 */
+	public static function forHandlerNotFound()
+	{
+		return new static(lang('Cache.handlerNotFound'));
+	}
+}
diff --git a/system/Cache/Exceptions/ExceptionInterface.php b/system/Cache/Exceptions/ExceptionInterface.php
new file mode 100644
index 0000000..3713011
--- /dev/null
+++ b/system/Cache/Exceptions/ExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Exceptions;
+
+/**
+ * Provides a domain-level interface for broad capture
+ * of all framework-related exceptions.
+ *
+ * catch (\CodeIgniter\Cache\Exceptions\ExceptionInterface) { ... }
+ *
+ * @deprecated 4.1.2
+ */
+interface ExceptionInterface
+{
+}
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
new file mode 100644
index 0000000..a5de428
--- /dev/null
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use Closure;
+use CodeIgniter\Cache\CacheInterface;
+use Exception;
+use InvalidArgumentException;
+
+/**
+ * Base class for cache handling
+ */
+abstract class BaseHandler implements CacheInterface
+{
+	/**
+	 * Reserved characters that cannot be used in a key or tag.
+	 * From https://github.com/symfony/cache-contracts/blob/c0446463729b89dd4fa62e9aeecc80287323615d/ItemInterface.php#L43
+	 */
+	public const RESERVED_CHARACTERS = '{}()/\@:';
+
+	/**
+	 * Maximum key length.
+	 */
+	public const MAX_KEY_LENGTH = PHP_INT_MAX;
+
+	/**
+	 * Prefix to apply to cache keys.
+	 * May not be used by all handlers.
+	 *
+	 * @var string
+	 */
+	protected $prefix;
+
+	/**
+	 * Validates a cache key according to PSR-6.
+	 * Keys that exceed MAX_KEY_LENGTH are hashed.
+	 * From https://github.com/symfony/cache/blob/7b024c6726af21fd4984ac8d1eae2b9f3d90de88/CacheItem.php#L158
+	 *
+	 * @param string $key    The key to validate
+	 * @param string $prefix Optional prefix to include in length calculations
+	 *
+	 * @throws InvalidArgumentException When $key is not valid
+	 */
+	public static function validateKey($key, $prefix = ''): string
+	{
+		if (! is_string($key))
+		{
+			throw new InvalidArgumentException('Cache key must be a string');
+		}
+		if ($key === '')
+		{
+			throw new InvalidArgumentException('Cache key cannot be empty.');
+		}
+		if (strpbrk($key, self::RESERVED_CHARACTERS) !== false)
+		{
+			throw new InvalidArgumentException('Cache key contains reserved characters ' . self::RESERVED_CHARACTERS);
+		}
+
+		// If the key with prefix exceeds the length then return the hashed version
+		return strlen($prefix . $key) > static::MAX_KEY_LENGTH ? $prefix . md5($key) : $prefix . $key;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get an item from the cache, or execute the given Closure and store the result.
+	 *
+	 * @param string  $key      Cache item name
+	 * @param integer $ttl      Time to live
+	 * @param Closure $callback Callback return value
+	 *
+	 * @return mixed
+	 */
+	public function remember(string $key, int $ttl, Closure $callback)
+	{
+		$value = $this->get($key);
+
+		if (! is_null($value))
+		{
+			return $value;
+		}
+
+		$this->save($key, $value = $callback(), $ttl);
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @throws Exception
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		throw new Exception('The deleteMatching method is not implemented.');
+	}
+}
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
new file mode 100644
index 0000000..1a0f414
--- /dev/null
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use Closure;
+
+/**
+ * Dummy cache handler
+ */
+class DummyHandler extends BaseHandler
+{
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return null
+	 */
+	public function get(string $key)
+	{
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get an item from the cache, or execute the given Closure and store the result.
+	 *
+	 * @param string  $key      Cache item name
+	 * @param integer $ttl      Time to live
+	 * @param Closure $callback Callback return value
+	 *
+	 * @return null
+	 */
+	public function remember(string $key, int $ttl, Closure $callback)
+	{
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60)
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key)
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @return integer The number of deleted items
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		return 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return boolean
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return boolean
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean()
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return null
+	 */
+	public function getCacheInfo()
+	{
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return null
+	 */
+	public function getMetaData(string $key)
+	{
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return true;
+	}
+}
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
new file mode 100644
index 0000000..c67b218
--- /dev/null
+++ b/system/Cache/Handlers/FileHandler.php
@@ -0,0 +1,548 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use CodeIgniter\Cache\Exceptions\CacheException;
+use Config\Cache;
+use Throwable;
+
+/**
+ * File system cache handler
+ */
+class FileHandler extends BaseHandler
+{
+	/**
+	 * Maximum key length.
+	 */
+	public const MAX_KEY_LENGTH = 255;
+
+	/**
+	 * Where to store cached files on the disk.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * Mode for the stored files.
+	 * Must be chmod-safe (octal).
+	 *
+	 * @var integer
+	 *
+	 * @see https://www.php.net/manual/en/function.chmod.php
+	 */
+	protected $mode;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param  Cache $config
+	 * @throws CacheException
+	 */
+	public function __construct(Cache $config)
+	{
+		if (! property_exists($config, 'file'))
+		{
+			$config->file = [
+				'storePath' => $config->storePath ?? WRITEPATH . 'cache',
+				'mode'      => 0640,
+			];
+		}
+
+		$this->path = ! empty($config->file['storePath']) ? $config->file['storePath'] : WRITEPATH . 'cache';
+		$this->path = rtrim($this->path, '/') . '/';
+
+		if (! is_really_writable($this->path))
+		{
+			throw CacheException::forUnableToWrite($this->path);
+		}
+
+		$this->mode   = $config->file['mode'] ?? 0640;
+		$this->prefix = $config->prefix;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key)
+	{
+		$key  = static::validateKey($key, $this->prefix);
+		$data = $this->getItem($key);
+
+		return is_array($data) ? $data['data'] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		$contents = [
+			'time' => time(),
+			'ttl'  => $ttl,
+			'data' => $value,
+		];
+
+		if ($this->writeFile($this->path . $key, serialize($contents)))
+		{
+			try
+			{
+				chmod($this->path . $key, $this->mode);
+			}
+			// @codeCoverageIgnoreStart
+			catch (Throwable $e)
+			{
+				log_message('debug', 'Failed to set mode on cache file: ' . $e->getMessage());
+			}
+			// @codeCoverageIgnoreEnd
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return is_file($this->path . $key) && unlink($this->path . $key);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @return integer The number of deleted items
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		$deleted = 0;
+
+		foreach (glob($this->path . $pattern, GLOB_NOSORT) as $filename)
+		{
+			if (is_file($filename) && @unlink($filename))
+			{
+				$deleted++;
+			}
+		}
+
+		return $deleted;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return boolean
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		$key  = static::validateKey($key, $this->prefix);
+		$data = $this->getItem($key);
+
+		if ($data === false)
+		{
+			$data = [
+				'data' => 0,
+				'ttl'  => 60,
+			];
+		}
+		elseif (! is_int($data['data']))
+		{
+			return false;
+		}
+
+		$newValue = $data['data'] + $offset;
+
+		return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return boolean
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		$key  = static::validateKey($key, $this->prefix);
+		$data = $this->getItem($key);
+
+		if ($data === false)
+		{
+			$data = [
+				'data' => 0,
+				'ttl'  => 60,
+			];
+		}
+		elseif (! is_int($data['data']))
+		{
+			return false;
+		}
+
+		$newValue = $data['data'] - $offset;
+
+		return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean()
+	{
+		return $this->deleteFiles($this->path, false, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return array|false
+	 */
+	public function getCacheInfo()
+	{
+		return $this->getDirFileInfo($this->path);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|false|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 *   Some handlers may return false when an item does not exist, which is deprecated.
+	 */
+	public function getMetaData(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		if (false === $data = $this->getItem($key))
+		{
+			return false; // This will return null in a future release
+		}
+
+		return [
+			'expire' => $data['time'] + $data['ttl'],
+			'mtime'  => filemtime($this->path . $key),
+			'data'   => $data['data'],
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return is_writable($this->path);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the heavy lifting of actually retrieving the file and
+	 * verifying it's age.
+	 *
+	 * @param string $filename
+	 *
+	 * @return boolean|mixed
+	 */
+	protected function getItem(string $filename)
+	{
+		if (! is_file($this->path . $filename))
+		{
+			return false;
+		}
+
+		$data = @unserialize(file_get_contents($this->path . $filename));
+		if (! is_array($data) || ! isset($data['ttl']))
+		{
+			return false;
+		}
+
+		// @phpstan-ignore-next-line
+		if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl'])
+		{
+			// If the file is still there then try to remove it
+			if (is_file($this->path . $filename))
+			{
+				@unlink($this->path . $filename);
+			}
+
+			return false;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// SUPPORT METHODS FOR FILES
+	//--------------------------------------------------------------------
+
+	/**
+	 * Writes a file to disk, or returns false if not successful.
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @param string $mode
+	 *
+	 * @return boolean
+	 */
+	protected function writeFile($path, $data, $mode = 'wb')
+	{
+		if (($fp = @fopen($path, $mode)) === false)
+		{
+			return false;
+		}
+
+		flock($fp, LOCK_EX);
+
+		for ($result = $written = 0, $length = strlen($data); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($fp, substr($data, $written))) === false)
+			{
+				break;
+			}
+		}
+
+		flock($fp, LOCK_UN);
+		fclose($fp);
+
+		return is_int($result);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Delete Files
+	 *
+	 * Deletes all files contained in the supplied directory path.
+	 * Files must be writable or owned by the system in order to be deleted.
+	 * If the second parameter is set to TRUE, any directories contained
+	 * within the supplied base directory will be nuked as well.
+	 *
+	 * @param string  $path   File path
+	 * @param boolean $delDir Whether to delete any directories found in the path
+	 * @param boolean $htdocs Whether to skip deleting .htaccess and index page files
+	 * @param integer $_level Current directory depth level (default: 0; internal use only)
+	 *
+	 * @return boolean
+	 */
+	protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs = false, int $_level = 0): bool
+	{
+		// Trim the trailing slash
+		$path = rtrim($path, '/\\');
+
+		if (! $currentDir = @opendir($path))
+		{
+			return false;
+		}
+
+		while (false !== ($filename = @readdir($currentDir)))
+		{
+			if ($filename !== '.' && $filename !== '..')
+			{
+				if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.')
+				{
+					$this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
+				}
+				elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
+				{
+					@unlink($path . DIRECTORY_SEPARATOR . $filename);
+				}
+			}
+		}
+
+		closedir($currentDir);
+
+		return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Directory File Information
+	 *
+	 * Reads the specified directory and builds an array containing the filenames,
+	 * filesize, dates, and permissions
+	 *
+	 * Any sub-folders contained within the specified path are read as well.
+	 *
+	 * @param string  $sourceDir    Path to source
+	 * @param boolean $topLevelOnly Look only at the top level directory specified?
+	 * @param boolean $_recursion   Internal variable to determine recursion status - do not use in calls
+	 *
+	 * @return array|false
+	 */
+	protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true, bool $_recursion = false)
+	{
+		static $_filedata = [];
+		$relativePath     = $sourceDir;
+
+		if ($fp = @opendir($sourceDir))
+		{
+			// reset the array and make sure $source_dir has a trailing slash on the initial call
+			if ($_recursion === false)
+			{
+				$_filedata = [];
+				$sourceDir = rtrim(realpath($sourceDir) ?: $sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+			}
+
+			// Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
+			while (false !== ($file = readdir($fp)))
+			{
+				if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false)
+				{
+					$this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
+				}
+				elseif ($file[0] !== '.')
+				{
+					$_filedata[$file]                  = $this->getFileInfo($sourceDir . $file);
+					$_filedata[$file]['relative_path'] = $relativePath;
+				}
+			}
+
+			closedir($fp);
+
+			return $_filedata;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get File Info
+	 *
+	 * Given a file and path, returns the name, path, size, date modified
+	 * Second parameter allows you to explicitly declare what information you want returned
+	 * Options are: name, server_path, size, date, readable, writable, executable, fileperms
+	 * Returns FALSE if the file cannot be found.
+	 *
+	 * @param string $file           Path to file
+	 * @param mixed  $returnedValues Array or comma separated string of information returned
+	 *
+	 * @return array|false
+	 */
+	protected function getFileInfo(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
+	{
+		if (! is_file($file))
+		{
+			return false;
+		}
+
+		if (is_string($returnedValues))
+		{
+			$returnedValues = explode(',', $returnedValues);
+		}
+
+		$fileInfo = [];
+
+		foreach ($returnedValues as $key)
+		{
+			switch ($key)
+			{
+				case 'name':
+					$fileInfo['name'] = basename($file);
+					break;
+				case 'server_path':
+					$fileInfo['server_path'] = $file;
+					break;
+				case 'size':
+					$fileInfo['size'] = filesize($file);
+					break;
+				case 'date':
+					$fileInfo['date'] = filemtime($file);
+					break;
+				case 'readable':
+					$fileInfo['readable'] = is_readable($file);
+					break;
+				case 'writable':
+					$fileInfo['writable'] = is_writable($file);
+					break;
+				case 'executable':
+					$fileInfo['executable'] = is_executable($file);
+					break;
+				case 'fileperms':
+					$fileInfo['fileperms'] = fileperms($file);
+					break;
+			}
+		}
+
+		return $fileInfo;
+	}
+}
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
new file mode 100644
index 0000000..e6a0ce2
--- /dev/null
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -0,0 +1,377 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+use Exception;
+use Memcache;
+use Memcached;
+
+/**
+ * Mamcached cache handler
+ */
+class MemcachedHandler extends BaseHandler
+{
+	/**
+	 * The memcached object
+	 *
+	 * @var Memcached|Memcache
+	 */
+	protected $memcached;
+
+	/**
+	 * Memcached Configuration
+	 *
+	 * @var array
+	 */
+	protected $config = [
+		'host'   => '127.0.0.1',
+		'port'   => 11211,
+		'weight' => 1,
+		'raw'    => false,
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Cache $config
+	 */
+	public function __construct(Cache $config)
+	{
+		$this->prefix = $config->prefix;
+
+		if (! empty($config))
+		{
+			$this->config = array_merge($this->config, $config->memcached);
+		}
+	}
+
+	/**
+	 * Class destructor
+	 *
+	 * Closes the connection to Memcache(d) if present.
+	 */
+	public function __destruct()
+	{
+		if ($this->memcached instanceof Memcached)
+		{
+			$this->memcached->quit();
+		}
+		elseif ($this->memcached instanceof Memcache)
+		{
+			$this->memcached->close();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+		// Try to connect to Memcache or Memcached, if an issue occurs throw a CriticalError exception,
+		// so that the CacheFactory can attempt to initiate the next cache handler.
+		try
+		{
+			if (class_exists(Memcached::class))
+			{
+				// Create new instance of Memcached
+				$this->memcached = new Memcached();
+				if ($this->config['raw'])
+				{
+					$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
+				}
+
+				// Add server
+				$this->memcached->addServer(
+					$this->config['host'], $this->config['port'], $this->config['weight']
+				);
+
+				// attempt to get status of servers
+				$stats = $this->memcached->getStats();
+
+				// $stats should be an associate array with a key in the format of host:port.
+				// If it doesn't have the key, we know the server is not working as expected.
+				if (! isset($stats[$this->config['host'] . ':' . $this->config['port']]))
+				{
+					throw new CriticalError('Cache: Memcached connection failed.');
+				}
+			}
+			elseif (class_exists(Memcache::class))
+			{
+				// Create new instance of Memcache
+				$this->memcached = new Memcache();
+
+				// Check if we can connect to the server
+				$canConnect = $this->memcached->connect(
+					$this->config['host'], $this->config['port']
+				);
+
+				// If we can't connect, throw a CriticalError exception
+				if ($canConnect === false)
+				{
+					throw new CriticalError('Cache: Memcache connection failed.');
+				}
+
+				// Add server, third parameter is persistence and defaults to TRUE.
+				$this->memcached->addServer(
+					$this->config['host'], $this->config['port'], true, $this->config['weight']
+				);
+			}
+			else
+			{
+				throw new CriticalError('Cache: Not support Memcache(d) extension.');
+			}
+		}
+		catch (CriticalError $e)
+		{
+			// If a CriticalError exception occurs, throw it up.
+			throw $e;
+		}
+		catch (Exception $e)
+		{
+			// If an \Exception occurs, convert it into a CriticalError exception and throw it.
+			throw new CriticalError('Cache: Memcache(d) connection refused (' . $e->getMessage() . ').');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		if ($this->memcached instanceof Memcached)
+		{
+			$data = $this->memcached->get($key);
+
+			// check for unmatched key
+			if ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND)
+			{
+				return null;
+			}
+		}
+		elseif ($this->memcached instanceof Memcache)
+		{
+			$flags = false;
+			$data  = $this->memcached->get($key, $flags); // @phpstan-ignore-line
+
+			// check for unmatched key (i.e. $flags is untouched)
+			if ($flags === false)
+			{
+				return null;
+			}
+		}
+
+		return is_array($data) ? $data[0] : $data; // @phpstan-ignore-line
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		if (! $this->config['raw'])
+		{
+			$value = [
+				$value,
+				time(),
+				$ttl,
+			];
+		}
+
+		if ($this->memcached instanceof Memcached)
+		{
+			return $this->memcached->set($key, $value, $ttl);
+		}
+
+		if ($this->memcached instanceof Memcache)
+		{
+			return $this->memcached->set($key, $value, 0, $ttl);
+		}
+
+		// @phpstan-ignore-next-line
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return $this->memcached->delete($key);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @throws Exception
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		throw new Exception('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer|false
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		if (! $this->config['raw'])
+		{
+			return false;
+		}
+
+		$key = static::validateKey($key, $this->prefix);
+
+		// @phpstan-ignore-next-line
+		return $this->memcached->increment($key, $offset, $offset, 60);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer|false
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		if (! $this->config['raw'])
+		{
+			return false;
+		}
+
+		$key = static::validateKey($key, $this->prefix);
+
+		//FIXME: third parameter isn't other handler actions.
+		// @phpstan-ignore-next-line
+		return $this->memcached->decrement($key, $offset, $offset, 60);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean()
+	{
+		return $this->memcached->flush();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return array|false
+	 */
+	public function getCacheInfo()
+	{
+		return $this->memcached->getStats();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|false|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 *   Some handlers may return false when an item does not exist, which is deprecated.
+	 */
+	public function getMetaData(string $key)
+	{
+		$key    = static::validateKey($key, $this->prefix);
+		$stored = $this->memcached->get($key);
+
+		// if not an array, don't try to count for PHP7.2
+		if (! is_array($stored) || count($stored) !== 3)
+		{
+			return false; // This will return null in a future release
+		}
+
+		[$data, $time, $limit] = $stored;
+
+		// Calculate the remaining time to live from the original limit
+		$ttl = time() - $time - $limit;
+
+		return [
+			'expire' => $limit > 0 ? $time + $limit : null,
+			'mtime'  => $time,
+			'data'   => $data,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return extension_loaded('memcached') || extension_loaded('memcache');
+	}
+}
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
new file mode 100644
index 0000000..1892e81
--- /dev/null
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -0,0 +1,311 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+use Exception;
+use Predis\Client;
+use Predis\Collection\Iterator\Keyspace;
+
+/**
+ * Predis cache handler
+ */
+class PredisHandler extends BaseHandler
+{
+	/**
+	 * Default config
+	 *
+	 * @var array
+	 */
+	protected $config = [
+		'scheme'   => 'tcp',
+		'host'     => '127.0.0.1',
+		'password' => null,
+		'port'     => 6379,
+		'timeout'  => 0,
+	];
+
+	/**
+	 * Predis connection
+	 *
+	 * @var Client
+	 */
+	protected $redis;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Cache $config
+	 */
+	public function __construct(Cache $config)
+	{
+		$this->prefix = $config->prefix;
+
+		if (isset($config->redis))
+		{
+			$this->config = array_merge($this->config, $config->redis);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+		// Try to connect to Redis, if an issue occurs throw a CriticalError exception,
+		// so that the CacheFactory can attempt to initiate the next cache handler.
+		try
+		{
+			// Create a new instance of Predis\Client
+			$this->redis = new Client($this->config, ['prefix' => $this->prefix]);
+
+			// Check if the connection is valid by trying to get the time.
+			$this->redis->time();
+		}
+		catch (Exception $e)
+		{
+			// thrown if can't connect to redis server.
+			throw new CriticalError('Cache: Predis connection refused (' . $e->getMessage() . ').');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key)
+	{
+		$key = static::validateKey($key);
+
+		$data = array_combine([
+			'__ci_type',
+			'__ci_value',
+		],
+			$this->redis->hmget($key, ['__ci_type', '__ci_value'])
+		);
+
+		if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false)
+		{
+			return null;
+		}
+
+		switch ($data['__ci_type'])
+		{
+			case 'array':
+			case 'object':
+				return unserialize($data['__ci_value']);
+			case 'boolean':
+			case 'integer':
+			case 'double': // Yes, 'double' is returned and NOT 'float'
+			case 'string':
+			case 'NULL':
+				return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
+			case 'resource':
+			default:
+				return null;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60)
+	{
+		$key = static::validateKey($key);
+
+		switch ($dataType = gettype($value))
+		{
+			case 'array':
+			case 'object':
+				$value = serialize($value);
+				break;
+			case 'boolean':
+			case 'integer':
+			case 'double': // Yes, 'double' is returned and NOT 'float'
+			case 'string':
+			case 'NULL':
+				break;
+			case 'resource':
+			default:
+				return false;
+		}
+
+		if (! $this->redis->hmset($key, ['__ci_type' => $dataType, '__ci_value' => $value]))
+		{
+			return false;
+		}
+
+		$this->redis->expireat($key, time() + $ttl);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key)
+	{
+		$key = static::validateKey($key);
+
+		return $this->redis->del($key) === 1;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @return integer The number of deleted items
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		$matchedKeys = [];
+
+		foreach (new Keyspace($this->redis, $pattern) as $key)
+		{
+			$matchedKeys[] = $key;
+		}
+
+		return $this->redis->del($matchedKeys);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key);
+
+		return $this->redis->hincrby($key, 'data', $offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key);
+
+		return $this->redis->hincrby($key, 'data', -$offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean()
+	{
+		return $this->redis->flushdb()->getPayload() === 'OK';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return array
+	 */
+	public function getCacheInfo()
+	{
+		return $this->redis->info();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|false|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 */
+	public function getMetaData(string $key)
+	{
+		$key = static::validateKey($key);
+
+		$data = array_combine(['__ci_value'], $this->redis->hmget($key, ['__ci_value']));
+
+		if (isset($data['__ci_value']) && $data['__ci_value'] !== false)
+		{
+			$time = time();
+			$ttl  = $this->redis->ttl($key);
+
+			return [
+				'expire' => $ttl > 0 ? time() + $ttl : null,
+				'mtime'  => $time,
+				'data'   => $data['__ci_value'],
+			];
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return class_exists('\Predis\Client');
+	}
+}
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
new file mode 100644
index 0000000..f8c1387
--- /dev/null
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -0,0 +1,352 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+use Redis;
+use RedisException;
+
+/**
+ * Redis cache handler
+ */
+class RedisHandler extends BaseHandler
+{
+	/**
+	 * Default config
+	 *
+	 * @var array
+	 */
+	protected $config = [
+		'host'     => '127.0.0.1',
+		'password' => null,
+		'port'     => 6379,
+		'timeout'  => 0,
+		'database' => 0,
+	];
+
+	/**
+	 * Redis connection
+	 *
+	 * @var Redis
+	 */
+	protected $redis;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Cache $config
+	 */
+	public function __construct(Cache $config)
+	{
+		$this->prefix = $config->prefix;
+
+		if (! empty($config))
+		{
+			$this->config = array_merge($this->config, $config->redis);
+		}
+	}
+
+	/**
+	 * Class destructor
+	 *
+	 * Closes the connection to Redis if present.
+	 */
+	public function __destruct()
+	{
+		if (isset($this->redis))
+		{
+			$this->redis->close();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+		$config = $this->config;
+
+		$this->redis = new Redis();
+
+		// Try to connect to Redis, if an issue occurs throw a CriticalError exception,
+		// so that the CacheFactory can attempt to initiate the next cache handler.
+		try
+		{
+			// Note:: If Redis is your primary cache choice, and it is "offline", every page load will end up been delayed by the timeout duration.
+			// I feel like some sort of temporary flag should be set, to indicate that we think Redis is "offline", allowing us to bypass the timeout for a set period of time.
+
+			if (! $this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout']))
+			{
+				// Note:: I'm unsure if log_message() is necessary, however I'm not 100% comfortable removing it.
+				log_message('error', 'Cache: Redis connection failed. Check your configuration.');
+				throw new CriticalError('Cache: Redis connection failed. Check your configuration.');
+			}
+
+			if (isset($config['password']) && ! $this->redis->auth($config['password']))
+			{
+				log_message('error', 'Cache: Redis authentication failed.');
+				throw new CriticalError('Cache: Redis authentication failed.');
+			}
+
+			if (isset($config['database']) && ! $this->redis->select($config['database']))
+			{
+				log_message('error', 'Cache: Redis select database failed.');
+				throw new CriticalError('Cache: Redis select database failed.');
+			}
+		}
+		catch (RedisException $e)
+		{
+			// $this->redis->connect() can sometimes throw a RedisException.
+			// We need to convert the exception into a CriticalError exception and throw it.
+			throw new CriticalError('Cache: RedisException occurred with message (' . $e->getMessage() . ').');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key)
+	{
+		$key  = static::validateKey($key, $this->prefix);
+		$data = $this->redis->hMGet($key, ['__ci_type', '__ci_value']);
+
+		if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false)
+		{
+			return null;
+		}
+
+		switch ($data['__ci_type'])
+		{
+			case 'array':
+			case 'object':
+				return unserialize($data['__ci_value']);
+			case 'boolean':
+			case 'integer':
+			case 'double': // Yes, 'double' is returned and NOT 'float'
+			case 'string':
+			case 'NULL':
+				return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
+			case 'resource':
+			default:
+				return null;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		switch ($dataType = gettype($value))
+		{
+			case 'array':
+			case 'object':
+				$value = serialize($value);
+				break;
+			case 'boolean':
+			case 'integer':
+			case 'double': // Yes, 'double' is returned and NOT 'float'
+			case 'string':
+			case 'NULL':
+				break;
+			case 'resource':
+			default:
+				return false;
+		}
+
+		if (! $this->redis->hMSet($key, ['__ci_type' => $dataType, '__ci_value' => $value]))
+		{
+			return false;
+		}
+
+		if ($ttl)
+		{
+			$this->redis->expireAt($key, time() + $ttl);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return $this->redis->del($key) === 1;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @return integer The number of deleted items
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		$matchedKeys = [];
+		$iterator    = null;
+
+		do
+		{
+			// Scan for some keys
+			$keys = $this->redis->scan($iterator, $pattern);
+
+			// Redis may return empty results, so protect against that
+			if ($keys !== false)
+			{
+				foreach ($keys as $key)
+				{
+					$matchedKeys[] = $key;
+				}
+			}
+		}
+		while ($iterator > 0);
+
+		return $this->redis->del($matchedKeys);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return $this->redis->hIncrBy($key, 'data', $offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return $this->redis->hIncrBy($key, 'data', -$offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean()
+	{
+		return $this->redis->flushDB();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return array
+	 */
+	public function getCacheInfo()
+	{
+		return $this->redis->info();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 */
+	public function getMetaData(string $key)
+	{
+		$key   = static::validateKey($key, $this->prefix);
+		$value = $this->get($key);
+
+		if ($value !== null)
+		{
+			$time = time();
+			$ttl  = $this->redis->ttl($key);
+
+			return [
+				'expire' => $ttl > 0 ? time() + $ttl : null,
+				'mtime'  => $time,
+				'data'   => $value,
+			];
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return extension_loaded('redis');
+	}
+}
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
new file mode 100644
index 0000000..daf041a
--- /dev/null
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use Config\Cache;
+use Exception;
+
+/**
+ * Cache handler for WinCache from Microsoft & IIS.
+ *
+ * @codeCoverageIgnore
+ */
+class WincacheHandler extends BaseHandler
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param Cache $config
+	 */
+	public function __construct(Cache $config)
+	{
+		$this->prefix = $config->prefix;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key)
+	{
+		$key     = static::validateKey($key, $this->prefix);
+		$success = false;
+
+		$data = wincache_ucache_get($key, $success);
+
+		// Success returned by reference from wincache_ucache_get()
+		return $success ? $data : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value The data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function save(string $key, $value, int $ttl = 60)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return wincache_ucache_set($key, $value, $ttl);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function delete(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return wincache_ucache_delete($key);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @throws Exception
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		throw new Exception('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer|false
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return wincache_ucache_inc($key, $offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return integer|false
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return wincache_ucache_dec($key, $offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean Success or failure
+	 */
+	public function clean()
+	{
+		return wincache_ucache_clear();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return array|false
+	 */
+	public function getCacheInfo()
+	{
+		return wincache_ucache_info(true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|false|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 *   Some handlers may return false when an item does not exist, which is deprecated.
+	 */
+	public function getMetaData(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		if ($stored = wincache_ucache_info(false, $key))
+		{
+			$age      = $stored['ucache_entries'][1]['age_seconds'];
+			$ttl      = $stored['ucache_entries'][1]['ttl_seconds'];
+			$hitcount = $stored['ucache_entries'][1]['hitcount'];
+
+			return [
+				'expire'   => $ttl > 0 ? time() + $ttl : null,
+				'hitcount' => $hitcount,
+				'age'      => $age,
+				'ttl'      => $ttl,
+			];
+		}
+
+		return false; // This will return null in a future release
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return extension_loaded('wincache') && ini_get('wincache.ucenabled');
+	}
+}
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
new file mode 100644
index 0000000..92bb010
--- /dev/null
+++ b/system/CodeIgniter.php
@@ -0,0 +1,1136 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use Closure;
+use CodeIgniter\Debug\Timer;
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\DownloadResponse;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Router\Exceptions\RedirectException;
+use CodeIgniter\Router\RouteCollectionInterface;
+use CodeIgniter\Router\Router;
+use Config\App;
+use Config\Cache;
+use Config\Services;
+use Exception;
+use Kint;
+use Kint\Renderer\CliRenderer;
+use Kint\Renderer\RichRenderer;
+
+/**
+ * This class is the core of the framework, and will analyse the
+ * request, route it to a controller, and send back the response.
+ * Of course, there are variations to that flow, but this is the brains.
+ */
+class CodeIgniter
+{
+	/**
+	 * The current version of CodeIgniter Framework
+	 */
+	const CI_VERSION = '4.1.3';
+
+	private const MIN_PHP_VERSION = '7.3';
+
+	/**
+	 * App startup time.
+	 *
+	 * @var mixed
+	 */
+	protected $startTime;
+
+	/**
+	 * Total app execution time
+	 *
+	 * @var float
+	 */
+	protected $totalTime;
+
+	/**
+	 * Main application configuration
+	 *
+	 * @var App
+	 */
+	protected $config;
+
+	/**
+	 * Timer instance.
+	 *
+	 * @var Timer
+	 */
+	protected $benchmark;
+
+	/**
+	 * Current request.
+	 *
+	 * @var Request|IncomingRequest|CLIRequest
+	 */
+	protected $request;
+
+	/**
+	 * Current response.
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
+
+	/**
+	 * Router to use.
+	 *
+	 * @var Router
+	 */
+	protected $router;
+
+	/**
+	 * Controller to use.
+	 *
+	 * @var string|Closure
+	 */
+	protected $controller;
+
+	/**
+	 * Controller method to invoke.
+	 *
+	 * @var string
+	 */
+	protected $method;
+
+	/**
+	 * Output handler to use.
+	 *
+	 * @var string
+	 */
+	protected $output;
+
+	/**
+	 * Cache expiration time
+	 *
+	 * @var integer
+	 */
+	protected static $cacheTTL = 0;
+
+	/**
+	 * Request path to use.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * Should the Response instance "pretend"
+	 * to keep from setting headers/cookies/etc
+	 *
+	 * @var boolean
+	 */
+	protected $useSafeOutput = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param App $config
+	 */
+	public function __construct(App $config)
+	{
+		if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '<'))
+		{
+			// @codeCoverageIgnoreStart
+			$message = extension_loaded('intl')
+				? lang('Core.invalidPhpVersion', [self::MIN_PHP_VERSION, PHP_VERSION])
+				: sprintf('Your PHP version must be %s or higher to run CodeIgniter. Current version: %s', self::MIN_PHP_VERSION, PHP_VERSION);
+
+			exit($message);
+			// @codeCoverageIgnoreEnd
+		}
+
+		$this->startTime = microtime(true);
+		$this->config    = $config;
+	}
+
+	/**
+	 * Handles some basic app and environment setup.
+	 */
+	public function initialize()
+	{
+		// Define environment variables
+		$this->detectEnvironment();
+		$this->bootstrapEnvironment();
+
+		// Setup Exception Handling
+		Services::exceptions()->initialize();
+
+		// Run this check for manual installations
+		if (! is_file(COMPOSER_PATH))
+		{
+			$this->resolvePlatformExtensions(); // @codeCoverageIgnore
+		}
+
+		// Set default locale on the server
+		locale_set_default($this->config->defaultLocale ?? 'en');
+
+		// Set default timezone on the server
+		date_default_timezone_set($this->config->appTimezone ?? 'UTC');
+
+		$this->initializeKint();
+
+		if (! CI_DEBUG)
+		{
+			Kint::$enabled_mode = false; // @codeCoverageIgnore
+		}
+	}
+
+	/**
+	 * Checks system for missing required PHP extensions.
+	 *
+	 * @throws FrameworkException
+	 *
+	 * @return void
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected function resolvePlatformExtensions()
+	{
+		$requiredExtensions = [
+			'curl',
+			'intl',
+			'json',
+			'mbstring',
+			'xml',
+		];
+
+		$missingExtensions = [];
+
+		foreach ($requiredExtensions as $extension)
+		{
+			if (! extension_loaded($extension))
+			{
+				$missingExtensions[] = $extension;
+			}
+		}
+
+		if ($missingExtensions !== [])
+		{
+			throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions));
+		}
+	}
+
+	/**
+	 * Initializes Kint
+	 */
+	protected function initializeKint()
+	{
+		// If we have KINT_DIR it means it's already loaded via composer
+		if (! defined('KINT_DIR'))
+		{
+			spl_autoload_register(function ($class) {
+				$class = explode('\\', $class);
+
+				if ('Kint' !== array_shift($class))
+				{
+					return;
+				}
+
+				$file = SYSTEMPATH . 'ThirdParty/Kint/' . implode('/', $class) . '.php';
+
+				file_exists($file) && require_once $file;
+			});
+
+			require_once SYSTEMPATH . 'ThirdParty/Kint/init.php';
+		}
+
+		/**
+		 * Config\Kint
+		 */
+		$config = config('Config\Kint');
+
+		Kint::$max_depth           = $config->maxDepth;
+		Kint::$display_called_from = $config->displayCalledFrom;
+		Kint::$expanded            = $config->expanded;
+
+		if (! empty($config->plugins) && is_array($config->plugins))
+		{
+			Kint::$plugins = $config->plugins;
+		}
+
+		RichRenderer::$theme  = $config->richTheme;
+		RichRenderer::$folder = $config->richFolder;
+		RichRenderer::$sort   = $config->richSort;
+		if (! empty($config->richObjectPlugins) && is_array($config->richObjectPlugins))
+		{
+			RichRenderer::$object_plugins = $config->richObjectPlugins;
+		}
+		if (! empty($config->richTabPlugins) && is_array($config->richTabPlugins))
+		{
+			RichRenderer::$tab_plugins = $config->richTabPlugins;
+		}
+
+		CliRenderer::$cli_colors         = $config->cliColors;
+		CliRenderer::$force_utf8         = $config->cliForceUTF8;
+		CliRenderer::$detect_width       = $config->cliDetectWidth;
+		CliRenderer::$min_terminal_width = $config->cliMinWidth;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Launch the application!
+	 *
+	 * This is "the loop" if you will. The main entry point into the script
+	 * that gets the required class instances, fires off the filters,
+	 * tries to route the response, loads the controller and generally
+	 * makes all of the pieces work together.
+	 *
+	 * @param RouteCollectionInterface|null $routes
+	 * @param boolean                       $returnResponse
+	 *
+	 * @return boolean|RequestInterface|ResponseInterface|mixed
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
+	{
+		$this->startBenchmark();
+
+		$this->getRequestObject();
+		$this->getResponseObject();
+
+		$this->forceSecureAccess();
+
+		$this->spoofRequestMethod();
+
+		Events::trigger('pre_system');
+
+		// Check for a cached page. Execution will stop
+		// if the page has been cached.
+		$cacheConfig = new Cache();
+		$response    = $this->displayCache($cacheConfig);
+		if ($response instanceof ResponseInterface)
+		{
+			if ($returnResponse)
+			{
+				return $response;
+			}
+
+			$this->response->pretend($this->useSafeOutput)->send();
+			$this->callExit(EXIT_SUCCESS);
+			return;
+		}
+
+		try
+		{
+			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
+		}
+		catch (RedirectException $e)
+		{
+			$logger = Services::logger();
+			$logger->info('REDIRECTED ROUTE at ' . $e->getMessage());
+
+			// If the route is a 'redirect' route, it throws
+			// the exception with the $to as the message
+			$this->response->redirect(base_url($e->getMessage()), 'auto', $e->getCode());
+			$this->sendResponse();
+
+			$this->callExit(EXIT_SUCCESS);
+			return;
+		}
+		catch (PageNotFoundException $e)
+		{
+			$this->display404errors($e);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set our Response instance to "pretend" mode so that things like
+	 * cookies and headers are not actually sent, allowing PHP 7.2+ to
+	 * not complain when ini_set() function is used.
+	 *
+	 * @param boolean $safe
+	 *
+	 * @return $this
+	 */
+	public function useSafeOutput(bool $safe = true)
+	{
+		$this->useSafeOutput = $safe;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the main request logic and fires the controller.
+	 *
+	 * @param RouteCollectionInterface|null $routes
+	 * @param Cache                         $cacheConfig
+	 * @param boolean                       $returnResponse
+	 *
+	 * @return RequestInterface|ResponseInterface|mixed
+	 * @throws RedirectException
+	 */
+	protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false)
+	{
+		$routeFilter = $this->tryToRouteIt($routes);
+
+		// Run "before" filters
+		$filters = Services::filters();
+
+		// If any filters were specified within the routes file,
+		// we need to ensure it's active for the current request
+		if (! is_null($routeFilter))
+		{
+			$filters->enableFilter($routeFilter, 'before');
+			$filters->enableFilter($routeFilter, 'after');
+		}
+
+		$uri = $this->determinePath();
+
+		// Never run filters when running through Spark cli
+		if (! defined('SPARKED'))
+		{
+			$possibleResponse = $filters->run($uri, 'before');
+
+			// If a ResponseInterface instance is returned then send it back to the client and stop
+			if ($possibleResponse instanceof ResponseInterface)
+			{
+				return $returnResponse ? $possibleResponse : $possibleResponse->pretend($this->useSafeOutput)->send();
+			}
+
+			if ($possibleResponse instanceof Request)
+			{
+				$this->request = $possibleResponse;
+			}
+		}
+
+		$returned = $this->startController();
+
+		// Closure controller has run in startController().
+		if (! is_callable($this->controller))
+		{
+			$controller = $this->createController();
+
+			if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false))
+			{
+				throw PageNotFoundException::forMethodNotFound($this->method);
+			}
+
+			// Is there a "post_controller_constructor" event?
+			Events::trigger('post_controller_constructor');
+
+			$returned = $this->runController($controller);
+		}
+		else
+		{
+			$this->benchmark->stop('controller_constructor');
+			$this->benchmark->stop('controller');
+		}
+
+		// If $returned is a string, then the controller output something,
+		// probably a view, instead of echoing it directly. Send it along
+		// so it can be used with the output.
+		$this->gatherOutput($cacheConfig, $returned);
+
+		// Never run filters when running through Spark cli
+		if (! defined('SPARKED'))
+		{
+			$filters->setResponse($this->response);
+			// Run "after" filters
+			$response = $filters->run($uri, 'after');
+		}
+		else
+		{
+			$response = $this->response;
+
+			// Set response code for CLI command failures
+			if (is_numeric($returned) || $returned === false)
+			{
+				$response->setStatusCode(400);
+			}
+		}
+
+		if ($response instanceof ResponseInterface)
+		{
+			$this->response = $response;
+		}
+
+		// Save our current URI as the previous URI in the session
+		// for safer, more accurate use with `previous_url()` helper function.
+		$this->storePreviousURL(current_url(true));
+
+		unset($uri);
+
+		if (! $returnResponse)
+		{
+			$this->sendResponse();
+		}
+
+		//--------------------------------------------------------------------
+		// Is there a post-system event?
+		//--------------------------------------------------------------------
+		Events::trigger('post_system');
+
+		return $this->response;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * You can load different configurations depending on your
+	 * current environment. Setting the environment also influences
+	 * things like logging and error reporting.
+	 *
+	 * This can be set to anything, but default usage is:
+	 *
+	 *     development
+	 *     testing
+	 *     production
+	 */
+	protected function detectEnvironment()
+	{
+		// Make sure ENVIRONMENT isn't already set by other means.
+		defined('ENVIRONMENT') || define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production'); // @codeCoverageIgnore
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Load any custom boot files based upon the current environment.
+	 *
+	 * If no boot file exists, we shouldn't continue because something
+	 * is wrong. At the very least, they should have error reporting setup.
+	 */
+	protected function bootstrapEnvironment()
+	{
+		if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'))
+		{
+			require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
+		}
+		else
+		{
+			// @codeCoverageIgnoreStart
+			header('HTTP/1.1 503 Service Unavailable.', true, 503);
+			echo 'The application environment is not set correctly.';
+			exit(EXIT_ERROR); // EXIT_ERROR
+			// @codeCoverageIgnoreEnd
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Start the Benchmark
+	 *
+	 * The timer is used to display total script execution both in the
+	 * debug toolbar, and potentially on the displayed page.
+	 */
+	protected function startBenchmark()
+	{
+		$this->startTime = microtime(true);
+
+		$this->benchmark = Services::timer();
+		$this->benchmark->start('total_execution', $this->startTime);
+		$this->benchmark->start('bootstrap');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a Request object to be used for this request.
+	 * Used when running certain tests.
+	 *
+	 * @param Request $request
+	 *
+	 * @return $this
+	 */
+	public function setRequest(Request $request)
+	{
+		$this->request = $request;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get our Request object, (either IncomingRequest or CLIRequest)
+	 * and set the server protocol based on the information provided
+	 * by the server.
+	 */
+	protected function getRequestObject()
+	{
+		if ($this->request instanceof Request)
+		{
+			return;
+		}
+
+		// @phpstan-ignore-next-line
+		if (is_cli() && ENVIRONMENT !== 'testing')
+		{
+			// @codeCoverageIgnoreStart
+			$this->request = Services::clirequest($this->config);
+			// @codeCoverageIgnoreEnd
+		}
+		else
+		{
+			$this->request = Services::request($this->config);
+			// guess at protocol if needed
+			$this->request->setProtocolVersion($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get our Response object, and set some default values, including
+	 * the HTTP protocol version and a default successful response.
+	 */
+	protected function getResponseObject()
+	{
+		$this->response = Services::response($this->config);
+
+		if (! is_cli() || ENVIRONMENT === 'testing')
+		{
+			$this->response->setProtocolVersion($this->request->getProtocolVersion());
+		}
+
+		// Assume success until proven otherwise.
+		$this->response->setStatusCode(200);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Force Secure Site Access? If the config value 'forceGlobalSecureRequests'
+	 * is true, will enforce that all requests to this site are made through
+	 * HTTPS. Will redirect the user to the current page with HTTPS, as well
+	 * as set the HTTP Strict Transport Security header for those browsers
+	 * that support it.
+	 *
+	 * @param integer $duration How long the Strict Transport Security
+	 *                          should be enforced for this URL.
+	 */
+	protected function forceSecureAccess($duration = 31536000)
+	{
+		if ($this->config->forceGlobalSecureRequests !== true)
+		{
+			return;
+		}
+
+		force_https($duration, $this->request, $this->response);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if a response has been cached for the given URI.
+	 *
+	 * @param Cache $config
+	 *
+	 * @throws Exception
+	 *
+	 * @return boolean|ResponseInterface
+	 */
+	public function displayCache(Cache $config)
+	{
+		if ($cachedResponse = cache()->get($this->generateCacheName($config)))
+		{
+			$cachedResponse = unserialize($cachedResponse);
+			if (! is_array($cachedResponse) || ! isset($cachedResponse['output']) || ! isset($cachedResponse['headers']))
+			{
+				throw new Exception('Error unserializing page cache');
+			}
+
+			$headers = $cachedResponse['headers'];
+			$output  = $cachedResponse['output'];
+
+			// Clear all default headers
+			foreach (array_keys($this->response->headers()) as $key)
+			{
+				$this->response->removeHeader($key);
+			}
+
+			// Set cached headers
+			foreach ($headers as $name => $value)
+			{
+				$this->response->setHeader($name, $value);
+			}
+
+			$output = $this->displayPerformanceMetrics($output);
+			$this->response->setBody($output);
+
+			return $this->response;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Tells the app that the final output should be cached.
+	 *
+	 * @param integer $time
+	 *
+	 * @return void
+	 */
+	public static function cache(int $time)
+	{
+		static::$cacheTTL = $time;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Caches the full response from the current request. Used for
+	 * full-page caching for very high performance.
+	 *
+	 * @param Cache $config
+	 *
+	 * @return mixed
+	 */
+	public function cachePage(Cache $config)
+	{
+		$headers = [];
+		foreach ($this->response->headers() as $header)
+		{
+			$headers[$header->getName()] = $header->getValueLine();
+		}
+
+		return cache()->save($this->generateCacheName($config), serialize(['headers' => $headers, 'output' => $this->output]), static::$cacheTTL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array with our basic performance stats collected.
+	 *
+	 * @return array
+	 */
+	public function getPerformanceStats(): array
+	{
+		return [
+			'startTime' => $this->startTime,
+			'totalTime' => $this->totalTime,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the cache name to use for our full-page caching.
+	 *
+	 * @param Cache $config
+	 *
+	 * @return string
+	 */
+	protected function generateCacheName(Cache $config): string
+	{
+		if ($this->request instanceof CLIRequest)
+		{
+			return md5($this->request->getPath());
+		}
+
+		$uri = $this->request->getUri();
+
+		if ($config->cacheQueryString)
+		{
+			$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery());
+		}
+		else
+		{
+			$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
+		}
+
+		return md5($name);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replaces the memory_usage and elapsed_time tags.
+	 *
+	 * @param string $output
+	 *
+	 * @return string
+	 */
+	public function displayPerformanceMetrics(string $output): string
+	{
+		$this->totalTime = $this->benchmark->getElapsedTime('total_execution');
+
+		return str_replace('{elapsed_time}', (string) $this->totalTime, $output);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Try to Route It - As it sounds like, works with the router to
+	 * match a route against the current URI. If the route is a
+	 * "redirect route", will also handle the redirect.
+	 *
+	 * @param RouteCollectionInterface|null $routes An collection interface to use in place
+	 *                                         of the config file.
+	 *
+	 * @return string|null
+	 * @throws RedirectException
+	 */
+	protected function tryToRouteIt(RouteCollectionInterface $routes = null)
+	{
+		if ($routes === null)
+		{
+			require APPPATH . 'Config/Routes.php';
+		}
+
+		// $routes is defined in Config/Routes.php
+		$this->router = Services::router($routes, $this->request);
+
+		$path = $this->determinePath();
+
+		$this->benchmark->stop('bootstrap');
+		$this->benchmark->start('routing');
+
+		ob_start();
+
+		$this->controller = $this->router->handle($path);
+		$this->method     = $this->router->methodName();
+
+		// If a {locale} segment was matched in the final route,
+		// then we need to set the correct locale on our Request.
+		if ($this->router->hasLocale())
+		{
+			$this->request->setLocale($this->router->getLocale()); // @phpstan-ignore-line
+		}
+
+		$this->benchmark->stop('routing');
+
+		return $this->router->getFilter();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the path to use for us to try to route to, based
+	 * on user input (setPath), or the CLI/IncomingRequest path.
+	 */
+	protected function determinePath()
+	{
+		if (! empty($this->path))
+		{
+			return $this->path;
+		}
+
+		return method_exists($this->request, 'getPath') ? $this->request->getPath() : $this->request->getUri()->getPath();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows the request path to be set from outside the class,
+	 * instead of relying on CLIRequest or IncomingRequest for the path.
+	 *
+	 * This is primarily used by the Console.
+	 *
+	 * @param string $path
+	 *
+	 * @return $this
+	 */
+	public function setPath(string $path)
+	{
+		$this->path = $path;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Now that everything has been setup, this method attempts to run the
+	 * controller method and make the script go. If it's not able to, will
+	 * show the appropriate Page Not Found error.
+	 */
+	protected function startController()
+	{
+		$this->benchmark->start('controller');
+		$this->benchmark->start('controller_constructor');
+
+		// Is it routed to a Closure?
+		if (is_object($this->controller) && (get_class($this->controller) === 'Closure'))
+		{
+			$controller = $this->controller;
+			return $controller(...$this->router->params());
+		}
+
+		// No controller specified - we don't know what to do now.
+		if (empty($this->controller))
+		{
+			throw PageNotFoundException::forEmptyController();
+		}
+
+		// Try to autoload the class
+		if (! class_exists($this->controller, true) || $this->method[0] === '_')
+		{
+			throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Instantiates the controller class.
+	 *
+	 * @return mixed
+	 */
+	protected function createController()
+	{
+		$class = new $this->controller();
+		$class->initController($this->request, $this->response, Services::logger());
+
+		$this->benchmark->stop('controller_constructor');
+
+		return $class;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs the controller, allowing for _remap methods to function.
+	 *
+	 * @param mixed $class
+	 *
+	 * @return mixed
+	 */
+	protected function runController($class)
+	{
+		// If this is a console request then use the input segments as parameters
+		$params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params(); // @phpstan-ignore-line
+
+		if (method_exists($class, '_remap'))
+		{
+			$output = $class->_remap($this->method, ...$params);
+		}
+		else
+		{
+			$output = $class->{$this->method}(...$params);
+		}
+
+		$this->benchmark->stop('controller');
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays a 404 Page Not Found error. If set, will try to
+	 * call the 404Override controller/method that was set in routing config.
+	 *
+	 * @param PageNotFoundException $e
+	 */
+	protected function display404errors(PageNotFoundException $e)
+	{
+		// Is there a 404 Override available?
+		if ($override = $this->router->get404Override())
+		{
+			if ($override instanceof Closure)
+			{
+				echo $override($e->getMessage());
+			}
+			elseif (is_array($override))
+			{
+				$this->benchmark->start('controller');
+				$this->benchmark->start('controller_constructor');
+
+				$this->controller = $override[0];
+				$this->method     = $override[1];
+
+				$controller = $this->createController();
+				$this->runController($controller);
+			}
+
+			unset($override);
+
+			$cacheConfig = new Cache();
+			$this->gatherOutput($cacheConfig);
+			$this->sendResponse();
+
+			return;
+		}
+
+		// Display 404 Errors
+		$this->response->setStatusCode($e->getCode());
+
+		if (ENVIRONMENT !== 'testing')
+		{
+			// @codeCoverageIgnoreStart
+			if (ob_get_level() > 0)
+			{
+				ob_end_flush();
+			}
+			// @codeCoverageIgnoreEnd
+		}
+		// When testing, one is for phpunit, another is for test case.
+		elseif (ob_get_level() > 2)
+		{
+			ob_end_flush(); // @codeCoverageIgnore
+		}
+
+		throw PageNotFoundException::forPageNotFound(ENVIRONMENT !== 'production' || is_cli() ? $e->getMessage() : '');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gathers the script output from the buffer, replaces some execution
+	 * time tag in the output and displays the debug toolbar, if required.
+	 *
+	 * @param Cache|null $cacheConfig
+	 * @param mixed|null $returned
+	 */
+	protected function gatherOutput(Cache $cacheConfig = null, $returned = null)
+	{
+		$this->output = ob_get_contents();
+		// If buffering is not null.
+		// Clean (erase) the output buffer and turn off output buffering
+		if (ob_get_length())
+		{
+			ob_end_clean();
+		}
+
+		if ($returned instanceof DownloadResponse)
+		{
+			$this->response = $returned;
+			return;
+		}
+		// If the controller returned a response object,
+		// we need to grab the body from it so it can
+		// be added to anything else that might have been
+		// echoed already.
+		// We also need to save the instance locally
+		// so that any status code changes, etc, take place.
+		if ($returned instanceof ResponseInterface)
+		{
+			$this->response = $returned;
+			$returned       = $returned->getBody();
+		}
+
+		if (is_string($returned))
+		{
+			$this->output .= $returned;
+		}
+
+		// Cache it without the performance metrics replaced
+		// so that we can have live speed updates along the way.
+		if (static::$cacheTTL > 0)
+		{
+			$this->cachePage($cacheConfig);
+		}
+
+		$this->output = $this->displayPerformanceMetrics($this->output);
+
+		$this->response->setBody($this->output);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If we have a session object to use, store the current URI
+	 * as the previous URI. This is called just prior to sending the
+	 * response to the client, and will make it available next request.
+	 *
+	 * This helps provider safer, more reliable previous_url() detection.
+	 *
+	 * @param URI|string $uri
+	 */
+	public function storePreviousURL($uri)
+	{
+		// Ignore CLI requests
+		if (is_cli())
+		{
+			return;
+		}
+		// Ignore AJAX requests
+		if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX())
+		{
+			return;
+		}
+
+		// This is mainly needed during testing...
+		if (is_string($uri))
+		{
+			$uri = new URI($uri);
+		}
+
+		if (isset($_SESSION))
+		{
+			$_SESSION['_ci_previous_url'] = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Modifies the Request Object to use a different method if a POST
+	 * variable called _method is found.
+	 */
+	public function spoofRequestMethod()
+	{
+		// Only works with POSTED forms
+		if ($this->request->getMethod() !== 'post')
+		{
+			return;
+		}
+
+		$method = $this->request->getPost('_method'); // @phpstan-ignore-line
+
+		if (empty($method))
+		{
+			return;
+		}
+
+		$this->request = $this->request->setMethod($method);
+	}
+
+	/**
+	 * Sends the output of this request back to the client.
+	 * This is what they've been waiting for!
+	 */
+	protected function sendResponse()
+	{
+		$this->response->pretend($this->useSafeOutput)->send();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Exits the application, setting the exit code for CLI-based applications
+	 * that might be watching.
+	 *
+	 * Made into a separate method so that it can be mocked during testing
+	 * without actually stopping script execution.
+	 *
+	 * @param integer $code
+	 */
+	protected function callExit($code)
+	{
+		// @codeCoverageIgnoreStart
+		exit($code);
+		// @codeCoverageIgnoreEnd
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Commands/Cache/ClearCache.php b/system/Commands/Cache/ClearCache.php
new file mode 100644
index 0000000..6a8c6b4
--- /dev/null
+++ b/system/Commands/Cache/ClearCache.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Cache;
+
+use CodeIgniter\Cache\CacheFactory;
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * Clears current cache.
+ */
+class ClearCache extends BaseCommand
+{
+	/**
+	 * Command grouping.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Cache';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'cache:clear';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Clears the current system caches.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'cache:clear [driver]';
+
+	/**
+	 * the Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'driver' => 'The cache driver to use',
+	];
+
+	/**
+	 * Clears the cache
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$config  = config('Cache');
+		$handler = $params[0] ?? $config->handler;
+
+		if (! array_key_exists($handler, $config->validHandlers))
+		{
+			CLI::error($handler . ' is not a valid cache handler.');
+
+			return;
+		}
+
+		$config->handler = $handler;
+		$cache           = CacheFactory::getHandler($config);
+
+		if (! $cache->clean())
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error('Error while clearing the cache.');
+
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		CLI::write(CLI::color('Cache cleared.', 'green'));
+	}
+}
diff --git a/system/Commands/Cache/InfoCache.php b/system/Commands/Cache/InfoCache.php
new file mode 100644
index 0000000..c86385f
--- /dev/null
+++ b/system/Commands/Cache/InfoCache.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Cache;
+
+use CodeIgniter\Cache\CacheFactory;
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\I18n\Time;
+
+/**
+ * Shows information on the cache.
+ */
+class InfoCache extends BaseCommand
+{
+	/**
+	 * Command grouping.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Cache';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'cache:info';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Shows file cache information in the current system.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'cache:info';
+
+	/**
+	 * Clears the cache
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$config = config('Cache');
+		helper('number');
+
+		if ($config->handler !== 'file')
+		{
+			CLI::error('This command only supports the file cache handler.');
+
+			return;
+		}
+
+		$cache  = CacheFactory::getHandler($config);
+		$caches = $cache->getCacheInfo();
+		$tbody  = [];
+
+		foreach ($caches as $key => $field)
+		{
+			$tbody[] = [
+				$key,
+				clean_path($field['server_path']),
+				number_to_size($field['size']),
+				Time::createFromTimestamp($field['date']),
+			];
+		}
+
+		$thead = [
+			CLI::color('Name', 'green'),
+			CLI::color('Server Path', 'green'),
+			CLI::color('Size', 'green'),
+			CLI::color('Date', 'green'),
+		];
+
+		CLI::table($tbody, $thead);
+	}
+}
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
new file mode 100644
index 0000000..d6eaef1
--- /dev/null
+++ b/system/Commands/Database/CreateDatabase.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Database\SQLite3\Connection;
+use Config\Database;
+use Throwable;
+
+/**
+ * Creates a new database.
+ */
+class CreateDatabase extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Database';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'db:create';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Create a new database schema.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'db:create <db_name> [options]';
+
+	/**
+	 * The Command's arguments
+	 *
+	 * @var array<string, string>
+	 */
+	protected $arguments = [
+		'db_name' => 'The database name to use',
+	];
+
+	/**
+	 * The Command's options
+	 *
+	 * @var array<string, string>
+	 */
+	protected $options = [
+		'--ext' => 'File extension of the database file for SQLite3. Can be `db` or `sqlite`. Defaults to `db`.',
+	];
+
+	/**
+	 * Creates a new database.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		$name = array_shift($params);
+
+		if (empty($name))
+		{
+			$name = CLI::prompt('Database name', null, 'required'); // @codeCoverageIgnore
+		}
+
+		try
+		{
+			/**
+			 * @var Database $config
+			 */
+			$config = config('Database');
+
+			// Set to an empty database to prevent connection errors.
+			$group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
+			$config->{$group}['database'] = '';
+
+			$db = Database::connect();
+
+			// Special SQLite3 handling
+			if ($db instanceof Connection)
+			{
+				$ext = $params['ext'] ?? CLI::getOption('ext') ?? 'db';
+
+				if (! in_array($ext, ['db', 'sqlite'], true))
+				{
+					$ext = CLI::prompt('Please choose a valid file extension', ['db', 'sqlite']); // @codeCoverageIgnore
+				}
+
+				if ($name !== ':memory:')
+				{
+					$name = str_replace(['.db', '.sqlite'], '', $name) . ".{$ext}";
+				}
+
+				$config->{$group}['DBDriver'] = 'SQLite3';
+				$config->{$group}['database'] = $name;
+
+				if ($name !== ':memory:')
+				{
+					$dbName = strpos($name, DIRECTORY_SEPARATOR) === false ? WRITEPATH . $name : $name;
+
+					if (is_file($dbName))
+					{
+						CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');
+						CLI::newLine();
+
+						return;
+					}
+
+					unset($dbName);
+				}
+
+				// Connect to new SQLite3 to create new database
+				$db = Database::connect(null, false);
+				$db->connect();
+
+				if (! is_file($db->getDatabase()) && $name !== ':memory:')
+				{
+					// @codeCoverageIgnoreStart
+					CLI::error('Database creation failed.', 'light_gray', 'red');
+					CLI::newLine();
+					return;
+					// @codeCoverageIgnoreEnd
+				}
+			}
+			elseif (! Database::forge()->createDatabase($name))
+			{
+				// @codeCoverageIgnoreStart
+				CLI::error('Database creation failed.', 'light_gray', 'red');
+				CLI::newLine();
+				return;
+				// @codeCoverageIgnoreEnd
+			}
+
+			CLI::write("Database \"{$name}\" successfully created.", 'green');
+			CLI::newLine();
+		}
+		catch (Throwable $e)
+		{
+			$this->showError($e);
+		}
+		finally
+		{
+			// Reset the altered config no matter what happens.
+			Factories::reset('config');
+		}
+	}
+}
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
new file mode 100644
index 0000000..9a716f3
--- /dev/null
+++ b/system/Commands/Database/Migrate.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Services;
+use Throwable;
+
+/**
+ * Runs all new migrations.
+ */
+class Migrate extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Database';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Locates and runs all new migrations against the database.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'migrate [options]';
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'-n'    => 'Set migration namespace',
+		'-g'    => 'Set database group',
+		'--all' => 'Set for all namespaces, will ignore (-n) option',
+	];
+
+	/**
+	 * Ensures that all migrations have been run.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		$runner = Services::migrations();
+		$runner->clearCliMessages();
+
+		CLI::write(lang('Migrations.latest'), 'yellow');
+
+		$namespace = $params['n'] ?? CLI::getOption('n');
+		$group     = $params['g'] ?? CLI::getOption('g');
+
+		try
+		{
+			// Check for 'all' namespaces
+			if (array_key_exists('all', $params) || CLI::getOption('all'))
+			{
+				$runner->setNamespace(null);
+			}
+			// Check for a specified namespace
+			elseif ($namespace)
+			{
+				$runner->setNamespace($namespace);
+			}
+
+			if (! $runner->latest($group))
+			{
+				CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
+			}
+
+			$messages = $runner->getCliMessages();
+
+			foreach ($messages as $message)
+			{
+				CLI::write($message);
+			}
+
+			CLI::write('Done migrations.', 'green');
+		}
+		// @codeCoverageIgnoreStart
+		catch (Throwable $e)
+		{
+			$this->showError($e);
+		}
+		// @codeCoverageIgnoreEnd
+	}
+}
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
new file mode 100644
index 0000000..fd7ba46
--- /dev/null
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * Does a rollback followed by a latest to refresh the current state
+ * of the database.
+ */
+class MigrateRefresh extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Database';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate:refresh';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Does a rollback followed by a latest to refresh the current state of the database.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'migrate:refresh [options]';
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'-n'    => 'Set migration namespace',
+		'-g'    => 'Set database group',
+		'--all' => 'Set latest for all namespace, will ignore (-n) option',
+		'-f'    => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
+	];
+
+	/**
+	 * Does a rollback followed by a latest to refresh the current state
+	 * of the database.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		$params['b'] = 0;
+
+		if (ENVIRONMENT === 'production')
+		{
+			// @codeCoverageIgnoreStart
+			$force = array_key_exists('f', $params) || CLI::getOption('f');
+
+			if (! $force && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n')
+			{
+				return;
+			}
+
+			$params['f'] = null;
+			// @codeCoverageIgnoreEnd
+		}
+
+		$this->call('migrate:rollback', $params);
+		$this->call('migrate', $params);
+	}
+}
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
new file mode 100644
index 0000000..284504c
--- /dev/null
+++ b/system/Commands/Database/MigrateRollback.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Services;
+use Throwable;
+
+/**
+ * Runs all of the migrations in reverse order, until they have
+ * all been unapplied.
+ */
+class MigrateRollback extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Database';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate:rollback';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Runs the "down" method for all migrations in the last batch.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'migrate:rollback [options]';
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3 or "-2" to roll back twice',
+		'-g' => 'Set database group',
+		'-f' => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
+	];
+
+	/**
+	 * Runs all of the migrations in reverse order, until they have
+	 * all been unapplied.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		if (ENVIRONMENT === 'production')
+		{
+			// @codeCoverageIgnoreStart
+			$force = array_key_exists('f', $params) || CLI::getOption('f');
+
+			if (! $force && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n')
+			{
+				return;
+			}
+			// @codeCoverageIgnoreEnd
+		}
+
+		$runner = Services::migrations();
+		$group  = $params['g'] ?? CLI::getOption('g');
+
+		if (is_string($group))
+		{
+			$runner->setGroup($group);
+		}
+
+		try
+		{
+			$batch = $params['b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;
+			CLI::write(lang('Migrations.rollingBack') . ' ' . $batch, 'yellow');
+
+			if (! $runner->regress($batch))
+			{
+				CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
+			}
+
+			$messages = $runner->getCliMessages();
+
+			foreach ($messages as $message)
+			{
+				CLI::write($message);
+			}
+
+			CLI::write('Done rolling back migrations.', 'green');
+		}
+		// @codeCoverageIgnoreStart
+		catch (Throwable $e)
+		{
+			$this->showError($e);
+		}
+		// @codeCoverageIgnoreEnd
+	}
+}
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
new file mode 100644
index 0000000..e660d02
--- /dev/null
+++ b/system/Commands/Database/MigrateStatus.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Services;
+
+/**
+ * Displays a list of all migrations and whether they've been run or not.
+ */
+class MigrateStatus extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Database';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate:status';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Displays a list of all migrations and whether they\'ve been run or not.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'migrate:status [options]';
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array<string, string>
+	 */
+	protected $options = [
+		'-g' => 'Set database group',
+	];
+
+	/**
+	 * Namespaces to ignore when looking for migrations.
+	 *
+	 * @var string[]
+	 */
+	protected $ignoredNamespaces = [
+		'CodeIgniter',
+		'Config',
+		'Kint',
+		'Laminas\ZendFrameworkBridge',
+		'Laminas\Escaper',
+		'Psr\Log',
+	];
+
+	/**
+	 * Displays a list of all migrations and whether they've been run or not.
+	 *
+	 * @param array<string, mixed> $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		$runner = Services::migrations();
+		$group  = $params['g'] ?? CLI::getOption('g');
+
+		// Get all namespaces
+		$namespaces = Services::autoloader()->getNamespace();
+
+		// Collection of migration status
+		$status = [];
+
+		foreach (array_keys($namespaces) as $namespace)
+		{
+			if (ENVIRONMENT !== 'testing')
+			{
+				// Make Tests\\Support discoverable for testing
+				$this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore
+			}
+
+			if (in_array($namespace, $this->ignoredNamespaces, true))
+			{
+				continue;
+			}
+
+			if (APP_NAMESPACE !== 'App' && $namespace === 'App')
+			{
+				continue; // @codeCoverageIgnore
+			}
+
+			$migrations = $runner->findNamespaceMigrations($namespace);
+
+			if (empty($migrations))
+			{
+				continue;
+			}
+
+			$history = $runner->getHistory((string) $group);
+			ksort($migrations);
+
+			foreach ($migrations as $uid => $migration)
+			{
+				$migrations[$uid]->name = mb_substr($migration->name, mb_strpos($migration->name, $uid . '_'));
+
+				$date  = '---';
+				$group = '---';
+				$batch = '---';
+
+				foreach ($history as $row)
+				{
+					// @codeCoverageIgnoreStart
+					if ($runner->getObjectUid($row) !== $migration->uid)
+					{
+						continue;
+					}
+
+					$date  = date('Y-m-d H:i:s', $row->time);
+					$group = $row->group;
+					$batch = $row->batch;
+					// @codeCoverageIgnoreEnd
+				}
+
+				$status[] = [
+					$namespace,
+					$migration->version,
+					$migration->name,
+					$group,
+					$date,
+					$batch,
+				];
+			}
+		}
+
+		if (! $status)
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error(lang('Migrations.noneFound'), 'light_gray', 'red');
+			CLI::newLine();
+
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		$headers = [
+			CLI::color(lang('Migrations.namespace'), 'yellow'),
+			CLI::color(lang('Migrations.version'), 'yellow'),
+			CLI::color(lang('Migrations.filename'), 'yellow'),
+			CLI::color(lang('Migrations.group'), 'yellow'),
+			CLI::color(str_replace(': ', '', lang('Migrations.on')), 'yellow'),
+			CLI::color(lang('Migrations.batch'), 'yellow'),
+		];
+
+		CLI::table($status, $headers);
+	}
+}
diff --git a/system/Commands/Database/Seed.php b/system/Commands/Database/Seed.php
new file mode 100644
index 0000000..dcc41ab
--- /dev/null
+++ b/system/Commands/Database/Seed.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Database\Seeder;
+use Config\Database;
+use Throwable;
+
+/**
+ * Runs the specified Seeder file to populate the database
+ * with some data.
+ */
+class Seed extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Database';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'db:seed';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Runs the specified seeder to populate known data into the database.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'db:seed <seeder_name>';
+
+	/**
+	 * the Command's Arguments
+	 *
+	 * @var array<string, string>
+	 */
+	protected $arguments = [
+		'seeder_name' => 'The seeder name to run',
+	];
+
+	/**
+	 * Passes to Seeder to populate the database.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		$seeder   = new Seeder(new Database());
+		$seedName = array_shift($params);
+
+		if (empty($seedName))
+		{
+			$seedName = CLI::prompt(lang('Migrations.migSeeder'), null, 'required'); // @codeCoverageIgnore
+		}
+
+		try
+		{
+			$seeder->call($seedName);
+		}
+		catch (Throwable $e)
+		{
+			$this->showError($e);
+		}
+	}
+}
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
new file mode 100644
index 0000000..57b1756
--- /dev/null
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Encryption;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Config\DotEnv;
+use CodeIgniter\Encryption\Encryption;
+
+/**
+ * Generates a new encryption key.
+ */
+class GenerateKey extends BaseCommand
+{
+	/**
+	 * The Command's group.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Encryption';
+
+	/**
+	 * The Command's name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'key:generate';
+
+	/**
+	 * The Command's usage.
+	 *
+	 * @var string
+	 */
+	protected $usage = 'key:generate [options]';
+
+	/**
+	 * The Command's short description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new encryption key and writes it in an `.env` file.';
+
+	/**
+	 * The command's options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--force'  => 'Force overwrite existing key in `.env` file.',
+		'--length' => 'The length of the random string that should be returned in bytes. Defaults to 32.',
+		'--prefix' => 'Prefix to prepend to encoded key (either hex2bin or base64). Defaults to hex2bin.',
+		'--show'   => 'Shows the generated key in the terminal instead of storing in the `.env` file.',
+	];
+
+	/**
+	 * Actually execute the command.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		$prefix = $params['prefix'] ?? CLI::getOption('prefix');
+		if (in_array($prefix, [null, true], true))
+		{
+			$prefix = 'hex2bin';
+		}
+		elseif (! in_array($prefix, ['hex2bin', 'base64'], true))
+		{
+			// @codeCoverageIgnoreStart
+			$prefix = CLI::prompt('Please provide a valid prefix to use.', ['hex2bin', 'base64'], 'required');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$length = $params['length'] ?? CLI::getOption('length');
+		if (in_array($length, [null, true], true))
+		{
+			$length = 32;
+		}
+
+		$encodedKey = $this->generateRandomKey($prefix, $length);
+
+		if (array_key_exists('show', $params) || (bool) CLI::getOption('show'))
+		{
+			CLI::write($encodedKey, 'yellow');
+			CLI::newLine();
+			return;
+		}
+
+		if (! $this->setNewEncryptionKey($encodedKey, $params))
+		{
+			CLI::write('Error in setting new encryption key to .env file.', 'light_gray', 'red');
+			CLI::newLine();
+			return;
+		}
+
+		// force DotEnv to reload the new env vars
+		putenv('encryption.key');
+		unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
+		$dotenv = new DotEnv(ROOTPATH);
+		$dotenv->load();
+
+		CLI::write('Application\'s new encryption key was successfully set.', 'green');
+		CLI::newLine();
+	}
+
+	/**
+	 * Generates a key and encodes it.
+	 *
+	 * @param string  $prefix
+	 * @param integer $length
+	 *
+	 * @return string
+	 */
+	protected function generateRandomKey(string $prefix, int $length): string
+	{
+		$key = Encryption::createKey($length);
+
+		if ($prefix === 'hex2bin')
+		{
+			return 'hex2bin:' . bin2hex($key);
+		}
+
+		return 'base64:' . base64_encode($key);
+	}
+
+	/**
+	 * Sets the new encryption key in your .env file.
+	 *
+	 * @param string $key
+	 * @param array  $params
+	 *
+	 * @return boolean
+	 */
+	protected function setNewEncryptionKey(string $key, array $params): bool
+	{
+		$currentKey = env('encryption.key', '');
+
+		if (strlen($currentKey) !== 0 && ! $this->confirmOverwrite($params))
+		{
+			// Not yet testable since it requires keyboard input
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		return $this->writeNewEncryptionKeyToFile($currentKey, $key);
+	}
+
+	/**
+	 * Checks whether to overwrite existing encryption key.
+	 *
+	 * @param array $params
+	 *
+	 * @return boolean
+	 */
+	protected function confirmOverwrite(array $params): bool
+	{
+		return (array_key_exists('force', $params) || CLI::getOption('force')) || CLI::prompt('Overwrite existing key?', ['n', 'y']) === 'y';
+	}
+
+	/**
+	 * Writes the new encryption key to .env file.
+	 *
+	 * @param string $oldKey
+	 * @param string $newKey
+	 *
+	 * @return boolean
+	 */
+	protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey): bool
+	{
+		$baseEnv = ROOTPATH . 'env';
+		$envFile = ROOTPATH . '.env';
+
+		if (! file_exists($envFile))
+		{
+			if (! file_exists($baseEnv))
+			{
+				CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
+				CLI::write('Here\'s your new key instead: ' . CLI::color($newKey, 'yellow'));
+				CLI::newLine();
+				return false;
+			}
+
+			copy($baseEnv, $envFile);
+		}
+
+		$ret = file_put_contents($envFile, preg_replace(
+			$this->keyPattern($oldKey),
+			"\nencryption.key = $newKey",
+			file_get_contents($envFile)
+		));
+
+		return $ret !== false;
+	}
+
+	/**
+	 * Get the regex of the current encryption key.
+	 *
+	 * @param string $oldKey
+	 *
+	 * @return string
+	 */
+	protected function keyPattern(string $oldKey): string
+	{
+		$escaped = preg_quote($oldKey, '/');
+
+		if ($escaped !== '')
+		{
+			$escaped = "[$escaped]*";
+		}
+
+		return "/^[#\s]*encryption.key[=\s]*{$escaped}$/m";
+	}
+}
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
new file mode 100644
index 0000000..9d0c0f4
--- /dev/null
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton command file.
+ */
+class CommandGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:command';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new spark command.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:command <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The command class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--command'   => 'The command name. Default: "command:name"',
+		'--type'      => 'The command type. Options [basic, generator]. Default: "basic".',
+		'--group'     => 'The command group. Default: [basic -> "CodeIgniter", generator -> "Generators"].',
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserCommand).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Command';
+		$this->directory = 'Commands';
+		$this->template  = 'command.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.command';
+		$this->execute($params);
+	}
+
+	/**
+	 * Prepare options and do the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		$command = $this->getOption('command');
+		$group   = $this->getOption('group');
+		$type    = $this->getOption('type');
+
+		$command = is_string($command) ? $command : 'command:name';
+		$type    = is_string($type) ? $type : 'basic';
+
+		if (! in_array($type, ['basic', 'generator'], true))
+		{
+			// @codeCoverageIgnoreStart
+			$type = CLI::prompt(lang('CLI.generator.commandType'), ['basic', 'generator'], 'required');
+			CLI::newLine();
+			// @codeCoverageIgnoreEnd
+		}
+
+		if (! is_string($group))
+		{
+			$group = $type === 'generator' ? 'Generators' : 'CodeIgniter';
+		}
+
+		return $this->parseTemplate(
+			$class,
+			['{group}', '{command}'],
+			[$group, $command],
+			['type' => $type]
+		);
+	}
+}
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
new file mode 100644
index 0000000..00d520d
--- /dev/null
+++ b/system/Commands/Generators/ConfigGenerator.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton config file.
+ */
+class ConfigGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:config';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new config file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:config <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The config class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserConfig).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Config';
+		$this->directory = 'Config';
+		$this->template  = 'config.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.config';
+		$this->execute($params);
+	}
+
+	/**
+	 * Prepare options and do the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		$namespace = $this->getOption('namespace') ?? APP_NAMESPACE;
+
+		if ($namespace === APP_NAMESPACE)
+		{
+			$class = substr($class, strlen($namespace . '\\'));
+		}
+
+		return $this->parseTemplate($class);
+	}
+}
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
new file mode 100644
index 0000000..b2ecbd7
--- /dev/null
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton controller file.
+ */
+class ControllerGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:controller';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new controller file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:controller <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The controller class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--bare'      => 'Extends from CodeIgniter\Controller instead of BaseController.',
+		'--restful'   => 'Extends from a RESTful resource, Options: [controller, presenter]. Default: "controller".',
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserController).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Controller';
+		$this->directory = 'Controllers';
+		$this->template  = 'controller.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.controller';
+		$this->execute($params);
+	}
+
+	/**
+	 * Prepare options and do the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		$bare = $this->getOption('bare');
+		$rest = $this->getOption('restful');
+
+		$useStatement = trim(APP_NAMESPACE, '\\') . '\Controllers\BaseController';
+		$extends      = 'BaseController';
+
+		// Gets the appropriate parent class to extend.
+		if ($bare || $rest)
+		{
+			if ($bare)
+			{
+				$useStatement = 'CodeIgniter\Controller';
+				$extends      = 'Controller';
+			}
+			elseif ($rest)
+			{
+				$rest = is_string($rest) ? $rest : 'controller';
+
+				if (! in_array($rest, ['controller', 'presenter'], true))
+				{
+					// @codeCoverageIgnoreStart
+					$rest = CLI::prompt(lang('CLI.generator.parentClass'), ['controller', 'presenter'], 'required');
+					CLI::newLine();
+					// @codeCoverageIgnoreEnd
+				}
+
+				if ($rest === 'controller')
+				{
+					$useStatement = 'CodeIgniter\RESTful\ResourceController';
+					$extends      = 'ResourceController';
+				}
+				elseif ($rest === 'presenter')
+				{
+					$useStatement = 'CodeIgniter\RESTful\ResourcePresenter';
+					$extends      = 'ResourcePresenter';
+				}
+			}
+		}
+
+		return $this->parseTemplate(
+			$class,
+			['{useStatement}', '{extends}'],
+			[$useStatement, $extends],
+			['type' => $rest]
+		);
+	}
+}
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
new file mode 100644
index 0000000..2a3cff0
--- /dev/null
+++ b/system/Commands/Generators/EntityGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Entity file.
+ */
+class EntityGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:entity';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new entity file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:entity <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The entity class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserEntity).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Entity';
+		$this->directory = 'Entities';
+		$this->template  = 'entity.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.entity';
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
new file mode 100644
index 0000000..677337d
--- /dev/null
+++ b/system/Commands/Generators/FilterGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Filter file.
+ */
+class FilterGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:filter';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new filter file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:filter <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The filter class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserFilter).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Filter';
+		$this->directory = 'Filters';
+		$this->template  = 'filter.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.filter';
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
new file mode 100644
index 0000000..a4b36ac
--- /dev/null
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * Deprecated class for the migration creation command.
+ *
+ * @deprecated Use make:migration instead.
+ *
+ * @codeCoverageIgnore
+ */
+class MigrateCreate extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate:create';
+
+	/**
+	 * The Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = '[DEPRECATED] Creates a new migration file. Please use "make:migration" instead.';
+
+	/**
+	 * The Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'migrate:create <name> [options]';
+
+	/**
+	 * The Command's arguments.
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The migration file name.',
+	];
+
+	/**
+	 * The Command's options.
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--namespace' => 'Set root namespace. Defaults to APP_NAMESPACE',
+		'--force'     => 'Force overwrite existing files.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		// Resolve arguments before passing to make:migration
+		$params[0] = $params[0] ?? CLI::getSegment(2);
+
+		$params['namespace'] = $params['namespace'] ?? CLI::getOption('namespace') ?? APP_NAMESPACE;
+
+		if (array_key_exists('force', $params) || CLI::getOption('force'))
+		{
+			$params['force'] = null;
+		}
+
+		$this->call('make:migration', $params);
+	}
+}
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
new file mode 100644
index 0000000..fb2f0ed
--- /dev/null
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton migration file.
+ */
+class MigrationGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:migration';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new migration file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:migration <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The migration class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--session'   => 'Generates the migration file for database sessions.',
+		'--table'     => 'Table name to use for database sessions. Default: "ci_sessions".',
+		'--dbgroup'   => 'Database group to use for database sessions. Default: "default".',
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserMigration).',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Migration';
+		$this->directory = 'Database\Migrations';
+		$this->template  = 'migration.tpl.php';
+
+		if (array_key_exists('session', $params) || CLI::getOption('session'))
+		{
+			$table     = $params['table'] ?? CLI::getOption('table') ?? 'ci_sessions';
+			$params[0] = "_create_{$table}_table";
+		}
+
+		$this->classNameLang = 'CLI.generator.className.migration';
+		$this->execute($params);
+	}
+
+	/**
+	 * Prepare options and do the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		$data['session'] = false;
+
+		if ($this->getOption('session'))
+		{
+			$table   = $this->getOption('table');
+			$DBGroup = $this->getOption('dbgroup');
+
+			$data['session'] = true;
+			$data['table']   = is_string($table) ? $table : 'ci_sessions';
+			$data['DBGroup'] = is_string($DBGroup) ? $DBGroup : 'default';
+			$data['matchIP'] = config('App')->sessionMatchIP;
+		}
+
+		return $this->parseTemplate($class, [], [], $data);
+	}
+
+	/**
+	 * Change file basename before saving.
+	 *
+	 * @param string $filename
+	 *
+	 * @return string
+	 */
+	protected function basename(string $filename): string
+	{
+		return gmdate(config('Migrations')->timestampFormat) . basename($filename);
+	}
+}
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
new file mode 100644
index 0000000..b391da7
--- /dev/null
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Model file.
+ */
+class ModelGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:model';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new model file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:model <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The model class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--table'     => 'Supply a table name. Default: "the lowercased plural of the class name".',
+		'--dbgroup'   => 'Database group to use. Default: "default".',
+		'--return'    => 'Return type, Options: [array, object, entity]. Default: "array".',
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserModel).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Model';
+		$this->directory = 'Models';
+		$this->template  = 'model.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.model';
+		$this->execute($params);
+	}
+
+	/**
+	 * Prepare options and do the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		$table   = $this->getOption('table');
+		$DBGroup = $this->getOption('dbgroup');
+		$return  = $this->getOption('return');
+
+		$baseClass = strtolower(str_replace(trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\') . '\\', '', $class));
+		$baseClass = strpos($baseClass, 'model') ? str_replace('model', '', $baseClass) : $baseClass;
+
+		$table   = is_string($table) ? $table : plural($baseClass);
+		$DBGroup = is_string($DBGroup) ? $DBGroup : 'default';
+		$return  = is_string($return) ? $return : 'array';
+
+		if (! in_array($return, ['array', 'object', 'entity'], true))
+		{
+			// @codeCoverageIgnoreStart
+			$return = CLI::prompt(lang('CLI.generator.returnType'), ['array', 'object', 'entity'], 'required');
+			CLI::newLine();
+			// @codeCoverageIgnoreEnd
+		}
+
+		if ($return === 'entity')
+		{
+			$return = str_replace('Models', 'Entities', $class);
+
+			if ($pos = strpos($return, 'Model'))
+			{
+				$return = substr($return, 0, $pos);
+
+				if ($this->getOption('suffix'))
+				{
+					$return .= 'Entity';
+				}
+			}
+
+			$this->call('make:entity', array_merge([$baseClass], $this->params));
+		}
+
+		return $this->parseTemplate($class, ['{table}', '{DBGroup}', '{return}'], [$table, $DBGroup, $return]);
+	}
+}
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
new file mode 100644
index 0000000..6750b46
--- /dev/null
+++ b/system/Commands/Generators/ScaffoldGenerator.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a complete set of scaffold files.
+ */
+class ScaffoldGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:scaffold';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a complete set of scaffold files.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:scaffold <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The class name',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--bare'      => 'Add the "--bare" option to controller component.',
+		'--restful'   => 'Add the "--restful" option to controller component.',
+		'--table'     => 'Add the "--table" option to the model component.',
+		'--dbgroup'   => 'Add the "--dbgroup" option to model component.',
+		'--return'    => 'Add the "--return" option to the model component.',
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name.',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->params = $params;
+
+		$options = [];
+
+		if ($this->getOption('namespace'))
+		{
+			$options['namespace'] = $this->getOption('namespace');
+		}
+
+		if ($this->getOption('suffix'))
+		{
+			$options['suffix'] = null;
+		}
+
+		if ($this->getOption('force'))
+		{
+			$options['force'] = null;
+		}
+
+		$controllerOpts = [];
+
+		if ($this->getOption('bare'))
+		{
+			$controllerOpts['bare'] = null;
+		}
+		elseif ($this->getOption('restful'))
+		{
+			$controllerOpts['restful'] = $this->getOption('restful');
+		}
+
+		$modelOpts = [
+			'table'   => $this->getOption('table'),
+			'dbgroup' => $this->getOption('dbgroup'),
+			'return'  => $this->getOption('return'),
+		];
+
+		$class = $params[0] ?? CLI::getSegment(2);
+
+		// Call those commands!
+		$this->call('make:controller', array_merge([$class], $controllerOpts, $options));
+		$this->call('make:model', array_merge([$class], $modelOpts, $options));
+		$this->call('make:migration', array_merge([$class], $options));
+		$this->call('make:seeder', array_merge([$class], $options));
+	}
+}
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
new file mode 100644
index 0000000..aaa2a65
--- /dev/null
+++ b/system/Commands/Generators/SeederGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton seeder file.
+ */
+class SeederGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:seeder';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new seeder file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:seeder <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The seeder class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserSeeder).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Seeder';
+		$this->directory = 'Database\Seeds';
+		$this->template  = 'seeder.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.seeder';
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/SessionMigrationGenerator.php b/system/Commands/Generators/SessionMigrationGenerator.php
new file mode 100644
index 0000000..eec42fd
--- /dev/null
+++ b/system/Commands/Generators/SessionMigrationGenerator.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a migration file for database sessions.
+ *
+ * @deprecated Use `make:migration --session` instead.
+ *
+ * @codeCoverageIgnore
+ */
+class SessionMigrationGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'session:migration';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = '[DEPRECATED] Generates the migration file for database sessions, Please use  "make:migration --session" instead.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'session:migration [options]';
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'-t' => 'Supply a table name.',
+		'-g' => 'Database group to use. Default: "default".',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Migration';
+		$this->directory = 'Database\Migrations';
+		$this->template  = 'migration.tpl.php';
+
+		$table = 'ci_sessions';
+
+		if (array_key_exists('t', $params) || CLI::getOption('t'))
+		{
+			$table = $params['t'] ?? CLI::getOption('t');
+		}
+
+		$params[0] = "_create_{$table}_table";
+
+		$this->execute($params);
+	}
+
+	/**
+	 * Performs the necessary replacements.
+	 *
+	 * @param string $class
+	 *
+	 * @return string
+	 */
+	protected function prepare(string $class): string
+	{
+		$data['session'] = true;
+		$data['table']   = $this->getOption('t');
+		$data['DBGroup'] = $this->getOption('g');
+		$data['matchIP'] = config('App')->sessionMatchIP ?? false;
+
+		$data['table']   = is_string($data['table']) ? $data['table'] : 'ci_sessions';
+		$data['DBGroup'] = is_string($data['DBGroup']) ? $data['DBGroup'] : 'default';
+
+		return $this->parseTemplate($class, [], [], $data);
+	}
+
+	/**
+	 * Change file basename before saving.
+	 *
+	 * @param string $filename
+	 *
+	 * @return string
+	 */
+	protected function basename(string $filename): string
+	{
+		return gmdate(config('Migrations')->timestampFormat) . basename($filename);
+	}
+}
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
new file mode 100644
index 0000000..9a79d47
--- /dev/null
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Validation file.
+ */
+class ValidationGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'make:validation';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generates a new validation file.';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'make:validation <name> [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The validation class name.',
+	];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+		'--suffix'    => 'Append the component title to the class name (e.g. User => UserValidation).',
+		'--force'     => 'Force overwrite existing file.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$this->component = 'Validation';
+		$this->directory = 'Validation';
+		$this->template  = 'validation.tpl.php';
+
+		$this->classNameLang = 'CLI.generator.className.validation';
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/Views/command.tpl.php b/system/Commands/Generators/Views/command.tpl.php
new file mode 100644
index 0000000..52da0d0
--- /dev/null
+++ b/system/Commands/Generators/Views/command.tpl.php
@@ -0,0 +1,76 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+<?php if ($type === 'generator'): ?>
+use CodeIgniter\CLI\GeneratorTrait;
+<?php endif ?>
+
+class {class} extends BaseCommand
+{
+<?php if ($type === 'generator'): ?>
+	use GeneratorTrait;
+
+<?php endif ?>
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = '{group}';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = '{command}';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = '';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = '{command} [arguments] [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+<?php if ($type === 'generator'): ?>
+		$this->component = 'Command';
+		$this->directory = 'Commands';
+		$this->template  = 'command.tpl.php';
+
+		$this->execute($params);
+<?php else: ?>
+		//
+<?php endif ?>
+	}
+}
diff --git a/system/Commands/Generators/Views/config.tpl.php b/system/Commands/Generators/Views/config.tpl.php
new file mode 100644
index 0000000..72e93ad
--- /dev/null
+++ b/system/Commands/Generators/Views/config.tpl.php
@@ -0,0 +1,10 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Config\BaseConfig;
+
+class {class} extends BaseConfig
+{
+	//
+}
diff --git a/system/Commands/Generators/Views/controller.tpl.php b/system/Commands/Generators/Views/controller.tpl.php
new file mode 100644
index 0000000..f7859f2
--- /dev/null
+++ b/system/Commands/Generators/Views/controller.tpl.php
@@ -0,0 +1,177 @@
+<@php
+
+namespace {namespace};
+
+use {useStatement};
+
+class {class} extends {extends}
+{
+<?php if ($type === 'controller'): ?>
+	/**
+	 * Return an array of resource objects, themselves in array format
+	 *
+	 * @return mixed
+	 */
+	public function index()
+	{
+		//
+	}
+
+	/**
+	 * Return the properties of a resource object
+	 *
+	 * @return mixed
+	 */
+	public function show($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Return a new resource object, with default properties
+	 *
+	 * @return mixed
+	 */
+	public function new()
+	{
+		//
+	}
+
+	/**
+	 * Create a new resource object, from "posted" parameters
+	 *
+	 * @return mixed
+	 */
+	public function create()
+	{
+		//
+	}
+
+	/**
+	 * Return the editable properties of a resource object
+	 *
+	 * @return mixed
+	 */
+	public function edit($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Add or update a model resource, from "posted" properties
+	 *
+	 * @return mixed
+	 */
+	public function update($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Delete the designated resource object from the model
+	 *
+	 * @return mixed
+	 */
+	public function delete($id = null)
+	{
+		//
+	}
+<?php elseif ($type === 'presenter'): ?>
+	/**
+	 * Present a view of resource objects
+	 *
+	 * @return mixed
+	 */
+	public function index()
+	{
+		//
+	}
+
+	/**
+	 * Present a view to present a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function show($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Present a view to present a new single resource object
+	 *
+	 * @return mixed
+	 */
+	public function new()
+	{
+		//
+	}
+
+	/**
+	 * Process the creation/insertion of a new resource object.
+	 * This should be a POST.
+	 *
+	 * @return mixed
+	 */
+	public function create()
+	{
+		//
+	}
+
+	/**
+	 * Present a view to edit the properties of a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function edit($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Process the updating, full or partial, of a specific resource object.
+	 * This should be a POST.
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function update($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Present a view to confirm the deletion of a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function remove($id = null)
+	{
+		//
+	}
+
+	/**
+	 * Process the deletion of a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function delete($id = null)
+	{
+		//
+	}
+<?php else: ?>
+	public function index()
+	{
+		//
+	}
+<?php endif ?>
+}
diff --git a/system/Commands/Generators/Views/entity.tpl.php b/system/Commands/Generators/Views/entity.tpl.php
new file mode 100644
index 0000000..8de289f
--- /dev/null
+++ b/system/Commands/Generators/Views/entity.tpl.php
@@ -0,0 +1,16 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Entity\Entity;
+
+class {class} extends Entity
+{
+	protected $datamap = [];
+	protected $dates   = [
+		'created_at',
+		'updated_at',
+		'deleted_at',
+	];
+	protected $casts   = [];
+}
diff --git a/system/Commands/Generators/Views/filter.tpl.php b/system/Commands/Generators/Views/filter.tpl.php
new file mode 100644
index 0000000..19147bb
--- /dev/null
+++ b/system/Commands/Generators/Views/filter.tpl.php
@@ -0,0 +1,47 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class {class} implements FilterInterface
+{
+	/**
+	 * Do whatever processing this filter needs to do.
+	 * By default it should not return anything during
+	 * normal execution. However, when an abnormal state
+	 * is found, it should return an instance of
+	 * CodeIgniter\HTTP\Response. If it does, script
+	 * execution will end and that Response will be
+	 * sent back to the client, allowing for error pages,
+	 * redirects, etc.
+	 *
+	 * @param RequestInterface $request
+	 * @param array|null       $arguments
+	 *
+	 * @return mixed
+	 */
+	public function before(RequestInterface $request, $arguments = null)
+	{
+		//
+	}
+
+	/**
+	 * Allows After filters to inspect and modify the response
+	 * object as needed. This method does not allow any way
+	 * to stop execution of other after filters, short of
+	 * throwing an Exception or Error.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param array|null        $arguments
+	 *
+	 * @return mixed
+	 */
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+	{
+		//
+	}
+}
diff --git a/system/Commands/Generators/Views/migration.tpl.php b/system/Commands/Generators/Views/migration.tpl.php
new file mode 100644
index 0000000..42bb77e
--- /dev/null
+++ b/system/Commands/Generators/Views/migration.tpl.php
@@ -0,0 +1,44 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Database\Migration;
+
+class {class} extends Migration
+{
+<?php if ($session): ?>
+	protected $DBGroup = '<?= $DBGroup ?>';
+
+	public function up()
+	{
+		$this->forge->addField([
+			'id'         => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
+			'ip_address' => ['type' => 'VARCHAR', 'constraint' => 45, 'null' => false],
+			'timestamp'  => ['type' => 'INT', 'unsigned' => true, 'null' => false, 'default' => 0],
+			'data'       => ['type' => 'TEXT', 'null' => false, 'default' => ''],
+		]);
+	<?php if ($matchIP) : ?>
+	$this->forge->addKey(['id', 'ip_address'], true);
+	<?php else: ?>
+	$this->forge->addKey('id', true);
+	<?php endif ?>
+	$this->forge->addKey('timestamp');
+		$this->forge->createTable('<?= $table ?>', true);
+	}
+
+	public function down()
+	{
+		$this->forge->dropTable('<?= $table ?>', true);
+	}
+<?php else: ?>
+	public function up()
+	{
+		//
+	}
+
+	public function down()
+	{
+		//
+	}
+<?php endif ?>
+}
diff --git a/system/Commands/Generators/Views/model.tpl.php b/system/Commands/Generators/Views/model.tpl.php
new file mode 100644
index 0000000..042bbc8
--- /dev/null
+++ b/system/Commands/Generators/Views/model.tpl.php
@@ -0,0 +1,42 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Model;
+
+class {class} extends Model
+{
+	protected $DBGroup              = '{DBGroup}';
+	protected $table                = '{table}';
+	protected $primaryKey           = 'id';
+	protected $useAutoIncrement     = true;
+	protected $insertID             = 0;
+	protected $returnType           = '{return}';
+	protected $useSoftDeletes       = false;
+	protected $protectFields        = true;
+	protected $allowedFields        = [];
+
+	// Dates
+	protected $useTimestamps        = false;
+	protected $dateFormat           = 'datetime';
+	protected $createdField         = 'created_at';
+	protected $updatedField         = 'updated_at';
+	protected $deletedField         = 'deleted_at';
+
+	// Validation
+	protected $validationRules      = [];
+	protected $validationMessages   = [];
+	protected $skipValidation       = false;
+	protected $cleanValidationRules = true;
+
+	// Callbacks
+	protected $allowCallbacks       = true;
+	protected $beforeInsert         = [];
+	protected $afterInsert          = [];
+	protected $beforeUpdate         = [];
+	protected $afterUpdate          = [];
+	protected $beforeFind           = [];
+	protected $afterFind            = [];
+	protected $beforeDelete         = [];
+	protected $afterDelete          = [];
+}
diff --git a/system/Commands/Generators/Views/seeder.tpl.php b/system/Commands/Generators/Views/seeder.tpl.php
new file mode 100644
index 0000000..bf80c7a
--- /dev/null
+++ b/system/Commands/Generators/Views/seeder.tpl.php
@@ -0,0 +1,13 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Database\Seeder;
+
+class {class} extends Seeder
+{
+	public function run()
+	{
+		//
+	}
+}
diff --git a/system/Commands/Generators/Views/validation.tpl.php b/system/Commands/Generators/Views/validation.tpl.php
new file mode 100644
index 0000000..60d78a3
--- /dev/null
+++ b/system/Commands/Generators/Views/validation.tpl.php
@@ -0,0 +1,11 @@
+<@php
+
+namespace {namespace};
+
+class {class}
+{
+	// public function custom_rule(): bool
+	// {
+	// 	return true;
+	// }
+}
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
new file mode 100644
index 0000000..a2899c7
--- /dev/null
+++ b/system/Commands/Help.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+
+/**
+ * CI Help command for the spark script.
+ *
+ * Lists the basic usage information for the spark script,
+ * and provides a way to list help for other commands.
+ */
+class Help extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'help';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Displays basic usage information.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'help command_name';
+
+	/**
+	 * the Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'command_name' => 'The command name [default: "help"]',
+	];
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the help for spark commands.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$command  = array_shift($params);
+		$command  = $command ?? 'help';
+		$commands = $this->commands->getCommands();
+
+		if (! $this->commands->verifyCommand($command, $commands))
+		{
+			return;
+		}
+
+		$class = new $commands[$command]['class']($this->logger, $this->commands);
+		$class->showHelp();
+	}
+}
diff --git a/system/Commands/Housekeeping/ClearDebugbar.php b/system/Commands/Housekeeping/ClearDebugbar.php
new file mode 100644
index 0000000..3df1a40
--- /dev/null
+++ b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Housekeeping;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * ClearDebugbar Command
+ */
+class ClearDebugbar extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Housekeeping';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'debugbar:clear';
+
+	/**
+	 * The Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'debugbar:clear';
+
+	/**
+	 * The Command's short description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Clears all debugbar JSON files.';
+
+	/**
+	 * Actually runs the command.
+	 *
+	 * @param array $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		helper('filesystem');
+
+		if (! delete_files(WRITEPATH . 'debugbar'))
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error('Error deleting the debugbar JSON files.');
+			CLI::newLine();
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		CLI::write('Debugbar cleared.', 'green');
+		CLI::newLine();
+	}
+}
diff --git a/system/Commands/Housekeeping/ClearLogs.php b/system/Commands/Housekeeping/ClearLogs.php
new file mode 100644
index 0000000..6b47d68
--- /dev/null
+++ b/system/Commands/Housekeeping/ClearLogs.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Housekeeping;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * ClearLogs command.
+ */
+class ClearLogs extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Housekeeping';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'logs:clear';
+
+	/**
+	 * The Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Clears all log files.';
+
+	/**
+	 * The Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'logs:clear [option';
+
+	/**
+	 * The Command's options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--force' => 'Force delete of all logs files without prompting.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$force = array_key_exists('force', $params) || CLI::getOption('force');
+
+		if (! $force && CLI::prompt('Are you sure you want to delete the logs?', ['n', 'y']) === 'n')
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error('Deleting logs aborted.', 'light_gray', 'red');
+			CLI::error('If you want, use the "-force" option to force delete all log files.', 'light_gray', 'red');
+			CLI::newLine();
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		helper('filesystem');
+
+		if (! delete_files(WRITEPATH . 'logs', false, true))
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error('Error in deleting the logs files.', 'light_gray', 'red');
+			CLI::newLine();
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		CLI::write('Logs cleared.', 'green');
+		CLI::newLine();
+	}
+}
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
new file mode 100644
index 0000000..94b13de
--- /dev/null
+++ b/system/Commands/ListCommands.php
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * CI Help command for the spark script.
+ *
+ * Lists the basic usage information for the spark script,
+ * and provides a way to list help for other commands.
+ */
+class ListCommands extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'list';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Lists the available commands.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'list';
+
+	/**
+	 * the Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--simple' => 'Prints a list of the commands with no other info',
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the help for the spark cli script itself.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$commands = $this->commands->getCommands();
+		ksort($commands);
+
+		// Check for 'simple' format
+		return array_key_exists('simple', $params) || CLI::getOption('simple')
+			? $this->listSimple($commands)
+			: $this->listFull($commands);
+	}
+
+	/**
+	 * Lists the commands with accompanying info.
+	 *
+	 * @param array $commands
+	 */
+	protected function listFull(array $commands)
+	{
+		// Sort into buckets by group
+		$groups = [];
+
+		foreach ($commands as $title => $command)
+		{
+			if (! isset($groups[$command['group']]))
+			{
+				$groups[$command['group']] = [];
+			}
+
+			$groups[$command['group']][$title] = $command;
+		}
+
+		$length = max(array_map('strlen', array_keys($commands)));
+
+		ksort($groups);
+
+		// Display it all...
+		foreach ($groups as $group => $commands)
+		{
+			CLI::write($group, 'yellow');
+			foreach ($commands as $name => $command)
+			{
+				$name   = $this->setPad($name, $length, 2, 2);
+				$output = CLI::color($name, 'green');
+				if (isset($command['description']))
+				{
+					$output .= CLI::wrap($command['description'], 125, strlen($name));
+				}
+				CLI::write($output);
+			}
+
+			if ($group !== array_key_last($groups))
+			{
+				CLI::newLine();
+			}
+		}
+	}
+
+	/**
+	 * Lists the commands only.
+	 *
+	 * @param array $commands
+	 */
+	protected function listSimple(array $commands)
+	{
+		foreach (array_keys($commands) as $title)
+		{
+			CLI::write($title);
+		}
+	}
+}
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
new file mode 100644
index 0000000..cbcda32
--- /dev/null
+++ b/system/Commands/Server/Serve.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Server;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * Launch the PHP development server
+ *
+ * Not testable, as it throws phpunit for a loop :-/
+ *
+ * @codeCoverageIgnore
+ */
+class Serve extends BaseCommand
+{
+	/**
+	 * Minimum PHP version
+	 *
+	 * @var string
+	 */
+	protected $minPHPVersion = '7.3';
+
+	/**
+	 * Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * Name
+	 *
+	 * @var string
+	 */
+	protected $name = 'serve';
+
+	/**
+	 * Description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Launches the CodeIgniter PHP-Development Server.';
+
+	/**
+	 * Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'serve';
+
+	/**
+	 * Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * The current port offset.
+	 *
+	 * @var integer
+	 */
+	protected $portOffset = 0;
+
+	/**
+	 * The max number of ports to attempt to serve from
+	 *
+	 * @var integer
+	 */
+	protected $tries = 10;
+
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'--php'  => 'The PHP Binary [default: "PHP_BINARY"]',
+		'--host' => 'The HTTP Host [default: "localhost"]',
+		'--port' => 'The HTTP Host Port [default: "8080"]',
+	];
+
+	/**
+	 * Run the server
+	 *
+	 * @param array $params Parameters
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		// Collect any user-supplied options and apply them.
+		$php  = escapeshellarg(CLI::getOption('php') ?? PHP_BINARY);
+		$host = CLI::getOption('host') ?? 'localhost';
+		$port = (int) (CLI::getOption('port') ?? 8080) + $this->portOffset;
+
+		// Get the party started.
+		CLI::write('CodeIgniter development server started on http://' . $host . ':' . $port, 'green');
+		CLI::write('Press Control-C to stop.');
+
+		// Set the Front Controller path as Document Root.
+		$docroot = escapeshellarg(FCPATH);
+
+		// Mimic Apache's mod_rewrite functionality with user settings.
+		$rewrite = escapeshellarg(__DIR__ . '/rewrite.php');
+
+		// Call PHP's built-in webserver, making sure to set our
+		// base path to the public folder, and to use the rewrite file
+		// to ensure our environment is set and it simulates basic mod_rewrite.
+		passthru($php . ' -S ' . $host . ':' . $port . ' -t ' . $docroot . ' ' . $rewrite, $status);
+
+		if ($status && $this->portOffset < $this->tries)
+		{
+			$this->portOffset++;
+
+			$this->run($params);
+		}
+	}
+}
diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
new file mode 100644
index 0000000..89290be
--- /dev/null
+++ b/system/Commands/Server/rewrite.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * CodeIgniter PHP-Development Server Rewrite Rules
+ *
+ * This script works with the CLI serve command to help run a seamless
+ * development server based around PHP's built-in development
+ * server. This file simply tries to mimic Apache's mod_rewrite
+ * functionality so the site will operate as normal.
+ */
+
+// @codeCoverageIgnoreStart
+// Avoid this file run when listing commands
+if (PHP_SAPI === 'cli')
+{
+	return;
+}
+
+$uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+
+// Front Controller path - expected to be in the default folder
+$fcpath = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR;
+
+// Full path
+$path = $fcpath . ltrim($uri, '/');
+
+// If $path is an existing file or folder within the public folder
+// then let the request handle it like normal.
+if ($uri !== '/' && (is_file($path) || is_dir($path)))
+{
+	return false;
+}
+
+// Otherwise, we'll load the index file and let
+// the framework handle the request from here.
+require_once $fcpath . 'index.php';
+// @codeCoverageIgnoreEnd
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
new file mode 100644
index 0000000..1fa4331
--- /dev/null
+++ b/system/Commands/Utilities/Environment.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace CodeIgniter\Commands\Utilities;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Config\DotEnv;
+
+/**
+ * Command to display the current environment,
+ * or set a new one in the `.env` file.
+ */
+final class Environment extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'env';
+
+	/**
+	 * The Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Retrieves the current environment, or set a new one.';
+
+	/**
+	 * The Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'env [<environment>]';
+
+	/**
+	 * The Command's arguments
+	 *
+	 * @var array<string, string>
+	 */
+	protected $arguments = [
+		'environment' => '[Optional] The new environment to set. If none is provided, this will print the current environment.',
+	];
+
+	/**
+	 * The Command's options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	/**
+	 * Allowed values for environment. `testing` is excluded
+	 * since spark won't work on it.
+	 *
+	 * @var array<int, string>
+	 */
+	private static $knownTypes = [
+		'production',
+		'development',
+	];
+
+	/**
+	 * @inheritDoc
+	 *
+	 * @param array<string, mixed> $params
+	 *
+	 * @return void
+	 */
+	public function run(array $params)
+	{
+		if ($params === [])
+		{
+			CLI::write(sprintf('Your environment is currently set as %s.', CLI::color($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, 'green')));
+			CLI::newLine();
+
+			return;
+		}
+
+		$env = strtolower(array_shift($params));
+
+		if ($env === 'testing')
+		{
+			CLI::error('The "testing" environment is reserved for PHPUnit testing.', 'light_gray', 'red');
+			CLI::error('You will not be able to run spark under a "testing" environment.', 'light_gray', 'red');
+			CLI::newLine();
+
+			return;
+		}
+
+		if (! in_array($env, self::$knownTypes, true))
+		{
+			CLI::error(sprintf('Invalid environment type "%s". Expected one of "%s".', $env, implode('" and "', self::$knownTypes)), 'light_gray', 'red');
+			CLI::newLine();
+
+			return;
+		}
+
+		if (! $this->writeNewEnvironmentToEnvFile($env))
+		{
+			CLI::error('Error in writing new environment to .env file.', 'light_gray', 'red');
+			CLI::newLine();
+
+			return;
+		}
+
+		// force DotEnv to reload the new environment
+		// however we cannot redefine the ENVIRONMENT constant
+		putenv('CI_ENVIRONMENT');
+		unset($_ENV['CI_ENVIRONMENT'], $_SERVER['CI_ENVIRONMENT']);
+		(new DotEnv(ROOTPATH))->load();
+
+		CLI::write(sprintf('Environment is successfully changed to "%s".', $env), 'green');
+		CLI::write('The ENVIRONMENT constant will be changed in the next script execution.');
+		CLI::newLine();
+	}
+
+	/**
+	 * @see https://regex101.com/r/4sSORp/1 for the regex in action
+	 *
+	 * @param string $newEnv
+	 *
+	 * @return boolean
+	 */
+	private function writeNewEnvironmentToEnvFile(string $newEnv): bool
+	{
+		$baseEnv = ROOTPATH . 'env';
+		$envFile = ROOTPATH . '.env';
+
+		if (! is_file($envFile))
+		{
+			if (! is_file($baseEnv))
+			{
+				CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
+				CLI::write('It is impossible to write the new environment type.', 'yellow');
+				CLI::newLine();
+
+				return false;
+			}
+
+			copy($baseEnv, $envFile);
+		}
+
+		$pattern = preg_quote($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, '/');
+		$pattern = sprintf('/^[#\s]*CI_ENVIRONMENT[=\s]+%s$/m', $pattern);
+
+		return file_put_contents(
+			$envFile,
+			preg_replace($pattern, "\nCI_ENVIRONMENT = {$newEnv}", file_get_contents($envFile), -1, $count)
+		) !== false && $count > 0;
+	}
+}
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
new file mode 100644
index 0000000..c2c5dcf
--- /dev/null
+++ b/system/Commands/Utilities/Namespaces.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Autoload;
+
+/**
+ * Lists namespaces set in Config\Autoload with their
+ * full server path. Helps you to verify that you have
+ * the namespaces setup correctly.
+ */
+class Namespaces extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'namespaces';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Verifies your namespaces are setup correctly.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'namespaces';
+
+	/**
+	 * the Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the help for the spark cli script itself.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$config = new Autoload();
+
+		$tbody = [];
+		foreach ($config->psr4 as $ns => $path)
+		{
+			$path = realpath($path) ?: $path;
+
+			$tbody[] = [
+				$ns,
+				realpath($path) ?: $path,
+				is_dir($path) ? 'Yes' : 'MISSING',
+			];
+		}
+
+		$thead = [
+			'Namespace',
+			'Path',
+			'Found?',
+		];
+
+		CLI::table($tbody, $thead);
+	}
+}
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
new file mode 100644
index 0000000..92d240c
--- /dev/null
+++ b/system/Commands/Utilities/Routes.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Services;
+
+/**
+ * Lists all of the user-defined routes. This will include any Routes files
+ * that can be discovered, but will NOT include any routes that are not defined
+ * in a routes file, but are instead discovered through auto-routing.
+ */
+class Routes extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'routes';
+
+	/**
+	 * the Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Displays all of user-defined routes. Does NOT display auto-detected routes.';
+
+	/**
+	 * the Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'routes';
+
+	/**
+	 * the Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the help for the spark cli script itself.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$collection = Services::routes(true);
+		$methods    = [
+			'get',
+			'head',
+			'post',
+			'patch',
+			'put',
+			'delete',
+			'options',
+			'trace',
+			'connect',
+			'cli',
+		];
+
+		$tbody = [];
+		foreach ($methods as $method)
+		{
+			$routes = $collection->getRoutes($method);
+
+			foreach ($routes as $route => $handler)
+			{
+				// filter for strings, as callbacks aren't displayable
+				if (is_string($handler))
+				{
+					$tbody[] = [
+						strtoupper($method),
+						$route,
+						$handler,
+					];
+				}
+			}
+		}
+
+		$thead = [
+			'Method',
+			'Route',
+			'Handler',
+		];
+
+		CLI::table($tbody, $thead);
+	}
+}
diff --git a/system/Common.php b/system/Common.php
new file mode 100644
index 0000000..f975ab3
--- /dev/null
+++ b/system/Common.php
@@ -0,0 +1,1373 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+use CodeIgniter\Cookie\Exceptions\CookieException;
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Debug\Timer;
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Session\Session;
+use CodeIgniter\Test\TestLogger;
+use Config\App;
+use Config\Database;
+use Config\Logger;
+use Config\Services;
+use Config\View;
+use Laminas\Escaper\Escaper;
+
+//--------------------------------------------------------------------
+// Services Convenience Functions
+//--------------------------------------------------------------------
+
+if (! function_exists('app_timezone'))
+{
+	/**
+	 * Returns the timezone the application has been set to display
+	 * dates in. This might be different than the timezone set
+	 * at the server level, as you often want to stores dates in UTC
+	 * and convert them on the fly for the user.
+	 *
+	 * @return string
+	 */
+	function app_timezone(): string
+	{
+		$config = config(App::class);
+
+		return $config->appTimezone;
+	}
+}
+
+if (! function_exists('cache'))
+{
+	/**
+	 * A convenience method that provides access to the Cache
+	 * object. If no parameter is provided, will return the object,
+	 * otherwise, will attempt to return the cached value.
+	 *
+	 * Examples:
+	 *    cache()->save('foo', 'bar');
+	 *    $foo = cache('bar');
+	 *
+	 * @param string|null $key
+	 *
+	 * @return CacheInterface|mixed
+	 */
+	function cache(string $key = null)
+	{
+		$cache = Services::cache();
+
+		// No params - return cache object
+		if (is_null($key))
+		{
+			return $cache;
+		}
+
+		// Still here? Retrieve the value.
+		return $cache->get($key);
+	}
+}
+
+if (! function_exists('clean_path'))
+{
+	/**
+	 * A convenience method to clean paths for
+	 * a nicer looking output. Useful for exception
+	 * handling, error logging, etc.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	function clean_path(string $path): string
+	{
+		// Resolve relative paths
+		$path = realpath($path) ?: $path;
+
+		switch (true)
+		{
+			case strpos($path, APPPATH) === 0:
+				return 'APPPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(APPPATH));
+			case strpos($path, SYSTEMPATH) === 0:
+				return 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(SYSTEMPATH));
+			case strpos($path, FCPATH) === 0:
+				return 'FCPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(FCPATH));
+			case defined('VENDORPATH') && strpos($path, VENDORPATH) === 0:
+				return 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(VENDORPATH));
+			case strpos($path, ROOTPATH) === 0:
+				return 'ROOTPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(ROOTPATH));
+			default:
+				return $path;
+		}
+	}
+}
+
+if (! function_exists('command'))
+{
+	/**
+	 * Runs a single command.
+	 * Input expected in a single string as would
+	 * be used on the command line itself:
+	 *
+	 *  > command('migrate:create SomeMigration');
+	 *
+	 * @param string $command
+	 *
+	 * @return false|string
+	 */
+	function command(string $command)
+	{
+		$runner      = service('commands');
+		$regexString = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
+		$regexQuoted = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
+
+		$args   = [];
+		$length = strlen($command);
+		$cursor = 0;
+
+		/**
+		 * Adopted from Symfony's `StringInput::tokenize()` with few changes.
+		 *
+		 * @see https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Input/StringInput.php
+		 */
+		while ($cursor < $length)
+		{
+			if (preg_match('/\s+/A', $command, $match, 0, $cursor))
+			{
+				// nothing to do
+			}
+			elseif (preg_match('/' . $regexQuoted . '/A', $command, $match, 0, $cursor))
+			{
+				$args[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
+			}
+			elseif (preg_match('/' . $regexString . '/A', $command, $match, 0, $cursor))
+			{
+				$args[] = stripcslashes($match[1]);
+			}
+			else
+			{
+				// @codeCoverageIgnoreStart
+				throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($command, $cursor, 10)));
+				// @codeCoverageIgnoreEnd
+			}
+
+			$cursor += strlen($match[0]);
+		}
+
+		$command     = array_shift($args);
+		$params      = [];
+		$optionValue = false;
+
+		foreach ($args as $i => $arg)
+		{
+			if (mb_strpos($arg, '-') !== 0)
+			{
+				if ($optionValue)
+				{
+					// if this was an option value, it was already
+					// included in the previous iteration
+					$optionValue = false;
+				}
+				else
+				{
+					// add to segments if not starting with '-'
+					// and not an option value
+					$params[] = $arg;
+				}
+
+				continue;
+			}
+
+			$arg   = ltrim($arg, '-');
+			$value = null;
+
+			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
+			{
+				$value       = $args[$i + 1];
+				$optionValue = true;
+			}
+
+			$params[$arg] = $value;
+		}
+
+		ob_start();
+		$runner->run($command, $params);
+
+		return ob_get_clean();
+	}
+}
+
+if (! function_exists('config'))
+{
+	/**
+	 * More simple way of getting config instances from Factories
+	 *
+	 * @param string  $name
+	 * @param boolean $getShared
+	 *
+	 * @return mixed
+	 */
+	function config(string $name, bool $getShared = true)
+	{
+		return Factories::config($name, ['getShared' => $getShared]);
+	}
+}
+
+if (! function_exists('cookie'))
+{
+	/**
+	 * Simpler way to create a new Cookie instance.
+	 *
+	 * @param string $name    Name of the cookie
+	 * @param string $value   Value of the cookie
+	 * @param array  $options Array of options to be passed to the cookie
+	 *
+	 * @throws CookieException
+	 *
+	 * @return Cookie
+	 */
+	function cookie(string $name, string $value = '', array $options = []): Cookie
+	{
+		return new Cookie($name, $value, $options);
+	}
+}
+
+if (! function_exists('cookies'))
+{
+	/**
+	 * Fetches the global `CookieStore` instance held by `Response`.
+	 *
+	 * @param Cookie[] $cookies   If `getGlobal` is false, this is passed to CookieStore's constructor
+	 * @param boolean  $getGlobal If false, creates a new instance of CookieStore
+	 *
+	 * @return CookieStore
+	 */
+	function cookies(array $cookies = [], bool $getGlobal = true): CookieStore
+	{
+		if ($getGlobal)
+		{
+			return Services::response()->getCookieStore();
+		}
+
+		return new CookieStore($cookies);
+	}
+}
+
+if (! function_exists('csrf_token'))
+{
+	/**
+	 * Returns the CSRF token name.
+	 * Can be used in Views when building hidden inputs manually,
+	 * or used in javascript vars when using APIs.
+	 *
+	 * @return string
+	 */
+	function csrf_token(): string
+	{
+		return Services::security()->getTokenName();
+	}
+}
+
+if (! function_exists('csrf_header'))
+{
+	/**
+	 * Returns the CSRF header name.
+	 * Can be used in Views by adding it to the meta tag
+	 * or used in javascript to define a header name when using APIs.
+	 *
+	 * @return string
+	 */
+	function csrf_header(): string
+	{
+		return Services::security()->getHeaderName();
+	}
+}
+
+if (! function_exists('csrf_hash'))
+{
+	/**
+	 * Returns the current hash value for the CSRF protection.
+	 * Can be used in Views when building hidden inputs manually,
+	 * or used in javascript vars for API usage.
+	 *
+	 * @return string
+	 */
+	function csrf_hash(): string
+	{
+		return Services::security()->getHash();
+	}
+}
+
+if (! function_exists('csrf_field'))
+{
+	/**
+	 * Generates a hidden input field for use within manually generated forms.
+	 *
+	 * @param string|null $id
+	 *
+	 * @return string
+	 */
+	function csrf_field(string $id = null): string
+	{
+		return '<input type="hidden"' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '" />';
+	}
+}
+
+if (! function_exists('csrf_meta'))
+{
+	/**
+	 * Generates a meta tag for use within javascript calls.
+	 *
+	 * @param string|null $id
+	 *
+	 * @return string
+	 */
+	function csrf_meta(string $id = null): string
+	{
+		return '<meta' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '" />';
+	}
+}
+
+if (! function_exists('db_connect'))
+{
+	/**
+	 * Grabs a database connection and returns it to the user.
+	 *
+	 * This is a convenience wrapper for \Config\Database::connect()
+	 * and supports the same parameters. Namely:
+	 *
+	 * When passing in $db, you may pass any of the following to connect:
+	 * - group name
+	 * - existing connection instance
+	 * - array of database configuration values
+	 *
+	 * If $getShared === false then a new connection instance will be provided,
+	 * otherwise it will all calls will return the same instance.
+	 *
+	 * @param ConnectionInterface|array|string|null $db
+	 * @param boolean                               $getShared
+	 *
+	 * @return BaseConnection
+	 */
+	function db_connect($db = null, bool $getShared = true)
+	{
+		return Database::connect($db, $getShared);
+	}
+}
+
+if (! function_exists('dd'))
+{
+	/**
+	 * Prints a Kint debug report and exits.
+	 *
+	 * @param array ...$vars
+	 *
+	 * @codeCoverageIgnore Can't be tested ... exits
+	 */
+	function dd(...$vars)
+	{
+		// @codeCoverageIgnoreStart
+		Kint::$aliases[] = 'dd';
+		Kint::dump(...$vars);
+		exit;
+		// @codeCoverageIgnoreEnd
+	}
+}
+
+if (! function_exists('env'))
+{
+	/**
+	 * Allows user to retrieve values from the environment
+	 * variables that have been set. Especially useful for
+	 * retrieving values set from the .env file for
+	 * use in config files.
+	 *
+	 * @param string      $key
+	 * @param string|null $default
+	 *
+	 * @return mixed
+	 */
+	function env(string $key, $default = null)
+	{
+		$value = $_ENV[$key] ?? $_SERVER[$key] ?? getenv($key);
+
+		// Not found? Return the default value
+		if ($value === false)
+		{
+			return $default;
+		}
+
+		// Handle any boolean values
+		switch (strtolower($value))
+		{
+			case 'true':
+				return true;
+			case 'false':
+				return false;
+			case 'empty':
+				return '';
+			case 'null':
+				return null;
+		}
+
+		return $value;
+	}
+}
+
+if (! function_exists('esc'))
+{
+	/**
+	 * Performs simple auto-escaping of data for security reasons.
+	 * Might consider making this more complex at a later date.
+	 *
+	 * If $data is a string, then it simply escapes and returns it.
+	 * If $data is an array, then it loops over it, escaping each
+	 * 'value' of the key/value pairs.
+	 *
+	 * Valid context values: html, js, css, url, attr, raw, null
+	 *
+	 * @param string|array $data
+	 * @param string       $context
+	 * @param string       $encoding
+	 *
+	 * @return string|array
+	 * @throws InvalidArgumentException
+	 */
+	function esc($data, string $context = 'html', string $encoding = null)
+	{
+		if (is_array($data))
+		{
+			foreach ($data as &$value)
+			{
+				$value = esc($value, $context);
+			}
+		}
+
+		if (is_string($data))
+		{
+			$context = strtolower($context);
+
+			// Provide a way to NOT escape data since
+			// this could be called automatically by
+			// the View library.
+			if (empty($context) || $context === 'raw')
+			{
+				return $data;
+			}
+
+			if (! in_array($context, ['html', 'js', 'css', 'url', 'attr'], true))
+			{
+				throw new InvalidArgumentException('Invalid escape context provided.');
+			}
+
+			$method = $context === 'attr' ? 'escapeHtmlAttr' : 'escape' . ucfirst($context);
+
+			static $escaper;
+			if (! $escaper)
+			{
+				$escaper = new Escaper($encoding);
+			}
+
+			if ($encoding && $escaper->getEncoding() !== $encoding)
+			{
+				$escaper = new Escaper($encoding);
+			}
+
+			$data = $escaper->$method($data);
+		}
+
+		return $data;
+	}
+}
+
+if (! function_exists('force_https'))
+{
+	/**
+	 * Used to force a page to be accessed in via HTTPS.
+	 * Uses a standard redirect, plus will set the HSTS header
+	 * for modern browsers that support, which gives best
+	 * protection against man-in-the-middle attacks.
+	 *
+	 * @see https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security
+	 *
+	 * @param integer           $duration How long should the SSL header be set for? (in seconds)
+	 *                                    Defaults to 1 year.
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 *
+	 * @throws HTTPException
+	 */
+	function force_https(int $duration = 31536000, RequestInterface $request = null, ResponseInterface $response = null)
+	{
+		if (is_null($request))
+		{
+			$request = Services::request(null, true);
+		}
+		if (is_null($response))
+		{
+			$response = Services::response(null, true);
+		}
+
+		if ((ENVIRONMENT !== 'testing' && (is_cli() || $request->isSecure())) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'test'))
+		{
+			// @codeCoverageIgnoreStart
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		// If the session status is active, we should regenerate
+		// the session ID for safety sake.
+		if (ENVIRONMENT !== 'testing' && session_status() === PHP_SESSION_ACTIVE)
+		{
+			// @codeCoverageIgnoreStart
+			Services::session(null, true)
+				->regenerate();
+			// @codeCoverageIgnoreEnd
+		}
+
+		$baseURL = config(App::class)->baseURL;
+
+		if (strpos($baseURL, 'https://') === 0)
+		{
+			$baseURL = (string) substr($baseURL, strlen('https://'));
+		}
+		elseif (strpos($baseURL, 'http://') === 0)
+		{
+			$baseURL = (string) substr($baseURL, strlen('http://'));
+		}
+
+		$uri = URI::createURIString(
+			'https', $baseURL, $request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
+			$request->uri->getQuery(), $request->uri->getFragment()
+		);
+
+		// Set an HSTS header
+		$response->setHeader('Strict-Transport-Security', 'max-age=' . $duration);
+		$response->redirect($uri);
+		$response->sendHeaders();
+
+		if (ENVIRONMENT !== 'testing')
+		{
+			// @codeCoverageIgnoreStart
+			exit();
+			// @codeCoverageIgnoreEnd
+		}
+	}
+}
+
+if (! function_exists('function_usable'))
+{
+	/**
+	 * Function usable
+	 *
+	 * Executes a function_exists() check, and if the Suhosin PHP
+	 * extension is loaded - checks whether the function that is
+	 * checked might be disabled in there as well.
+	 *
+	 * This is useful as function_exists() will return FALSE for
+	 * functions disabled via the *disable_functions* php.ini
+	 * setting, but not for *suhosin.executor.func.blacklist* and
+	 * *suhosin.executor.disable_eval*. These settings will just
+	 * terminate script execution if a disabled function is executed.
+	 *
+	 * The above described behavior turned out to be a bug in Suhosin,
+	 * but even though a fix was committed for 0.9.34 on 2012-02-12,
+	 * that version is yet to be released. This function will therefore
+	 * be just temporary, but would probably be kept for a few years.
+	 *
+	 * @link   http://www.hardened-php.net/suhosin/
+	 * @param  string $functionName Function to check for
+	 * @return boolean    TRUE if the function exists and is safe to call,
+	 *             FALSE otherwise.
+	 *
+	 * @codeCoverageIgnore This is too exotic
+	 */
+	function function_usable(string $functionName): bool
+	{
+		static $_suhosin_func_blacklist;
+
+		if (function_exists($functionName))
+		{
+			if (! isset($_suhosin_func_blacklist))
+			{
+				$_suhosin_func_blacklist = extension_loaded('suhosin') ? explode(',', trim(ini_get('suhosin.executor.func.blacklist'))) : [];
+			}
+
+			return ! in_array($functionName, $_suhosin_func_blacklist, true);
+		}
+
+		return false;
+	}
+}
+
+if (! function_exists('helper'))
+{
+	/**
+	 * Loads a helper file into memory. Supports namespaced helpers,
+	 * both in and out of the 'helpers' directory of a namespaced directory.
+	 *
+	 * Will load ALL helpers of the matching name, in the following order:
+	 *   1. app/Helpers
+	 *   2. {namespace}/Helpers
+	 *   3. system/Helpers
+	 *
+	 * @param  string|array $filenames
+	 * @throws FileNotFoundException
+	 */
+	function helper($filenames)
+	{
+		static $loaded = [];
+
+		$loader = Services::locator(true);
+
+		if (! is_array($filenames))
+		{
+			$filenames = [$filenames];
+		}
+
+		// Store a list of all files to include...
+		$includes = [];
+
+		foreach ($filenames as $filename)
+		{
+			// Store our system and application helper
+			// versions so that we can control the load ordering.
+			$systemHelper  = null;
+			$appHelper     = null;
+			$localIncludes = [];
+
+			if (strpos($filename, '_helper') === false)
+			{
+				$filename .= '_helper';
+			}
+
+			// Check if this helper has already been loaded
+			if (in_array($filename, $loaded, true))
+			{
+				continue;
+			}
+
+			// If the file is namespaced, we'll just grab that
+			// file and not search for any others
+			if (strpos($filename, '\\') !== false)
+			{
+				$path = $loader->locateFile($filename, 'Helpers');
+
+				if (empty($path))
+				{
+					throw FileNotFoundException::forFileNotFound($filename);
+				}
+
+				$includes[] = $path;
+				$loaded[]   = $filename;
+			}
+
+			// No namespaces, so search in all available locations
+			else
+			{
+				$paths = $loader->search('Helpers/' . $filename);
+
+				if (! empty($paths))
+				{
+					foreach ($paths as $path)
+					{
+						if (strpos($path, APPPATH) === 0)
+						{
+							// @codeCoverageIgnoreStart
+							$appHelper = $path;
+							// @codeCoverageIgnoreEnd
+						}
+						elseif (strpos($path, SYSTEMPATH) === 0)
+						{
+							$systemHelper = $path;
+						}
+						else
+						{
+							$localIncludes[] = $path;
+							$loaded[]        = $filename;
+						}
+					}
+				}
+
+				// App-level helpers should override all others
+				if (! empty($appHelper))
+				{
+					// @codeCoverageIgnoreStart
+					$includes[] = $appHelper;
+					$loaded[]   = $filename;
+					// @codeCoverageIgnoreEnd
+				}
+
+				// All namespaced files get added in next
+				$includes = array_merge($includes, $localIncludes);
+
+				// And the system default one should be added in last.
+				if (! empty($systemHelper))
+				{
+					$includes[] = $systemHelper;
+					$loaded[]   = $filename;
+				}
+			}
+		}
+
+		// Now actually include all of the files
+		if (! empty($includes))
+		{
+			foreach ($includes as $path)
+			{
+				include_once($path);
+			}
+		}
+	}
+}
+
+if (! function_exists('is_cli'))
+{
+	/**
+	 * Check if PHP was invoked from the command line.
+	 *
+	 * @return boolean
+	 *
+	 * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in CLI
+	 */
+	function is_cli(): bool
+	{
+		if (PHP_SAPI === 'cli')
+		{
+			return true;
+		}
+
+		if (defined('STDIN'))
+		{
+			return true;
+		}
+
+		if (stristr(PHP_SAPI, 'cgi') && getenv('TERM'))
+		{
+			return true;
+		}
+
+		if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0)
+		{
+			return true;
+		}
+
+		// if source of request is from CLI, the `$_SERVER` array will not populate this key
+		return ! isset($_SERVER['REQUEST_METHOD']);
+	}
+}
+
+if (! function_exists('is_really_writable'))
+{
+	/**
+	 * Tests for file writability
+	 *
+	 * is_writable() returns TRUE on Windows servers when you really can't write to
+	 * the file, based on the read-only attribute. is_writable() is also unreliable
+	 * on Unix servers if safe_mode is on.
+	 *
+	 * @link https://bugs.php.net/bug.php?id=54709
+	 *
+	 * @param string $file
+	 *
+	 * @return boolean
+	 *
+	 * @throws             Exception
+	 * @codeCoverageIgnore Not practical to test, as travis runs on linux
+	 */
+	function is_really_writable(string $file): bool
+	{
+		// If we're on a Unix server with safe_mode off we call is_writable
+		if (DIRECTORY_SEPARATOR === '/' || ! ini_get('safe_mode'))
+		{
+			return is_writable($file);
+		}
+
+		/* For Windows servers and safe_mode "on" installations we'll actually
+		 * write a file then read it. Bah...
+		 */
+		if (is_dir($file))
+		{
+			$file = rtrim($file, '/') . '/' . bin2hex(random_bytes(16));
+			if (($fp = @fopen($file, 'ab')) === false)
+			{
+				return false;
+			}
+
+			fclose($fp);
+			@chmod($file, 0777);
+			@unlink($file);
+
+			return true;
+		}
+
+		if (! is_file($file) || ($fp = @fopen($file, 'ab')) === false)
+		{
+			return false;
+		}
+
+		fclose($fp);
+
+		return true;
+	}
+}
+
+if (! function_exists('lang'))
+{
+	/**
+	 * A convenience method to translate a string or array of them and format
+	 * the result with the intl extension's MessageFormatter.
+	 *
+	 * @param string      $line
+	 * @param array       $args
+	 * @param string|null $locale
+	 *
+	 * @return string
+	 */
+	function lang(string $line, array $args = [], string $locale = null)
+	{
+		return Services::language($locale)
+			->getLine($line, $args);
+	}
+}
+
+if (! function_exists('log_message'))
+{
+	/**
+	 * A convenience/compatibility method for logging events through
+	 * the Log system.
+	 *
+	 * Allowed log levels are:
+	 *  - emergency
+	 *  - alert
+	 *  - critical
+	 *  - error
+	 *  - warning
+	 *  - notice
+	 *  - info
+	 *  - debug
+	 *
+	 * @param string $level
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return mixed
+	 */
+	function log_message(string $level, string $message, array $context = [])
+	{
+		// When running tests, we want to always ensure that the
+		// TestLogger is running, which provides utilities for
+		// for asserting that logs were called in the test code.
+		if (ENVIRONMENT === 'testing')
+		{
+			$logger = new TestLogger(new Logger());
+
+			return $logger->log($level, $message, $context);
+		}
+
+		// @codeCoverageIgnoreStart
+		return Services::logger(true)
+			->log($level, $message, $context);
+		// @codeCoverageIgnoreEnd
+	}
+}
+
+if (! function_exists('model'))
+{
+	/**
+	 * More simple way of getting model instances from Factories
+	 *
+	 * @param string                   $name
+	 * @param boolean                  $getShared
+	 * @param ConnectionInterface|null $conn
+	 *
+	 * @return mixed
+	 */
+	function model(string $name, bool $getShared = true, ConnectionInterface &$conn = null)
+	{
+		return Factories::models($name, ['getShared' => $getShared], $conn);
+	}
+}
+
+if (! function_exists('old'))
+{
+	/**
+	 * Provides access to "old input" that was set in the session
+	 * during a redirect()->withInput().
+	 *
+	 * @param string         $key
+	 * @param null           $default
+	 * @param string|boolean $escape
+	 *
+	 * @return mixed|null
+	 */
+	function old(string $key, $default = null, $escape = 'html')
+	{
+		// Ensure the session is loaded
+		if (session_status() === PHP_SESSION_NONE && ENVIRONMENT !== 'testing')
+		{
+			// @codeCoverageIgnoreStart
+			session();
+			// @codeCoverageIgnoreEnd
+		}
+
+		$request = Services::request();
+
+		$value = $request->getOldInput($key);
+
+		// Return the default value if nothing
+		// found in the old input.
+		if (is_null($value))
+		{
+			return $default;
+		}
+
+		// If the result was serialized array or string, then unserialize it for use...
+		if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0))
+		{
+			$value = unserialize($value);
+		}
+
+		return $escape === false ? $value : esc($value, $escape);
+	}
+}
+
+if (! function_exists('redirect'))
+{
+	/**
+	 * Convenience method that works with the current global $request and
+	 * $router instances to redirect using named/reverse-routed routes
+	 * to determine the URL to go to. If nothing is found, will treat
+	 * as a traditional redirect and pass the string in, letting
+	 * $response->redirect() determine the correct method and code.
+	 *
+	 * If more control is needed, you must use $response->redirect explicitly.
+	 *
+	 * @param string $route
+	 *
+	 * @return RedirectResponse
+	 */
+	function redirect(string $route = null): RedirectResponse
+	{
+		$response = Services::redirectresponse(null, true);
+
+		if (! empty($route))
+		{
+			return $response->route($route);
+		}
+
+		return $response;
+	}
+}
+
+if (! function_exists('remove_invisible_characters'))
+{
+	/**
+	 * Remove Invisible Characters
+	 *
+	 * This prevents sandwiching null characters
+	 * between ascii characters, like Java\0script.
+	 *
+	 * @param string  $str
+	 * @param boolean $urlEncoded
+	 *
+	 * @return string
+	 */
+	function remove_invisible_characters(string $str, bool $urlEncoded = true): string
+	{
+		$nonDisplayables = [];
+
+		// every control character except newline (dec 10),
+		// carriage return (dec 13) and horizontal tab (dec 09)
+		if ($urlEncoded)
+		{
+			$nonDisplayables[] = '/%0[0-8bcef]/';  // url encoded 00-08, 11, 12, 14, 15
+			$nonDisplayables[] = '/%1[0-9a-f]/';   // url encoded 16-31
+		}
+
+		$nonDisplayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';   // 00-08, 11, 12, 14-31, 127
+
+		do
+		{
+			$str = preg_replace($nonDisplayables, '', $str, -1, $count);
+		}
+		while ($count);
+
+		return $str;
+	}
+}
+
+if (! function_exists('route_to'))
+{
+	/**
+	 * Given a controller/method string and any params,
+	 * will attempt to build the relative URL to the
+	 * matching route.
+	 *
+	 * NOTE: This requires the controller/method to
+	 * have a route defined in the routes Config file.
+	 *
+	 * @param string $method
+	 * @param mixed  ...$params
+	 *
+	 * @return false|string
+	 */
+	function route_to(string $method, ...$params)
+	{
+		return Services::routes()->reverseRoute($method, ...$params);
+	}
+}
+
+if (! function_exists('session'))
+{
+	/**
+	 * A convenience method for accessing the session instance,
+	 * or an item that has been set in the session.
+	 *
+	 * Examples:
+	 *    session()->set('foo', 'bar');
+	 *    $foo = session('bar');
+	 *
+	 * @param string $val
+	 *
+	 * @return Session|mixed|null
+	 */
+	function session(string $val = null)
+	{
+		$session = Services::session();
+
+		// Returning a single item?
+		if (is_string($val))
+		{
+			return $session->get($val);
+		}
+
+		return $session;
+	}
+}
+
+if (! function_exists('service'))
+{
+	/**
+	 * Allows cleaner access to the Services Config file.
+	 * Always returns a SHARED instance of the class, so
+	 * calling the function multiple times should always
+	 * return the same instance.
+	 *
+	 * These are equal:
+	 *  - $timer = service('timer')
+	 *  - $timer = \CodeIgniter\Config\Services::timer();
+	 *
+	 * @param string $name
+	 * @param mixed  ...$params
+	 *
+	 * @return mixed
+	 */
+	function service(string $name, ...$params)
+	{
+		return Services::$name(...$params);
+	}
+}
+
+if (! function_exists('single_service'))
+{
+	/**
+	 * Always returns a new instance of the class.
+	 *
+	 * @param string $name
+	 * @param mixed  ...$params
+	 *
+	 * @return mixed
+	 */
+	function single_service(string $name, ...$params)
+	{
+		$service = Services::serviceExists($name);
+
+		if ($service === null)
+		{
+			// The service is not defined anywhere so just return.
+			return null;
+		}
+
+		$method = new ReflectionMethod($service, $name);
+		$count  = $method->getNumberOfParameters();
+		$mParam = $method->getParameters();
+		$params = $params ?? [];
+
+		if ($count === 1)
+		{
+			// This service needs only one argument, which is the shared
+			// instance flag, so let's wrap up and pass false here.
+			return $service::$name(false);
+		}
+
+		// Fill in the params with the defaults, but stop before the last
+		for ($startIndex = count($params); $startIndex <= $count - 2; $startIndex++)
+		{
+			$params[$startIndex] = $mParam[$startIndex]->getDefaultValue();
+		}
+
+		// Ensure the last argument will not create a shared instance
+		$params[$count - 1] = false;
+
+		return $service::$name(...$params);
+	}
+}
+
+if (! function_exists('slash_item'))
+{
+	//Unlike CI3, this function is placed here because
+	//it's not a config, or part of a config.
+	/**
+	 * Fetch a config file item with slash appended (if not empty)
+	 *
+	 * @param string $item Config item name
+	 *
+	 * @return string|null The configuration item or NULL if
+	 * the item doesn't exist
+	 */
+	function slash_item(string $item): ?string
+	{
+		$config     = config(App::class);
+		$configItem = $config->{$item};
+
+		if (! isset($configItem) || empty(trim($configItem)))
+		{
+			return $configItem;
+		}
+
+		return rtrim($configItem, '/') . '/';
+	}
+}
+
+if (! function_exists('stringify_attributes'))
+{
+	/**
+	 * Stringify attributes for use in HTML tags.
+	 *
+	 * Helper function used to convert a string, array, or object
+	 * of attributes to a string.
+	 *
+	 * @param mixed   $attributes string, array, object
+	 * @param boolean $js
+	 *
+	 * @return string
+	 */
+	function stringify_attributes($attributes, bool $js = false): string
+	{
+		$atts = '';
+
+		if (empty($attributes))
+		{
+			return $atts;
+		}
+
+		if (is_string($attributes))
+		{
+			return ' ' . $attributes;
+		}
+
+		$attributes = (array) $attributes;
+
+		foreach ($attributes as $key => $val)
+		{
+			$atts .= ($js) ? $key . '=' . esc($val, 'js') . ',' : ' ' . $key . '="' . esc($val) . '"';
+		}
+
+		return rtrim($atts, ',');
+	}
+}
+
+if (! function_exists('timer'))
+{
+	/**
+	 * A convenience method for working with the timer.
+	 * If no parameter is passed, it will return the timer instance,
+	 * otherwise will start or stop the timer intelligently.
+	 *
+	 * @param string|null $name
+	 *
+	 * @return Timer|mixed
+	 */
+	function timer(string $name = null)
+	{
+		$timer = Services::timer();
+
+		if (empty($name))
+		{
+			return $timer;
+		}
+
+		if ($timer->has($name))
+		{
+			return $timer->stop($name);
+		}
+
+		return $timer->start($name);
+	}
+}
+
+if (! function_exists('trace'))
+{
+	/**
+	 * Provides a backtrace to the current execution point, from Kint.
+	 */
+	function trace()
+	{
+		Kint::$aliases[] = 'trace';
+		Kint::trace();
+	}
+}
+
+if (! function_exists('view'))
+{
+	/**
+	 * Grabs the current RendererInterface-compatible class
+	 * and tells it to render the specified view. Simply provides
+	 * a convenience method that can be used in Controllers,
+	 * libraries, and routed closures.
+	 *
+	 * NOTE: Does not provide any escaping of the data, so that must
+	 * all be handled manually by the developer.
+	 *
+	 * @param string $name
+	 * @param array  $data
+	 * @param array  $options Unused - reserved for third-party extensions.
+	 *
+	 * @return string
+	 */
+	function view(string $name, array $data = [], array $options = []): string
+	{
+		/**
+		 * @var CodeIgniter\View\View $renderer
+		 */
+		$renderer = Services::renderer();
+
+		$saveData = config(View::class)->saveData;
+
+		if (array_key_exists('saveData', $options))
+		{
+			$saveData = (bool) $options['saveData'];
+			unset($options['saveData']);
+		}
+
+		return $renderer->setData($data, 'raw')
+						->render($name, $options, $saveData);
+	}
+}
+
+if (! function_exists('view_cell'))
+{
+	/**
+	 * View cells are used within views to insert HTML chunks that are managed
+	 * by other classes.
+	 *
+	 * @param string      $library
+	 * @param null        $params
+	 * @param integer     $ttl
+	 * @param string|null $cacheName
+	 *
+	 * @return string
+	 * @throws ReflectionException
+	 */
+	function view_cell(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
+	{
+		return Services::viewcell()
+			->render($library, $params, $ttl, $cacheName);
+	}
+}
+
+/**
+ * These helpers come from Laravel so will not be
+ * re-tested and can be ignored safely.
+ *
+ * @see https://github.com/laravel/framework/blob/8.x/src/Illuminate/Support/helpers.php
+ */
+if (! function_exists('class_basename'))
+{
+	/**
+	 * Get the class "basename" of the given object / class.
+	 *
+	 * @param string|object $class
+	 *
+	 * @return string
+	 *
+	 * @codeCoverageIgnore
+	 */
+	function class_basename($class)
+	{
+		$class = is_object($class) ? get_class($class) : $class;
+
+		return basename(str_replace('\\', '/', $class));
+	}
+}
+
+if (! function_exists('class_uses_recursive'))
+{
+	/**
+	 * Returns all traits used by a class, its parent classes and trait of their traits.
+	 *
+	 * @param object|string $class
+	 *
+	 * @return array
+	 *
+	 * @codeCoverageIgnore
+	 */
+	function class_uses_recursive($class)
+	{
+		if (is_object($class))
+		{
+			$class = get_class($class);
+		}
+
+		$results = [];
+
+		// @phpstan-ignore-next-line
+		foreach (array_reverse(class_parents($class)) + [$class => $class] as $class)
+		{
+			$results += trait_uses_recursive($class);
+		}
+
+		return array_unique($results);
+	}
+}
+
+if (! function_exists('trait_uses_recursive'))
+{
+	/**
+	 * Returns all traits used by a trait and its traits.
+	 *
+	 * @param string $trait
+	 *
+	 * @return array
+	 *
+	 * @codeCoverageIgnore
+	 */
+	function trait_uses_recursive($trait)
+	{
+		$traits = class_uses($trait) ?: [];
+
+		foreach ($traits as $trait)
+		{
+			$traits += trait_uses_recursive($trait);
+		}
+
+		return $traits;
+	}
+}
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
new file mode 100644
index 0000000..612cb85
--- /dev/null
+++ b/system/ComposerScripts.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use FilesystemIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use SplFileInfo;
+
+/**
+ * This class is used by Composer during installs and updates
+ * to move files to locations within the system folder so that end-users
+ * do not need to use Composer to install a package, but can simply
+ * download.
+ *
+ * @codeCoverageIgnore
+ *
+ * @internal
+ */
+final class ComposerScripts
+{
+	/**
+	 * Path to the ThirdParty directory.
+	 *
+	 * @var string
+	 */
+	private static $path = __DIR__ . '/ThirdParty/';
+
+	/**
+	 * Direct dependencies of CodeIgniter to copy
+	 * contents to `system/ThirdParty/`.
+	 *
+	 * @var array<string, array<string, string>>
+	 */
+	private static $dependencies = [
+		'kint-src' => [
+			'from' => __DIR__ . '/../vendor/kint-php/kint/src/',
+			'to'   => __DIR__ . '/ThirdParty/Kint/',
+		],
+		'kint-resources' => [
+			'from' => __DIR__ . '/../vendor/kint-php/kint/resources/',
+			'to'   => __DIR__ . '/ThirdParty/Kint/resources/',
+		],
+		'escaper' => [
+			'from' => __DIR__ . '/../vendor/laminas/laminas-escaper/src/',
+			'to'   => __DIR__ . '/ThirdParty/Escaper/',
+		],
+		'psr-log' => [
+			'from' => __DIR__ . '/../vendor/psr/log/Psr/Log/',
+			'to'   => __DIR__ . '/ThirdParty/PSR/Log/',
+		],
+	];
+
+	/**
+	 * This static method is called by Composer after every update event,
+	 * i.e., `composer install`, `composer update`, `composer remove`.
+	 *
+	 * @return void
+	 */
+	public static function postUpdate()
+	{
+		self::recursiveDelete(self::$path);
+
+		foreach (self::$dependencies as $dependency)
+		{
+			self::recursiveMirror($dependency['from'], $dependency['to']);
+		}
+
+		self::copyKintInitFiles();
+		self::recursiveDelete(self::$dependencies['psr-log']['to'] . 'Test/');
+	}
+
+	/**
+	 * Recursively remove the contents of the previous `system/ThirdParty`.
+	 *
+	 * @param string $directory
+	 *
+	 * @return void
+	 */
+	private static function recursiveDelete(string $directory): void
+	{
+		if (! is_dir($directory))
+		{
+			echo sprintf('Cannot recursively delete "%s" as it does not exist.', $directory);
+		}
+
+		/** @var SplFileInfo $file */
+		foreach (new RecursiveIteratorIterator(
+			new RecursiveDirectoryIterator(rtrim($directory, '\\/'), FilesystemIterator::SKIP_DOTS),
+			RecursiveIteratorIterator::CHILD_FIRST
+		) as $file)
+		{
+			$path = $file->getPathname();
+
+			if ($file->isDir())
+			{
+				@rmdir($path);
+			}
+			else
+			{
+				@unlink($path);
+			}
+		}
+	}
+
+	/**
+	 * Recursively copy the files and directories of the origin directory
+	 * into the target directory, i.e. "mirror" its contents.
+	 *
+	 * @param string $originDir
+	 * @param string $targetDir
+	 *
+	 * @return void
+	 */
+	private static function recursiveMirror(string $originDir, string $targetDir): void
+	{
+		$originDir = rtrim($originDir, '\\/');
+		$targetDir = rtrim($targetDir, '\\/');
+
+		if (! is_dir($originDir))
+		{
+			echo sprintf('The origin directory "%s" was not found.', $originDir);
+			exit(1);
+		}
+
+		if (is_dir($targetDir))
+		{
+			echo sprintf('The target directory "%s" is existing. Run %s::recursiveDelete(\'%s\') first.', $targetDir, self::class, $targetDir);
+			exit(1);
+		}
+
+		@mkdir($targetDir, 0755, true);
+
+		$dirLen = strlen($originDir);
+
+		/** @var SplFileInfo $file */
+		foreach (new RecursiveIteratorIterator(
+			new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
+			RecursiveIteratorIterator::SELF_FIRST
+		) as $file)
+		{
+			$origin = $file->getPathname();
+			$target = $targetDir . substr($origin, $dirLen);
+
+			if ($file->isDir())
+			{
+				@mkdir($target, 0755);
+			}
+			else
+			{
+				@copy($origin, $target);
+			}
+		}
+	}
+
+	/**
+	 * Copy Kint's init files into `system/ThirdParty/Kint/`
+	 *
+	 * @return void
+	 */
+	private static function copyKintInitFiles(): void
+	{
+		$originDir = self::$dependencies['kint-src']['from'] . '../';
+		$targetDir = self::$dependencies['kint-src']['to'];
+
+		foreach (['init.php', 'init_helpers.php'] as $kintInit)
+		{
+			@copy($originDir . $kintInit, $targetDir . $kintInit);
+		}
+	}
+}
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
new file mode 100644
index 0000000..a90d99b
--- /dev/null
+++ b/system/Config/AutoloadConfig.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * AUTOLOADER CONFIGURATION
+ *
+ * This file defines the namespaces and class maps so the Autoloader
+ * can find the files as needed.
+ */
+class AutoloadConfig
+{
+	/**
+	 * -------------------------------------------------------------------
+	 * Namespaces
+	 * -------------------------------------------------------------------
+	 * This maps the locations of any namespaces in your application to
+	 * their location on the file system. These are used by the autoloader
+	 * to locate files the first time they have been instantiated.
+	 *
+	 * The '/app' and '/system' directories are already mapped for you.
+	 * you may change the name of the 'App' namespace if you wish,
+	 * but this should be done prior to creating any namespaced classes,
+	 * else you will need to modify all of those classes for this to work.
+	 *
+	 * @var array<string, string>
+	 */
+	public $psr4 = [];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Class Map
+	 * -------------------------------------------------------------------
+	 * The class map provides a map of class names and their exact
+	 * location on the drive. Classes loaded in this manner will have
+	 * slightly faster performance because they will not have to be
+	 * searched for within one or more directories as they would if they
+	 * were being autoloaded through a namespace.
+	 *
+	 * @var array<string, string>
+	 */
+	public $classmap = [];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Files
+	 * -------------------------------------------------------------------
+	 * The files array provides a list of paths to __non-class__ files
+	 * that will be autoloaded. This can be useful for bootstrap operations
+	 * or for loading functions.
+	 *
+	 * @var array<int, string>
+	 */
+	public $files = [];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Namespaces
+	 * -------------------------------------------------------------------
+	 * This maps the locations of any namespaces in your application to
+	 * their location on the file system. These are used by the autoloader
+	 * to locate files the first time they have been instantiated.
+	 *
+	 * Do not change the name of the CodeIgniter namespace or your application
+	 * will break.
+	 *
+	 * @var array<string, string>
+	 */
+	protected $corePsr4 = [
+		'CodeIgniter' => SYSTEMPATH,
+		'App'         => APPPATH, // To ensure filters, etc still found,
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Class Map
+	 * -------------------------------------------------------------------
+	 * The class map provides a map of class names and their exact
+	 * location on the drive. Classes loaded in this manner will have
+	 * slightly faster performance because they will not have to be
+	 * searched for within one or more directories as they would if they
+	 * were being autoloaded through a namespace.
+	 *
+	 * @var array<string, string>
+	 */
+	protected $coreClassmap = [
+		'Psr\Log\AbstractLogger'           => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+		'Psr\Log\InvalidArgumentException' => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
+		'Psr\Log\LoggerAwareInterface'     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
+		'Psr\Log\LoggerAwareTrait'         => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
+		'Psr\Log\LoggerInterface'          => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+		'Psr\Log\LoggerTrait'              => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
+		'Psr\Log\LogLevel'                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+		'Psr\Log\NullLogger'               => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
+		'Laminas\Escaper\Escaper'          => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Core Files
+	 * -------------------------------------------------------------------
+	 * List of files from the framework to be autoloaded early.
+	 *
+	 * @var array<int, string>
+	 */
+	protected $coreFiles = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * Merge the built-in and developer-configured psr4 and classmap,
+	 * with preference to the developer ones.
+	 */
+	public function __construct()
+	{
+		if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
+		{
+			$this->psr4['Tests\Support']                  = SUPPORTPATH;
+			$this->classmap['CodeIgniter\Log\TestLogger'] = SYSTEMPATH . 'Test/TestLogger.php';
+			$this->classmap['CIDatabaseTestCase']         = SYSTEMPATH . 'Test/CIDatabaseTestCase.php';
+		}
+
+		$this->psr4     = array_merge($this->corePsr4, $this->psr4);
+		$this->classmap = array_merge($this->coreClassmap, $this->classmap);
+		$this->files    = array_merge($this->coreFiles, $this->files);
+	}
+}
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
new file mode 100644
index 0000000..f5a08b5
--- /dev/null
+++ b/system/Config/BaseConfig.php
@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+use Config\Encryption;
+use Config\Modules;
+use Config\Services;
+use ReflectionClass;
+use ReflectionException;
+use RuntimeException;
+
+/**
+ * Class BaseConfig
+ *
+ * Not intended to be used on its own, this class will attempt to
+ * automatically populate the child class' properties with values
+ * from the environment.
+ *
+ * These can be set within the .env file.
+ */
+class BaseConfig
+{
+	/**
+	 * An optional array of classes that will act as Registrars
+	 * for rapidly setting config class properties.
+	 *
+	 * @var array
+	 */
+	public static $registrars = [];
+
+	/**
+	 * Has module discovery happened yet?
+	 *
+	 * @var boolean
+	 */
+	protected static $didDiscovery = false;
+
+	/**
+	 * The modules configuration.
+	 *
+	 * @var Modules
+	 */
+	protected static $moduleConfig;
+
+	/**
+	 * Will attempt to get environment variables with names
+	 * that match the properties of the child class.
+	 *
+	 * The "shortPrefix" is the lowercase-only config class name.
+	 */
+	public function __construct()
+	{
+		static::$moduleConfig = config('Modules');
+
+		$this->registerProperties();
+
+		$properties  = array_keys(get_object_vars($this));
+		$prefix      = static::class;
+		$slashAt     = strrpos($prefix, '\\');
+		$shortPrefix = strtolower(substr($prefix, $slashAt === false ? 0 : $slashAt + 1));
+
+		foreach ($properties as $property)
+		{
+			$this->initEnvValue($this->$property, $property, $prefix, $shortPrefix);
+
+			if ($this instanceof Encryption && $property === 'key')
+			{
+				// Handle hex2bin prefix
+				if (strpos($this->$property, 'hex2bin:') === 0)
+				{
+					$this->$property = hex2bin(substr($this->$property, 8));
+				}
+				// Handle base64 prefix
+				elseif (strpos($this->$property, 'base64:') === 0)
+				{
+					$this->$property = base64_decode(substr($this->$property, 7), true);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Initialization an environment-specific configuration setting
+	 *
+	 * @param mixed  $property
+	 * @param string $name
+	 * @param string $prefix
+	 * @param string $shortPrefix
+	 *
+	 * @return mixed
+	 */
+	protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix)
+	{
+		if (is_array($property))
+		{
+			foreach (array_keys($property) as $key)
+			{
+				$this->initEnvValue($property[$key], "{$name}.{$key}", $prefix, $shortPrefix);
+			}
+		}
+		elseif (($value = $this->getEnvValue($name, $prefix, $shortPrefix)) !== false && ! is_null($value))
+		{
+			if ($value === 'false')
+			{
+				$value = false;
+			}
+			elseif ($value === 'true')
+			{
+				$value = true;
+			}
+			$property = is_bool($value) ? $value : trim($value, '\'"');
+		}
+		return $property;
+	}
+
+	/**
+	 * Retrieve an environment-specific configuration setting
+	 *
+	 * @param string $property
+	 * @param string $prefix
+	 * @param string $shortPrefix
+	 *
+	 * @return mixed
+	 */
+	protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
+	{
+		$shortPrefix = ltrim($shortPrefix, '\\');
+
+		switch (true)
+		{
+			case array_key_exists("{$shortPrefix}.{$property}", $_ENV):
+				return $_ENV["{$shortPrefix}.{$property}"];
+			case array_key_exists("{$shortPrefix}.{$property}", $_SERVER):
+				return $_SERVER["{$shortPrefix}.{$property}"];
+			case array_key_exists("{$prefix}.{$property}", $_ENV):
+				return $_ENV["{$prefix}.{$property}"];
+			case array_key_exists("{$prefix}.{$property}", $_SERVER):
+				return $_SERVER["{$prefix}.{$property}"];
+			default:
+				$value = getenv("{$shortPrefix}.{$property}");
+				$value = $value === false ? getenv("{$prefix}.{$property}") : $value;
+
+				return $value === false ? null : $value;
+		}
+	}
+
+	/**
+	 * Provides external libraries a simple way to register one or more
+	 * options into a config file.
+	 *
+	 * @throws ReflectionException
+	 */
+	protected function registerProperties()
+	{
+		if (! static::$moduleConfig->shouldDiscover('registrars'))
+		{
+			return;
+		}
+
+		if (! static::$didDiscovery)
+		{
+			$locator         = Services::locator();
+			$registrarsFiles = $locator->search('Config/Registrar.php');
+
+			foreach ($registrarsFiles as $file)
+			{
+				$className            = $locator->getClassname($file);
+				static::$registrars[] = new $className();
+			}
+
+			static::$didDiscovery = true;
+		}
+
+		$shortName = (new ReflectionClass($this))->getShortName();
+
+		// Check the registrar class for a method named after this class' shortName
+		foreach (static::$registrars as $callable)
+		{
+			// ignore non-applicable registrars
+			if (! method_exists($callable, $shortName))
+			{
+				// @codeCoverageIgnoreStart
+				continue;
+				// @codeCoverageIgnoreEnd
+			}
+
+			$properties = $callable::$shortName();
+
+			if (! is_array($properties))
+			{
+				throw new RuntimeException('Registrars must return an array of properties and their values.');
+			}
+
+			foreach ($properties as $property => $value)
+			{
+				if (isset($this->$property) && is_array($this->$property) && is_array($value))
+				{
+					$this->$property = array_merge($this->$property, $value);
+				}
+				else
+				{
+					$this->$property = $value;
+				}
+			}
+		}
+	}
+}
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
new file mode 100644
index 0000000..21985e9
--- /dev/null
+++ b/system/Config/BaseService.php
@@ -0,0 +1,420 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+use CodeIgniter\Autoloader\Autoloader;
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\CLI\Commands;
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Database\MigrationRunner;
+use CodeIgniter\Debug\Exceptions;
+use CodeIgniter\Debug\Iterator;
+use CodeIgniter\Debug\Timer;
+use CodeIgniter\Debug\Toolbar;
+use CodeIgniter\Email\Email;
+use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\Filters\Filters;
+use CodeIgniter\Format\Format;
+use CodeIgniter\Honeypot\Honeypot;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\CURLRequest;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Negotiate;
+use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Images\Handlers\BaseHandler;
+use CodeIgniter\Language\Language;
+use CodeIgniter\Log\Logger;
+use CodeIgniter\Pager\Pager;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Router\RouteCollectionInterface;
+use CodeIgniter\Router\Router;
+use CodeIgniter\Security\Security;
+use CodeIgniter\Session\Session;
+use CodeIgniter\Throttle\Throttler;
+use CodeIgniter\Typography\Typography;
+use CodeIgniter\Validation\Validation;
+use CodeIgniter\View\Cell;
+use CodeIgniter\View\Parser;
+use CodeIgniter\View\RendererInterface;
+use CodeIgniter\View\View;
+use Config\App;
+use Config\Autoload;
+use Config\Cache;
+use Config\Encryption;
+use Config\Exceptions as ConfigExceptions;
+use Config\Filters as ConfigFilters;
+use Config\Format as ConfigFormat;
+use Config\Honeypot as ConfigHoneyPot;
+use Config\Images;
+use Config\Migrations;
+use Config\Modules;
+use Config\Pager as ConfigPager;
+use Config\Services as AppServices;
+use Config\Toolbar as ConfigToolbar;
+use Config\Validation as ConfigValidation;
+use Config\View as ConfigView;
+
+/**
+ * Services Configuration file.
+ *
+ * Services are simply other classes/libraries that the system uses
+ * to do its job. This is used by CodeIgniter to allow the core of the
+ * framework to be swapped out easily without affecting the usage within
+ * the rest of your application.
+ *
+ * This is used in place of a Dependency Injection container primarily
+ * due to its simplicity, which allows a better long-term maintenance
+ * of the applications built on top of CodeIgniter. A bonus side-effect
+ * is that IDEs are able to determine what class you are calling
+ * whereas with DI Containers there usually isn't a way for them to do this.
+ *
+ * Warning: To allow overrides by service providers do not use static calls,
+ * instead call out to \Config\Services (imported as AppServices).
+ *
+ * @see http://blog.ircmaxell.com/2015/11/simple-easy-risk-and-change.html
+ * @see http://www.infoq.com/presentations/Simple-Made-Easy
+ *
+ * @method static CacheInterface cache(Cache $config = null, $getShared = true)
+ * @method static CLIRequest clirequest(App $config = null, $getShared = true)
+ * @method static CodeIgniter codeigniter(App $config = null, $getShared = true)
+ * @method static Commands commands($getShared = true)
+ * @method static CURLRequest curlrequest($options = [], ResponseInterface $response = null, App $config = null, $getShared = true)
+ * @method static Email email($config = null, $getShared = true)
+ * @method static EncrypterInterface encrypter(Encryption $config = null, $getShared = false)
+ * @method static Exceptions exceptions(ConfigExceptions $config = null, IncomingRequest $request = null, Response $response = null, $getShared = true)
+ * @method static Filters filters(ConfigFilters $config = null, $getShared = true)
+ * @method static Format format(ConfigFormat $config = null, $getShared = true)
+ * @method static Honeypot honeypot(ConfigHoneyPot $config = null, $getShared = true)
+ * @method static BaseHandler image($handler = null, Images $config = null, $getShared = true)
+ * @method static Iterator iterator($getShared = true)
+ * @method static Language language($locale = null, $getShared = true)
+ * @method static Logger logger($getShared = true)
+ * @method static MigrationRunner migrations(Migrations $config = null, ConnectionInterface $db = null, $getShared = true)
+ * @method static Negotiate negotiator(RequestInterface $request = null, $getShared = true)
+ * @method static Pager pager(ConfigPager $config = null, RendererInterface $view = null, $getShared = true)
+ * @method static Parser parser($viewPath = null, ConfigView $config = null, $getShared = true)
+ * @method static View renderer($viewPath = null, ConfigView $config = null, $getShared = true)
+ * @method static IncomingRequest request(App $config = null, $getShared = true)
+ * @method static Response response(App $config = null, $getShared = true)
+ * @method static RedirectResponse redirectresponse(App $config = null, $getShared = true)
+ * @method static RouteCollection routes($getShared = true)
+ * @method static Router router(RouteCollectionInterface $routes = null, Request $request = null, $getShared = true)
+ * @method static Security security(App $config = null, $getShared = true)
+ * @method static Session session(App $config = null, $getShared = true)
+ * @method static Throttler throttler($getShared = true)
+ * @method static Timer timer($getShared = true)
+ * @method static Toolbar toolbar(ConfigToolbar $config = null, $getShared = true)
+ * @method static URI uri($uri = null, $getShared = true)
+ * @method static Validation validation(ConfigValidation $config = null, $getShared = true)
+ * @method static Cell viewcell($getShared = true)
+ * @method static Typography typography($getShared = true)
+ */
+class BaseService
+{
+	/**
+	 * Cache for instance of any services that
+	 * have been requested as a "shared" instance.
+	 * Keys should be lowercase service names.
+	 *
+	 * @var array
+	 */
+	protected static $instances = [];
+
+	/**
+	 * Mock objects for testing which are returned if exist.
+	 *
+	 * @var array
+	 */
+	protected static $mocks = [];
+
+	/**
+	 * Have we already discovered other Services?
+	 *
+	 * @var boolean
+	 */
+	protected static $discovered = false;
+
+	/**
+	 * A cache of other service classes we've found.
+	 *
+	 * @var array
+	 */
+	protected static $services = [];
+
+	/**
+	 * A cache of the names of services classes found.
+	 *
+	 * @var array<string>
+	 */
+	private static $serviceNames = [];
+
+	/**
+	 * Returns a shared instance of any of the class' services.
+	 *
+	 * $key must be a name matching a service.
+	 *
+	 * @param string $key
+	 * @param mixed  ...$params
+	 *
+	 * @return mixed
+	 */
+	protected static function getSharedInstance(string $key, ...$params)
+	{
+		$key = strtolower($key);
+
+		// Returns mock if exists
+		if (isset(static::$mocks[$key]))
+		{
+			return static::$mocks[$key];
+		}
+
+		if (! isset(static::$instances[$key]))
+		{
+			// Make sure $getShared is false
+			$params[] = false;
+
+			static::$instances[$key] = AppServices::$key(...$params);
+		}
+
+		return static::$instances[$key];
+	}
+
+	/**
+	 * The Autoloader class is the central class that handles our
+	 * spl_autoload_register method, and helper methods.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Autoloader
+	 */
+	public static function autoloader(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			if (empty(static::$instances['autoloader']))
+			{
+				static::$instances['autoloader'] = new Autoloader();
+			}
+
+			return static::$instances['autoloader'];
+		}
+
+		return new Autoloader();
+	}
+
+	/**
+	 * The file locator provides utility methods for looking for non-classes
+	 * within namespaced folders, as well as convenience methods for
+	 * loading 'helpers', and 'libraries'.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return FileLocator
+	 */
+	public static function locator(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			if (empty(static::$instances['locator']))
+			{
+				static::$instances['locator'] = new FileLocator(static::autoloader());
+			}
+
+			return static::$mocks['locator'] ?? static::$instances['locator'];
+		}
+
+		return new FileLocator(static::autoloader());
+	}
+
+	/**
+	 * Provides the ability to perform case-insensitive calling of service
+	 * names.
+	 *
+	 * @param string $name
+	 * @param array  $arguments
+	 *
+	 * @return mixed
+	 */
+	public static function __callStatic(string $name, array $arguments)
+	{
+		$service = static::serviceExists($name);
+
+		if ($service === null)
+		{
+			return null;
+		}
+
+		return $service::$name(...$arguments);
+	}
+
+	/**
+	 * Check if the requested service is defined and return the declaring
+	 * class. Return null if not found.
+	 *
+	 * @param string $name
+	 *
+	 * @return string|null
+	 */
+	public static function serviceExists(string $name): ?string
+	{
+		static::buildServicesCache();
+		$services = array_merge(self::$serviceNames, [Services::class]);
+		$name     = strtolower($name);
+
+		foreach ($services as $service)
+		{
+			if (method_exists($service, $name))
+			{
+				return $service;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Reset shared instances and mocks for testing.
+	 *
+	 * @param boolean $initAutoloader Initializes autoloader instance
+	 */
+	public static function reset(bool $initAutoloader = false)
+	{
+		static::$mocks     = [];
+		static::$instances = [];
+
+		if ($initAutoloader)
+		{
+			static::autoloader()->initialize(new Autoload(), new Modules());
+		}
+	}
+
+	/**
+	 * Resets any mock and shared instances for a single service.
+	 *
+	 * @param string $name
+	 */
+	public static function resetSingle(string $name)
+	{
+		unset(static::$mocks[$name], static::$instances[$name]);
+	}
+
+	/**
+	 * Inject mock object for testing.
+	 *
+	 * @param string $name
+	 * @param mixed  $mock
+	 */
+	public static function injectMock(string $name, $mock)
+	{
+		static::$mocks[strtolower($name)] = $mock;
+	}
+
+	/**
+	 * Will scan all psr4 namespaces registered with system to look
+	 * for new Config\Services files. Caches a copy of each one, then
+	 * looks for the service method in each, returning an instance of
+	 * the service, if available.
+	 *
+	 * @param string $name
+	 * @param array  $arguments
+	 *
+	 * @return mixed
+	 *
+	 * @deprecated
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected static function discoverServices(string $name, array $arguments)
+	{
+		if (! static::$discovered)
+		{
+			$config = config('Modules');
+
+			if ($config->shouldDiscover('services'))
+			{
+				$locator = static::locator();
+				$files   = $locator->search('Config/Services');
+
+				if (empty($files))
+				{
+					// no files at all found - this would be really, really bad
+					return null;
+				}
+
+				// Get instances of all service classes and cache them locally.
+				foreach ($files as $file)
+				{
+					$classname = $locator->getClassname($file);
+
+					if (! in_array($classname, ['CodeIgniter\\Config\\Services'], true))
+					{
+						static::$services[] = new $classname();
+					}
+				}
+			}
+
+			static::$discovered = true;
+		}
+
+		if (! static::$services)
+		{
+			// we found stuff, but no services - this would be really bad
+			return null;
+		}
+
+		// Try to find the desired service method
+		foreach (static::$services as $class)
+		{
+			if (method_exists($class, $name))
+			{
+				return $class::$name(...$arguments);
+			}
+		}
+
+		return null;
+	}
+
+	protected static function buildServicesCache(): void
+	{
+		if (! static::$discovered)
+		{
+			$config = config('Modules');
+
+			if ($config->shouldDiscover('services'))
+			{
+				$locator = static::locator();
+				$files   = $locator->search('Config/Services');
+
+				// Get instances of all service classes and cache them locally.
+				foreach ($files as $file)
+				{
+					$classname = $locator->getClassname($file);
+
+					if ($classname !== 'CodeIgniter\\Config\\Services')
+					{
+						self::$serviceNames[] = $classname;
+						static::$services[]   = new $classname();
+					}
+				}
+			}
+
+			static::$discovered = true;
+		}
+	}
+}
diff --git a/system/Config/Config.php b/system/Config/Config.php
new file mode 100644
index 0000000..1265c35
--- /dev/null
+++ b/system/Config/Config.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * Class Config
+ *
+ * @deprecated Use CodeIgniter\Config\Factories::config()
+ */
+class Config
+{
+	/**
+	 * Create new configuration instances or return
+	 * a shared instance
+	 *
+	 * @param string  $name      Configuration name
+	 * @param boolean $getShared Use shared instance
+	 *
+	 * @return mixed|null
+	 */
+	public static function get(string $name, bool $getShared = true)
+	{
+		return Factories::config($name, ['getShared' => $getShared]);
+	}
+
+	/**
+	 * Helper method for injecting mock instances while testing.
+	 *
+	 * @param string $name
+	 * @param object $instance
+	 */
+	public static function injectMock(string $name, $instance)
+	{
+		Factories::injectMock('config', $name, $instance);
+	}
+
+	/**
+	 * Resets the static arrays
+	 */
+	public static function reset()
+	{
+		Factories::reset('config');
+	}
+}
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
new file mode 100644
index 0000000..54374ad
--- /dev/null
+++ b/system/Config/DotEnv.php
@@ -0,0 +1,293 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+use InvalidArgumentException;
+
+/**
+ * Environment-specific configuration
+ */
+class DotEnv
+{
+	/**
+	 * The directory where the .env file can be located.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the path to our file.
+	 *
+	 * @param string $path
+	 * @param string $file
+	 */
+	public function __construct(string $path, string $file = '.env')
+	{
+		$this->path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The main entry point, will load the .env file and process it
+	 * so that we end up with all settings in the PHP environment vars
+	 * (i.e. getenv(), $_ENV, and $_SERVER)
+	 *
+	 * @return boolean
+	 */
+	public function load(): bool
+	{
+		$vars = $this->parse();
+
+		return $vars !== null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse the .env file into an array of key => value
+	 *
+	 * @return array|null
+	 */
+	public function parse(): ?array
+	{
+		// We don't want to enforce the presence of a .env file, they should be optional.
+		if (! is_file($this->path))
+		{
+			return null;
+		}
+
+		// Ensure the file is readable
+		if (! is_readable($this->path))
+		{
+			throw new InvalidArgumentException("The .env file is not readable: {$this->path}");
+		}
+
+		$vars = [];
+
+		$lines = file($this->path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+		foreach ($lines as $line)
+		{
+			// Is it a comment?
+			if (strpos(trim($line), '#') === 0)
+			{
+				continue;
+			}
+
+			// If there is an equal sign, then we know we are assigning a variable.
+			if (strpos($line, '=') !== false)
+			{
+				[$name, $value] = $this->normaliseVariable($line);
+				$vars[$name]        = $value;
+				$this->setVariable($name, $value);
+			}
+		}
+
+		return $vars;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variable into the environment. Will parse the string
+	 * first to look for {name}={value} pattern, ensure that nested
+	 * variables are handled, and strip it of single and double quotes.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 */
+	protected function setVariable(string $name, string $value = '')
+	{
+		if (! getenv($name, true))
+		{
+			putenv("$name=$value");
+		}
+
+		if (empty($_ENV[$name]))
+		{
+			$_ENV[$name] = $value;
+		}
+
+		if (empty($_SERVER[$name]))
+		{
+			$_SERVER[$name] = $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses for assignment, cleans the $name and $value, and ensures
+	 * that nested variables are handled.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 *
+	 * @return array
+	 */
+	public function normaliseVariable(string $name, string $value = ''): array
+	{
+		// Split our compound string into its parts.
+		if (strpos($name, '=') !== false)
+		{
+			[$name, $value] = explode('=', $name, 2);
+		}
+
+		$name  = trim($name);
+		$value = trim($value);
+
+		// Sanitize the name
+		$name = str_replace(['export', '\'', '"'], '', $name);
+
+		// Sanitize the value
+		$value = $this->sanitizeValue($value);
+
+		$value = $this->resolveNestedVariables($value);
+
+		return [
+			$name,
+			$value,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Strips quotes from the environment variable value.
+	 *
+	 * This was borrowed from the excellent phpdotenv with very few changes.
+	 * https://github.com/vlucas/phpdotenv
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 * @throws InvalidArgumentException
+	 */
+	protected function sanitizeValue(string $value): string
+	{
+		if (! $value)
+		{
+			return $value;
+		}
+
+		// Does it begin with a quote?
+		if (strpbrk($value[0], '"\'') !== false)
+		{
+			// value starts with a quote
+			$quote        = $value[0];
+			$regexPattern = sprintf(
+					'/^
+					%1$s          # match a quote at the start of the value
+					(             # capturing sub-pattern used
+								  (?:          # we do not need to capture this
+								   [^%1$s\\\\] # any character other than a quote or backslash
+								   |\\\\\\\\   # or two backslashes together
+								   |\\\\%1$s   # or an escaped quote e.g \"
+								  )*           # as many characters that match the previous rules
+					)             # end of the capturing sub-pattern
+					%1$s          # and the closing quote
+					.*$           # and discard any string after the closing quote
+					/mx', $quote
+			);
+
+			$value = preg_replace($regexPattern, '$1', $value);
+			$value = str_replace("\\$quote", $quote, $value);
+			$value = str_replace('\\\\', '\\', $value);
+		}
+		else
+		{
+			$parts = explode(' #', $value, 2);
+
+			$value = trim($parts[0]);
+
+			// Unquoted values cannot contain whitespace
+			if (preg_match('/\s+/', $value) > 0)
+			{
+				throw new InvalidArgumentException('.env values containing spaces must be surrounded by quotes.');
+			}
+		}
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 *  Resolve the nested variables.
+	 *
+	 * Look for ${varname} patterns in the variable value and replace with an existing
+	 * environment variable.
+	 *
+	 * This was borrowed from the excellent phpdotenv with very few changes.
+	 * https://github.com/vlucas/phpdotenv
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	protected function resolveNestedVariables(string $value): string
+	{
+		if (strpos($value, '$') !== false)
+		{
+			$value = preg_replace_callback(
+				'/\${([a-zA-Z0-9_\.]+)}/',
+				function ($matchedPatterns) {
+					$nestedVariable = $this->getVariable($matchedPatterns[1]);
+
+					if (is_null($nestedVariable))
+					{
+						return $matchedPatterns[0];
+					}
+
+					return $nestedVariable;
+				},
+				$value
+			);
+		}
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Search the different places for environment variables and return first value found.
+	 *
+	 * This was borrowed from the excellent phpdotenv with very few changes.
+	 * https://github.com/vlucas/phpdotenv
+	 *
+	 * @param string $name
+	 *
+	 * @return string|null
+	 */
+	protected function getVariable(string $name)
+	{
+		switch (true)
+		{
+			case array_key_exists($name, $_ENV):
+				return $_ENV[$name];
+			case array_key_exists($name, $_SERVER):
+				return $_SERVER[$name];
+			default:
+				$value = getenv($name);
+
+				// switch getenv default to null
+				return $value === false ? null : $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
new file mode 100644
index 0000000..22a9a27
--- /dev/null
+++ b/system/Config/Factories.php
@@ -0,0 +1,354 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+use CodeIgniter\Model;
+use Config\Services;
+
+/**
+ * Factories for creating instances.
+ *
+ * Factories allows dynamic loading of components by their path
+ * and name. The "shared instance" implementation provides a
+ * large performance boost and helps keep code clean of lengthy
+ * instantiation checks.
+ *
+ * @method static Model models(...$arguments)
+ * @method static BaseConfig config(...$arguments)
+ */
+class Factories
+{
+	/**
+	 * Store of component-specific options, usually
+	 * from CodeIgniter\Config\Factory.
+	 *
+	 * @var array<string, array>
+	 */
+	protected static $options = [];
+
+	/**
+	 * Explicit options for the Config
+	 * component to prevent logic loops.
+	 *
+	 * @var array<string, mixed>
+	 */
+	private static $configOptions = [
+		'component'  => 'config',
+		'path'       => 'Config',
+		'instanceOf' => null,
+		'getShared'  => true,
+		'preferApp'  => true,
+	];
+
+	/**
+	 * Mapping of class basenames (no namespace) to
+	 * their instances.
+	 *
+	 * @var array<string, string[]>
+	 */
+	protected static $basenames = [];
+
+	/**
+	 * Store for instances of any component that
+	 * has been requested as "shared".
+	 * A multi-dimensional array with components as
+	 * keys to the array of name-indexed instances.
+	 *
+	 * @var array<string, array>
+	 */
+	protected static $instances = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads instances based on the method component name. Either
+	 * creates a new instance or returns an existing shared instance.
+	 *
+	 * @param string $component
+	 * @param array  $arguments
+	 *
+	 * @return mixed
+	 */
+	public static function __callStatic(string $component, array $arguments)
+	{
+		// First argument is the name, second is options
+		$name    = trim(array_shift($arguments), '\\ ');
+		$options = array_shift($arguments) ?? [];
+
+		// Determine the component-specific options
+		$options = array_merge(self::getOptions(strtolower($component)), $options);
+
+		if (! $options['getShared'])
+		{
+			if ($class = self::locateClass($options, $name))
+			{
+				return new $class(...$arguments);
+			}
+
+			return null;
+		}
+
+		$basename = self::getBasename($name);
+
+		// Check for an existing instance
+		if (isset(self::$basenames[$options['component']][$basename]))
+		{
+			$class = self::$basenames[$options['component']][$basename];
+
+			// Need to verify if the shared instance matches the request
+			if (self::verifyInstanceOf($options, $class))
+			{
+				return self::$instances[$options['component']][$class];
+			}
+		}
+
+		// Try to locate the class
+		if (! $class = self::locateClass($options, $name))
+		{
+			return null;
+		}
+
+		self::$instances[$options['component']][$class]    = new $class(...$arguments);
+		self::$basenames[$options['component']][$basename] = $class;
+
+		return self::$instances[$options['component']][$class];
+	}
+
+	/**
+	 * Finds a component class
+	 *
+	 * @param array  $options The array of component-specific directives
+	 * @param string $name    Class name, namespace optional
+	 *
+	 * @return string|null
+	 */
+	protected static function locateClass(array $options, string $name): ?string
+	{
+		// Check for low-hanging fruit
+		if (class_exists($name, false) && self::verifyPreferApp($options, $name) && self::verifyInstanceOf($options, $name))
+		{
+			return $name;
+		}
+
+		// Determine the relative class names we need
+		$basename = self::getBasename($name);
+		$appname  = $options['component'] === 'config'
+			? 'Config\\' . $basename
+			: rtrim(APP_NAMESPACE, '\\') . '\\' . $options['path'] . '\\' . $basename;
+
+		// If an App version was requested then see if it verifies
+		if ($options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $name))
+		{
+			return $appname;
+		}
+
+		// If we have ruled out an App version and the class exists then try it
+		if (class_exists($name) && self::verifyInstanceOf($options, $name))
+		{
+			return $name;
+		}
+
+		// Have to do this the hard way...
+		$locator = Services::locator();
+
+		// Check if the class was namespaced
+		if (strpos($name, '\\') !== false)
+		{
+			if (! $file = $locator->locateFile($name, $options['path']))
+			{
+				return null;
+			}
+			$files = [$file];
+		}
+		// No namespace? Search for it
+		// Check all namespaces, prioritizing App and modules
+		elseif (! $files = $locator->search($options['path'] . DIRECTORY_SEPARATOR . $name))
+		{
+			return null;
+		}
+
+		// Check all files for a valid class
+		foreach ($files as $file)
+		{
+			$class = $locator->getClassname($file);
+
+			if ($class && self::verifyInstanceOf($options, $class))
+			{
+				return $class;
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies that a class & config satisfy the "preferApp" option
+	 *
+	 * @param array  $options The array of component-specific directives
+	 * @param string $name    Class name, namespace optional
+	 *
+	 * @return boolean
+	 */
+	protected static function verifyPreferApp(array $options, string $name): bool
+	{
+		// Anything without that restriction passes
+		if (! $options['preferApp'])
+		{
+			return true;
+		}
+
+		// Special case for Config since its App namespace is actually \Config
+		if ($options['component'] === 'config')
+		{
+			return strpos($name, 'Config') === 0;
+		}
+
+		return strpos($name, APP_NAMESPACE) === 0;
+	}
+
+	/**
+	 * Verifies that a class & config satisfy the "instanceOf" option
+	 *
+	 * @param array  $options The array of component-specific directives
+	 * @param string $name    Class name, namespace optional
+	 *
+	 * @return boolean
+	 */
+	protected static function verifyInstanceOf(array $options, string $name): bool
+	{
+		// Anything without that restriction passes
+		if (! $options['instanceOf'])
+		{
+			return true;
+		}
+
+		return is_a($name, $options['instanceOf'], true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the component-specific configuration
+	 *
+	 * @param string $component Lowercase, plural component name
+	 *
+	 * @return array<string, mixed>
+	 */
+	public static function getOptions(string $component): array
+	{
+		$component = strtolower($component);
+
+		// Check for a stored version
+		if (isset(self::$options[$component]))
+		{
+			return self::$options[$component];
+		}
+
+		$values = $component === 'config'
+			// Handle Config as a special case to prevent logic loops
+			? self::$configOptions
+			// Load values from the best Factory configuration (will include Registrars)
+			: config('Factory')->$component ?? [];
+
+		return self::setOptions($component, $values);
+	}
+
+	/**
+	 * Normalizes, stores, and returns the configuration for a specific component
+	 *
+	 * @param string $component Lowercase, plural component name
+	 * @param array  $values
+	 *
+	 * @return array<string, mixed> The result after applying defaults and normalization
+	 */
+	public static function setOptions(string $component, array $values): array
+	{
+		// Allow the config to replace the component name, to support "aliases"
+		$values['component'] = strtolower($values['component'] ?? $component);
+
+		// Reset this component so instances can be rediscovered with the updated config
+		self::reset($values['component']);
+
+		// If no path was available then use the component
+		$values['path'] = trim($values['path'] ?? ucfirst($values['component']), '\\ ');
+
+		// Add defaults for any missing values
+		$values = array_merge(Factory::$default, $values);
+
+		// Store the result to the supplied name and potential alias
+		self::$options[$component]           = $values;
+		self::$options[$values['component']] = $values;
+
+		return $values;
+	}
+
+	/**
+	 * Resets the static arrays, optionally just for one component
+	 *
+	 * @param string $component Lowercase, plural component name
+	 */
+	public static function reset(string $component = null)
+	{
+		if ($component)
+		{
+			unset(static::$options[$component]);
+			unset(static::$basenames[$component]);
+			unset(static::$instances[$component]);
+
+			return;
+		}
+
+		static::$options   = [];
+		static::$basenames = [];
+		static::$instances = [];
+	}
+
+	/**
+	 * Helper method for injecting mock instances
+	 *
+	 * @param string $component Lowercase, plural component name
+	 * @param string $name      The name of the instance
+	 * @param object $instance
+	 */
+	public static function injectMock(string $component, string $name, object $instance)
+	{
+		// Force a configuration to exist for this component
+		$component = strtolower($component);
+		self::getOptions($component);
+
+		$class    = get_class($instance);
+		$basename = self::getBasename($name);
+
+		self::$instances[$component][$class]    = $instance;
+		self::$basenames[$component][$basename] = $class;
+	}
+
+	/**
+	 * Gets a basename from a class name, namespaced or not.
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	public static function getBasename(string $name): string
+	{
+		// Determine the basename
+		if ($basename = strrchr($name, '\\'))
+		{
+			return substr($basename, 1);
+		}
+
+		return $name;
+	}
+}
diff --git a/system/Config/Factory.php b/system/Config/Factory.php
new file mode 100644
index 0000000..94fe7ad
--- /dev/null
+++ b/system/Config/Factory.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * Factories Configuration file.
+ *
+ * Provides overriding directives for how
+ * Factories should handle discovery and
+ * instantiation of specific components.
+ * Each property should correspond to the
+ * lowercase, plural component name.
+ */
+class Factory extends BaseConfig
+{
+	/**
+	 * Supplies a default set of options to merge for
+	 * all unspecified factory components.
+	 *
+	 * @var array
+	 */
+	public static $default = [
+		'component'  => null,
+		'path'       => null,
+		'instanceOf' => null,
+		'getShared'  => true,
+		'preferApp'  => true,
+	];
+
+	/**
+	 * Specifies that Models should always favor child
+	 * classes to allow easy extension of module Models.
+	 *
+	 * @var array
+	 */
+	public $models = [
+		'preferApp' => true,
+	];
+}
diff --git a/system/Config/ForeignCharacters.php b/system/Config/ForeignCharacters.php
new file mode 100644
index 0000000..4f08953
--- /dev/null
+++ b/system/Config/ForeignCharacters.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * Describes foreign characters for transliteration with the text helper.
+ */
+class ForeignCharacters
+{
+	/**
+	 * Without further ado, the list of foreign characters.
+	 */
+	public $characterList = [
+		'/Ƥ|Ʀ|Ē½/'                                                     => 'ae',
+		'/ƶ|œ/'                                                       => 'oe',
+		'/Ć¼/'                                                         => 'ue',
+		'/Ƅ/'                                                         => 'Ae',
+		'/Ɯ/'                                                         => 'Ue',
+		'/Ɩ/'                                                         => 'Oe',
+		'/ƀ|Ɓ|Ƃ|ƃ|Ƅ|ƅ|Ēŗ|Ā|Ă|Ą|Ē|Ī‘|Ī†|įŗ¢|įŗ |įŗ¦|įŗŖ|įŗØ|įŗ¬|įŗ°|įŗ®|įŗ“|įŗ²|įŗ¶|Š/'         => 'A',
+		'/Ć |Ć”|Ć¢|Ć£|Ć„|Ē»|ā|ă|ą|ĒŽ|ĀŖ|Ī±|Ī¬|įŗ£|įŗ”|įŗ§|įŗ„|įŗ«|įŗ©|įŗ­|įŗ±|įŗÆ|įŗµ|įŗ³|įŗ·|Š°/'       => 'a',
+		'/Š‘/'                                                         => 'B',
+		'/Š±/'                                                         => 'b',
+		'/Ƈ|Ć|Ĉ|Ċ|Č/'                                                 => 'C',
+		'/Ƨ|ć|ĉ|ċ|č/'                                                 => 'c',
+		'/Š”/'                                                         => 'D',
+		'/Š“/'                                                         => 'd',
+		'/Ɛ|Ď|Đ|Ī”/'                                                   => 'Dj',
+		'/Ć°|ď|đ|Ī“/'                                                   => 'dj',
+		'/ƈ|Ɖ|Ɗ|Ƌ|Ē|Ĕ|Ė|Ę|Ě|Ī•|Īˆ|įŗ¼|įŗŗ|įŗø|į»€|įŗ¾|į»„|į»‚|į»†|Š•|Š­/'                 => 'E',
+		'/ĆØ|Ć©|ĆŖ|Ć«|ē|ĕ|ė|ę|ě|Ī­|Īµ|įŗ½|įŗ»|įŗ¹|į»|įŗæ|į»…|į»ƒ|į»‡|Šµ|э/'                 => 'e',
+		'/Š¤/'                                                         => 'F',
+		'/ф/'                                                         => 'f',
+		'/Ĝ|Ğ|Ä |Ä¢|Ī“|Š“|Ņ/'                                             => 'G',
+		'/ĝ|ğ|Ä”|Ä£|Ī³|Š³|Ņ‘/'                                             => 'g',
+		'/Ĥ|Ħ/'                                                       => 'H',
+		'/Ą|ħ/'                                                       => 'h',
+		'/ƌ|ƍ|Ǝ|Ə|ÄØ|ÄŖ|Ĭ|Ē|Ä®|Ä°|Ī—|Ī‰|ĪŠ|Ī™|ĪŖ|į»ˆ|į»Š|Š˜|Š«/'                     => 'I',
+		'/Ƭ|Ć­|Ć®|ĆÆ|Ä©|Ä«|Ä­|Ē|ÄÆ|ı|Ī·|Ī®|ĪÆ|Ī¹|ĻŠ|į»‰|į»‹|Šø|ы|ї/'                   => 'i',
+		'/Ä“/'                                                         => 'J',
+		'/ĵ/'                                                         => 'j',
+		'/Ķ|Īš|Šš/'                                                     => 'K',
+		'/Ä·|Īŗ|Šŗ/'                                                     => 'k',
+		'/Ĺ|Ä»|Ľ|Äæ|Ł|Ī›|Š›/'                                             => 'L',
+		'/Äŗ|ļ|ľ|ŀ|ł|Ī»|Š»/'                                             => 'l',
+		'/Šœ/'                                                         => 'M',
+		'/Š¼/'                                                         => 'm',
+		'/Ƒ|Ń|Ņ|Ň|Ī|Š/'                                               => 'N',
+		'/Ʊ|ń|ņ|ň|ʼn|Ī½|Š½/'                                             => 'n',
+		'/ƒ|Ɠ|Ɣ|ƕ|Ō|Ŏ|Ē‘|Ő|Ę |Ƙ|Ē¾|ĪŸ|ĪŒ|Ī©|Ī|į»Ž|į»Œ|į»’|į»|į»–|į»”|į»˜|į»œ|į»š|į» |į»ž|į»¢|Šž/'   => 'O',
+		'/Ć²|Ć³|Ć“|Ƶ|ō|ŏ|Ē’|ő|Ę”|Ćø|Ēæ|Āŗ|Īæ|ĻŒ|Ļ‰|ĻŽ|į»|į»|į»“|į»‘|į»—|į»•|į»™|į»|į»›|į»”|į»Ÿ|į»£|Š¾/' => 'o',
+		'/ŠŸ/'                                                         => 'P',
+		'/Šæ/'                                                         => 'p',
+		'/Ŕ|Ŗ|Ř|Ī”|Š /'                                                 => 'R',
+		'/ŕ|ŗ|ř|Ļ|р/'                                                 => 'r',
+		'/Ś|Ŝ|Ş|Ș|Å |Ī£|Š”/'                                             => 'S',
+		'/ś|ŝ|ş|ș|Å”|Åæ|Ļƒ|Ļ‚|с/'                                         => 's',
+		'/Ț|Å¢|Ť|Ŧ|Ļ„|Š¢/'                                               => 'T',
+		'/ț|Å£|Å„|ŧ|т/'                                                 => 't',
+		'/ƙ|ƚ|ƛ|ÅØ|ÅŖ|Ŭ|Å®|Å°|Ų|ĘÆ|Ē“|Ē•|Ē—|Ē™|Ē›|ÅØ|į»¦|į»¤|į»Ŗ|į»Ø|į»®|į»¬|į»°|Š£/'           => 'U',
+		'/Ć¹|Ćŗ|Ć»|Å©|Å«|Å­|ÅÆ|ű|ų|Ę°|Ē”|Ē–|Ē˜|Ēš|Ēœ|Ļ…|Ļ|Ļ‹|į»§|į»„|į»«|į»©|į»Æ|į»­|į»±|у/'       => 'u',
+		'/Ę³|Ɏ|į»“|įŗŽ|Ó²|Ó®|ŠŽ|Ɲ|Åø|Ŷ|Ī„|ĪŽ|Ī«|į»²|į»ø|į»¶|į»“|Š™/'                       => 'Y',
+		'/įŗ™|Ź|Ę“|ɏ|į»µ|įŗ|Ó³|ÓÆ|ў|Ć½|Ćæ|Å·|į»³|į»¹|į»·|į»µ|Š¹/'                         => 'y',
+		'/Š’/'                                                         => 'V',
+		'/Š²/'                                                         => 'v',
+		'/Å“/'                                                         => 'W',
+		'/ŵ/'                                                         => 'w',
+		'/Ź|Å»|Ž|Ī–|Š—/'                                                 => 'Z',
+		'/Åŗ|ż|ž|Ī¶|Š·/'                                                 => 'z',
+		'/Ɔ|Ē¼/'                                                       => 'AE',
+		'/Ɵ/'                                                         => 'ss',
+		'/IJ/'                                                         => 'IJ',
+		'/ij/'                                                         => 'ij',
+		'/Œ/'                                                         => 'OE',
+		'/ʒ/'                                                         => 'f',
+		'/Ī¾/'                                                         => 'ks',
+		'/Ļ€/'                                                         => 'p',
+		'/Ī²/'                                                         => 'v',
+		'/Ī¼/'                                                         => 'm',
+		'/Ļˆ/'                                                         => 'ps',
+		'/Š/'                                                         => 'Yo',
+		'/ё/'                                                         => 'yo',
+		'/Š„/'                                                         => 'Ye',
+		'/є/'                                                         => 'ye',
+		'/Š‡/'                                                         => 'Yi',
+		'/Š–/'                                                         => 'Zh',
+		'/Š¶/'                                                         => 'zh',
+		'/Š„/'                                                         => 'Kh',
+		'/х/'                                                         => 'kh',
+		'/Š¦/'                                                         => 'Ts',
+		'/ц/'                                                         => 'ts',
+		'/Š§/'                                                         => 'Ch',
+		'/ч/'                                                         => 'ch',
+		'/ŠØ/'                                                         => 'Sh',
+		'/ш/'                                                         => 'sh',
+		'/Š©/'                                                         => 'Shch',
+		'/щ/'                                                         => 'shch',
+		'/ŠŖ|ъ|Š¬|ь/'                                                   => '',
+		'/Š®/'                                                         => 'Yu',
+		'/ю/'                                                         => 'yu',
+		'/ŠÆ/'                                                         => 'Ya',
+		'/я/'                                                         => 'ya',
+	];
+}
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
new file mode 100644
index 0000000..1cab0bb
--- /dev/null
+++ b/system/Config/Routes.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Exceptions\PageNotFoundException;
+
+/**
+ * System URI Routing
+ *
+ * This file contains any routing to system tools, such as command-line
+ * tools for migrations, etc.
+ *
+ * It is called by Config\Routes, and has the $routes RouteCollection
+ * already loaded up and ready for us to use.
+ */
+
+// Prevent access to BaseController
+$routes->add('BaseController(:any)', function () {
+	throw PageNotFoundException::forPageNotFound();
+});
+
+// Prevent access to initController method
+$routes->add('(:any)/initController', function () {
+	throw PageNotFoundException::forPageNotFound();
+});
+
+// Migrations
+$routes->cli('migrations/(:segment)/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1/$2');
+$routes->cli('migrations/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1');
+$routes->cli('migrations', '\CodeIgniter\Commands\MigrationsCommand::index');
+
+// CLI Catchall - uses a _remap to call Commands
+$routes->cli('ci(:any)', '\CodeIgniter\CLI\CommandRunner::index/$1');
diff --git a/system/Config/Services.php b/system/Config/Services.php
new file mode 100644
index 0000000..fe6e6a3
--- /dev/null
+++ b/system/Config/Services.php
@@ -0,0 +1,884 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+use CodeIgniter\Cache\CacheFactory;
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\CLI\Commands;
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Database\MigrationRunner;
+use CodeIgniter\Debug\Exceptions;
+use CodeIgniter\Debug\Iterator;
+use CodeIgniter\Debug\Timer;
+use CodeIgniter\Debug\Toolbar;
+use CodeIgniter\Email\Email;
+use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Filters\Filters;
+use CodeIgniter\Format\Format;
+use CodeIgniter\Honeypot\Honeypot;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\CURLRequest;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Negotiate;
+use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Images\Handlers\BaseHandler;
+use CodeIgniter\Language\Language;
+use CodeIgniter\Log\Logger;
+use CodeIgniter\Pager\Pager;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Router\RouteCollectionInterface;
+use CodeIgniter\Router\Router;
+use CodeIgniter\Security\Security;
+use CodeIgniter\Session\Session;
+use CodeIgniter\Throttle\Throttler;
+use CodeIgniter\Typography\Typography;
+use CodeIgniter\Validation\Validation;
+use CodeIgniter\View\Cell;
+use CodeIgniter\View\Parser;
+use CodeIgniter\View\RendererInterface;
+use CodeIgniter\View\View;
+use Config\App;
+use Config\Cache;
+use Config\Email as EmailConfig;
+use Config\Encryption as EncryptionConfig;
+use Config\Exceptions as ExceptionsConfig;
+use Config\Filters as FiltersConfig;
+use Config\Format as FormatConfig;
+use Config\Honeypot as HoneypotConfig;
+use Config\Images;
+use Config\Migrations;
+use Config\Pager as PagerConfig;
+use Config\Toolbar as ToolbarConfig;
+use Config\Validation as ValidationConfig;
+use Config\View as ViewConfig;
+use Config\Services as AppServices;
+
+/**
+ * Services Configuration file.
+ *
+ * Services are simply other classes/libraries that the system uses
+ * to do its job. This is used by CodeIgniter to allow the core of the
+ * framework to be swapped out easily without affecting the usage within
+ * the rest of your application.
+ *
+ * This is used in place of a Dependency Injection container primarily
+ * due to its simplicity, which allows a better long-term maintenance
+ * of the applications built on top of CodeIgniter. A bonus side-effect
+ * is that IDEs are able to determine what class you are calling
+ * whereas with DI Containers there usually isn't a way for them to do this.
+ *
+ * @see http://blog.ircmaxell.com/2015/11/simple-easy-risk-and-change.html
+ * @see http://www.infoq.com/presentations/Simple-Made-Easy
+ */
+class Services extends BaseService
+{
+	/**
+	 * The cache class provides a simple way to store and retrieve
+	 * complex data for later.
+	 *
+	 * @param Cache|null $config
+	 * @param boolean    $getShared
+	 *
+	 * @return CacheInterface
+	 */
+	public static function cache(Cache $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('cache', $config);
+		}
+
+		$config = $config ?? new Cache();
+
+		return CacheFactory::getHandler($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The CLI Request class provides for ways to interact with
+	 * a command line request.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return CLIRequest
+	 */
+	public static function clirequest(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('clirequest', $config);
+		}
+
+		$config = $config ?? config('App');
+
+		return new CLIRequest($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CodeIgniter, the core of the framework.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return CodeIgniter
+	 */
+	public static function codeigniter(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('codeigniter', $config);
+		}
+
+		$config = $config ?? config('App');
+
+		return new CodeIgniter($config);
+	}
+
+	/**
+	 * The commands utility for running and working with CLI commands.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Commands
+	 */
+	public static function commands(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('commands');
+		}
+
+		return new Commands();
+	}
+
+	/**
+	 * The CURL Request class acts as a simple HTTP client for interacting
+	 * with other servers, typically through APIs.
+	 *
+	 * @param array                  $options
+	 * @param ResponseInterface|null $response
+	 * @param App|null               $config
+	 * @param boolean                $getShared
+	 *
+	 * @return CURLRequest
+	 */
+	public static function curlrequest(array $options = [], ResponseInterface $response = null, App $config = null, bool $getShared = true)
+	{
+		if ($getShared === true)
+		{
+			return static::getSharedInstance('curlrequest', $options, $response, $config);
+		}
+
+		$config   = $config ?? config('App');
+		$response = $response ?? new Response($config);
+
+		return new CURLRequest(
+			$config,
+			new URI($options['base_uri'] ?? null),
+			$response,
+			$options
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Email class allows you to send email via mail, sendmail, SMTP.
+	 *
+	 * @param EmailConfig|array|null $config
+	 * @param boolean                $getShared
+	 *
+	 * @return Email
+	 */
+	public static function email($config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('email', $config);
+		}
+
+		if (empty($config) || ! (is_array($config) || $config instanceof EmailConfig))
+		{
+			$config = config('Email');
+		}
+
+		return new Email($config);
+	}
+
+	/**
+	 * The Encryption class provides two-way encryption.
+	 *
+	 * @param EncryptionConfig|null $config
+	 * @param boolean               $getShared
+	 *
+	 * @return EncrypterInterface Encryption handler
+	 */
+	public static function encrypter(EncryptionConfig $config = null, $getShared = false)
+	{
+		if ($getShared === true)
+		{
+			return static::getSharedInstance('encrypter', $config);
+		}
+
+		$config     = $config ?? config('Encryption');
+		$encryption = new Encryption($config);
+
+		return $encryption->initialize($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Exceptions class holds the methods that handle:
+	 *
+	 *  - set_exception_handler
+	 *  - set_error_handler
+	 *  - register_shutdown_function
+	 *
+	 * @param ExceptionsConfig|null $config
+	 * @param IncomingRequest|null  $request
+	 * @param Response|null         $response
+	 * @param boolean               $getShared
+	 *
+	 * @return Exceptions
+	 */
+	public static function exceptions(
+		ExceptionsConfig $config = null,
+		IncomingRequest $request = null,
+		Response $response = null,
+		bool $getShared = true
+	)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('exceptions', $config, $request, $response);
+		}
+
+		$config   = $config ?? config('Exceptions');
+		$request  = $request ?? AppServices::request();
+		$response = $response ?? AppServices::response();
+
+		return new Exceptions($config, $request, $response);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Filters allow you to run tasks before and/or after a controller
+	 * is executed. During before filters, the request can be modified,
+	 * and actions taken based on the request, while after filters can
+	 * act on or modify the response itself before it is sent to the client.
+	 *
+	 * @param FiltersConfig|null $config
+	 * @param boolean            $getShared
+	 *
+	 * @return Filters
+	 */
+	public static function filters(FiltersConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('filters', $config);
+		}
+
+		$config = $config ?? config('Filters');
+
+		return new Filters($config, AppServices::request(), AppServices::response());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Format class is a convenient place to create Formatters.
+	 *
+	 * @param FormatConfig|null $config
+	 * @param boolean           $getShared
+	 *
+	 * @return Format
+	 */
+	public static function format(FormatConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('format', $config);
+		}
+
+		$config = $config ?? config('Format');
+
+		return new Format($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Honeypot provides a secret input on forms that bots should NOT
+	 * fill in, providing an additional safeguard when accepting user input.
+	 *
+	 * @param HoneypotConfig|null $config
+	 * @param boolean             $getShared
+	 *
+	 * @return Honeypot
+	 */
+	public static function honeypot(HoneypotConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('honeypot', $config);
+		}
+
+		$config = $config ?? config('Honeypot');
+
+		return new Honeypot($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Acts as a factory for ImageHandler classes and returns an instance
+	 * of the handler. Used like Services::image()->withFile($path)->rotate(90)->save();
+	 *
+	 * @param string|null $handler
+	 * @param Images|null $config
+	 * @param boolean     $getShared
+	 *
+	 * @return BaseHandler
+	 */
+	public static function image(string $handler = null, Images $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('image', $handler, $config);
+		}
+
+		$config  = $config ?? config('Images');
+		$handler = $handler ?: $config->defaultHandler;
+		$class   = $config->handlers[$handler];
+
+		return new $class($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Iterator class provides a simple way of looping over a function
+	 * and timing the results and memory usage. Used when debugging and
+	 * optimizing applications.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Iterator
+	 */
+	public static function iterator(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('iterator');
+		}
+
+		return new Iterator();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Responsible for loading the language string translations.
+	 *
+	 * @param string|null $locale
+	 * @param boolean     $getShared
+	 *
+	 * @return Language
+	 */
+	public static function language(string $locale = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('language', $locale)->setLocale($locale);
+		}
+
+		// Use '?:' for empty string check
+		$locale = $locale ?: AppServices::request()->getLocale();
+
+		return new Language($locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Logger class is a PSR-3 compatible Logging class that supports
+	 * multiple handlers that process the actual logging.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Logger
+	 */
+	public static function logger(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('logger');
+		}
+
+		return new Logger(config('Logger'));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the appropriate Migration runner.
+	 *
+	 * @param Migrations|null          $config
+	 * @param ConnectionInterface|null $db
+	 * @param boolean                  $getShared
+	 *
+	 * @return MigrationRunner
+	 */
+	public static function migrations(Migrations $config = null, ConnectionInterface $db = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('migrations', $config, $db);
+		}
+
+		$config = $config ?? config('Migrations');
+
+		return new MigrationRunner($config, $db);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Negotiate class provides the content negotiation features for
+	 * working the request to determine correct language, encoding, charset,
+	 * and more.
+	 *
+	 * @param RequestInterface|null $request
+	 * @param boolean               $getShared
+	 *
+	 * @return Negotiate
+	 */
+	public static function negotiator(RequestInterface $request = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('negotiator', $request);
+		}
+
+		$request = $request ?? AppServices::request();
+
+		return new Negotiate($request);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the appropriate pagination handler.
+	 *
+	 * @param PagerConfig|null       $config
+	 * @param RendererInterface|null $view
+	 * @param boolean                $getShared
+	 *
+	 * @return Pager
+	 */
+	public static function pager(PagerConfig $config = null, RendererInterface $view = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('pager', $config, $view);
+		}
+
+		$config = $config ?? config('Pager');
+		$view   = $view ?? AppServices::renderer();
+
+		return new Pager($config, $view);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Parser is a simple template parser.
+	 *
+	 * @param string|null     $viewPath
+	 * @param ViewConfig|null $config
+	 * @param boolean         $getShared
+	 *
+	 * @return Parser
+	 */
+	public static function parser(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('parser', $viewPath, $config);
+		}
+
+		$viewPath = $viewPath ?: config('Paths')->viewDirectory;
+		$config   = $config ?? config('View');
+
+		return new Parser($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Renderer class is the class that actually displays a file to the user.
+	 * The default View class within CodeIgniter is intentionally simple, but this
+	 * service could easily be replaced by a template engine if the user needed to.
+	 *
+	 * @param string|null     $viewPath
+	 * @param ViewConfig|null $config
+	 * @param boolean         $getShared
+	 *
+	 * @return View
+	 */
+	public static function renderer(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('renderer', $viewPath, $config);
+		}
+
+		$viewPath = $viewPath ?: config('Paths')->viewDirectory;
+		$config   = $config ?? config('View');
+
+		return new View($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Request class models an HTTP request.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return IncomingRequest
+	 */
+	public static function request(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('request', $config);
+		}
+
+		$config = $config ?? config('App');
+
+		return new IncomingRequest(
+			$config,
+			AppServices::uri(),
+			'php://input',
+			new UserAgent()
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Response class models an HTTP response.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return Response
+	 */
+	public static function response(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('response', $config);
+		}
+
+		$config = $config ?? config('App');
+
+		return new Response($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Redirect class provides nice way of working with redirects.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return RedirectResponse
+	 */
+	public static function redirectresponse(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('redirectresponse', $config);
+		}
+
+		$config   = $config ?? config('App');
+		$response = new RedirectResponse($config);
+		$response->setProtocolVersion(AppServices::request()->getProtocolVersion());
+
+		return $response;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Routes service is a class that allows for easily building
+	 * a collection of routes.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return RouteCollection
+	 */
+	public static function routes(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('routes');
+		}
+
+		return new RouteCollection(AppServices::locator(), config('Modules'));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Router class uses a RouteCollection's array of routes, and determines
+	 * the correct Controller and Method to execute.
+	 *
+	 * @param RouteCollectionInterface|null $routes
+	 * @param Request|null                  $request
+	 * @param boolean                       $getShared
+	 *
+	 * @return Router
+	 */
+	public static function router(RouteCollectionInterface $routes = null, Request $request = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('router', $routes, $request);
+		}
+
+		$routes  = $routes ?? AppServices::routes();
+		$request = $request ?? AppServices::request();
+
+		return new Router($routes, $request);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Security class provides a few handy tools for keeping the site
+	 * secure, most notably the CSRF protection tools.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return Security
+	 */
+	public static function security(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('security', $config);
+		}
+
+		$config = $config ?? config('App');
+
+		return new Security($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the session manager.
+	 *
+	 * @param App|null $config
+	 * @param boolean  $getShared
+	 *
+	 * @return Session
+	 */
+	public static function session(App $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('session', $config);
+		}
+
+		$config = $config ?? config('App');
+		$logger = AppServices::logger();
+
+		$driverName = $config->sessionDriver;
+		$driver     = new $driverName($config, AppServices::request()->getIPAddress());
+		$driver->setLogger($logger);
+
+		$session = new Session($driver, $config);
+		$session->setLogger($logger);
+
+		if (session_status() === PHP_SESSION_NONE)
+		{
+			$session->start();
+		}
+
+		return $session;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Throttler class provides a simple method for implementing
+	 * rate limiting in your applications.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Throttler
+	 */
+	public static function throttler(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('throttler');
+		}
+
+		return new Throttler(AppServices::cache());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Timer class provides a simple way to Benchmark portions of your
+	 * application.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Timer
+	 */
+	public static function timer(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('timer');
+		}
+
+		return new Timer();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the debug toolbar.
+	 *
+	 * @param ToolbarConfig|null $config
+	 * @param boolean            $getShared
+	 *
+	 * @return Toolbar
+	 */
+	public static function toolbar(ToolbarConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('toolbar', $config);
+		}
+
+		$config = $config ?? config('Toolbar');
+
+		return new Toolbar($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The URI class provides a way to model and manipulate URIs.
+	 *
+	 * @param string  $uri
+	 * @param boolean $getShared
+	 *
+	 * @return URI
+	 */
+	public static function uri(string $uri = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('uri', $uri);
+		}
+
+		return new URI($uri);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Validation class provides tools for validating input data.
+	 *
+	 * @param ValidationConfig|null $config
+	 * @param boolean               $getShared
+	 *
+	 * @return Validation
+	 */
+	public static function validation(ValidationConfig $config = null, bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('validation', $config);
+		}
+
+		$config = $config ?? config('Validation');
+
+		return new Validation($config, AppServices::renderer());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * View cells are intended to let you insert HTML into view
+	 * that has been generated by any callable in the system.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Cell
+	 */
+	public static function viewcell(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('viewcell');
+		}
+
+		return new Cell(AppServices::cache());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The Typography class provides a way to format text in semantically relevant ways.
+	 *
+	 * @param boolean $getShared
+	 *
+	 * @return Typography
+	 */
+	public static function typography(bool $getShared = true)
+	{
+		if ($getShared)
+		{
+			return static::getSharedInstance('typography');
+		}
+
+		return new Typography();
+	}
+}
diff --git a/system/Config/View.php b/system/Config/View.php
new file mode 100644
index 0000000..b57d941
--- /dev/null
+++ b/system/Config/View.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * View configuration
+ */
+class View extends BaseConfig
+{
+	/**
+	 * When false, the view method will clear the data between each
+	 * call.
+	 *
+	 * @var boolean
+	 */
+	public $saveData = true;
+
+	/**
+	 * Parser Filters map a filter name with any PHP callable. When the
+	 * Parser prepares a variable for display, it will chain it
+	 * through the filters in the order defined, inserting any parameters.
+	 *
+	 * To prevent potential abuse, all filters MUST be defined here
+	 * in order for them to be available for use within the Parser.
+	 */
+	public $filters = [];
+
+	/**
+	 * Parser Plugins provide a way to extend the functionality provided
+	 * by the core Parser by creating aliases that will be replaced with
+	 * any callable. Can be single or tag pair.
+	 */
+	public $plugins = [];
+
+	/**
+	 * Built-in View filters.
+	 *
+	 * @var array
+	 */
+	protected $coreFilters = [
+		'abs'            => '\abs',
+		'capitalize'     => '\CodeIgniter\View\Filters::capitalize',
+		'date'           => '\CodeIgniter\View\Filters::date',
+		'date_modify'    => '\CodeIgniter\View\Filters::date_modify',
+		'default'        => '\CodeIgniter\View\Filters::default',
+		'esc'            => '\CodeIgniter\View\Filters::esc',
+		'excerpt'        => '\CodeIgniter\View\Filters::excerpt',
+		'highlight'      => '\CodeIgniter\View\Filters::highlight',
+		'highlight_code' => '\CodeIgniter\View\Filters::highlight_code',
+		'limit_words'    => '\CodeIgniter\View\Filters::limit_words',
+		'limit_chars'    => '\CodeIgniter\View\Filters::limit_chars',
+		'local_currency' => '\CodeIgniter\View\Filters::local_currency',
+		'local_number'   => '\CodeIgniter\View\Filters::local_number',
+		'lower'          => '\strtolower',
+		'nl2br'          => '\CodeIgniter\View\Filters::nl2br',
+		'number_format'  => '\number_format',
+		'prose'          => '\CodeIgniter\View\Filters::prose',
+		'round'          => '\CodeIgniter\View\Filters::round',
+		'strip_tags'     => '\strip_tags',
+		'title'          => '\CodeIgniter\View\Filters::title',
+		'upper'          => '\strtoupper',
+	];
+
+	/**
+	 * Built-in View plugins.
+	 *
+	 * @var array
+	 */
+	protected $corePlugins = [
+		'current_url'       => '\CodeIgniter\View\Plugins::currentURL',
+		'previous_url'      => '\CodeIgniter\View\Plugins::previousURL',
+		'mailto'            => '\CodeIgniter\View\Plugins::mailto',
+		'safe_mailto'       => '\CodeIgniter\View\Plugins::safeMailto',
+		'lang'              => '\CodeIgniter\View\Plugins::lang',
+		'validation_errors' => '\CodeIgniter\View\Plugins::validationErrors',
+		'route'             => '\CodeIgniter\View\Plugins::route',
+		'siteURL'           => '\CodeIgniter\View\Plugins::siteURL',
+	];
+
+	/**
+	 * Constructor.
+	 *
+	 * Merge the built-in and developer-configured filters and plugins,
+	 * with preference to the developer ones.
+	 */
+	public function __construct()
+	{
+		$this->filters = array_merge($this->coreFilters, $this->filters);
+		$this->plugins = array_merge($this->corePlugins, $this->plugins);
+
+		parent::__construct();
+	}
+}
diff --git a/system/Controller.php b/system/Controller.php
new file mode 100644
index 0000000..c397f6d
--- /dev/null
+++ b/system/Controller.php
@@ -0,0 +1,185 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Validation\Exceptions\ValidationException;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Controller
+ */
+class Controller
+{
+	/**
+	 * Helpers that will be automatically loaded on class instantiation.
+	 *
+	 * @var array
+	 */
+	protected $helpers = [];
+
+	/**
+	 * Instance of the main Request object.
+	 *
+	 * @var RequestInterface
+	 */
+	protected $request;
+
+	/**
+	 * Instance of the main response object.
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
+
+	/**
+	 * Instance of logger to use.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Should enforce HTTPS access for all methods in this controller.
+	 *
+	 * @var integer Number of seconds to set HSTS header
+	 */
+	protected $forceHTTPS = 0;
+
+	/**
+	 * Once validation has been run, will hold the Validation instance.
+	 *
+	 * @var Validation
+	 */
+	protected $validator;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger
+	 *
+	 * @throws HTTPException
+	 */
+	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		$this->logger   = $logger;
+
+		if ($this->forceHTTPS > 0)
+		{
+			$this->forceHTTPS($this->forceHTTPS);
+		}
+
+		// Autoload helper files.
+		helper($this->helpers);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A convenience method to use when you need to ensure that a single
+	 * method is reached only via HTTPS. If it isn't, then a redirect
+	 * will happen back to this method and HSTS header will be sent
+	 * to have modern browsers transform requests automatically.
+	 *
+	 * @param integer $duration The number of seconds this link should be
+	 *                          considered secure for. Only with HSTS header.
+	 *                          Default value is 1 year.
+	 *
+	 * @throws HTTPException
+	 */
+	protected function forceHTTPS(int $duration = 31536000)
+	{
+		force_https($duration, $this->request, $this->response);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a simple way to tie into the main CodeIgniter class and
+	 * tell it how long to cache the current page for.
+	 *
+	 * @param integer $time
+	 */
+	protected function cachePage(int $time)
+	{
+		CodeIgniter::cache($time);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles "auto-loading" helper files.
+	 *
+	 * @deprecated Use `helper` function instead of using this method.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected function loadHelpers()
+	{
+		if (empty($this->helpers))
+		{
+			return;
+		}
+
+		helper($this->helpers);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A shortcut to performing validation on input data. If validation
+	 * is not successful, a $errors property will be set on this class.
+	 *
+	 * @param array|string $rules
+	 * @param array        $messages An array of custom error messages
+	 *
+	 * @return boolean
+	 */
+	protected function validate($rules, array $messages = []): bool
+	{
+		$this->validator = Services::validation();
+
+		// If you replace the $rules array with the name of the group
+		if (is_string($rules))
+		{
+			$validation = config('Validation');
+
+			// If the rule wasn't found in the \Config\Validation, we
+			// should throw an exception so the developer can find it.
+			if (! isset($validation->$rules))
+			{
+				throw ValidationException::forRuleNotFound($rules);
+			}
+
+			// If no error message is defined, use the error message in the Config\Validation file
+			if (! $messages)
+			{
+				$errorName = $rules . '_errors';
+				$messages  = $validation->$errorName ?? [];
+			}
+
+			$rules = $validation->$rules;
+		}
+
+		return $this->validator->withRequest($this->request)->setRules($rules, $messages)->run();
+	}
+}
diff --git a/system/Cookie/CloneableCookieInterface.php b/system/Cookie/CloneableCookieInterface.php
new file mode 100644
index 0000000..ea9fa9a
--- /dev/null
+++ b/system/Cookie/CloneableCookieInterface.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cookie;
+
+use DateTimeInterface;
+
+/**
+ * Interface for a fresh Cookie instance with selected attribute(s)
+ * only changed from the original instance.
+ */
+interface CloneableCookieInterface extends CookieInterface
+{
+	/**
+	 * Creates a new Cookie with a new cookie prefix.
+	 *
+	 * @param string $prefix
+	 *
+	 * @return static
+	 */
+	public function withPrefix(string $prefix = '');
+
+	/**
+	 * Creates a new Cookie with a new name.
+	 *
+	 * @param string $name
+	 *
+	 * @return static
+	 */
+	public function withName(string $name);
+
+	/**
+	 * Creates a new Cookie with new value.
+	 *
+	 * @param string $value
+	 *
+	 * @return static
+	 */
+	public function withValue(string $value);
+
+	/**
+	 * Creates a new Cookie with a new cookie expires time.
+	 *
+	 * @param DateTimeInterface|integer|string $expires
+	 *
+	 * @return static
+	 */
+	public function withExpires($expires);
+
+	/**
+	 * Creates a new Cookie that will expire the cookie from the browser.
+	 *
+	 * @return static
+	 */
+	public function withExpired();
+
+	/**
+	 * Creates a new Cookie that will virtually never expire from the browser.
+	 *
+	 * @return static
+	 */
+	public function withNeverExpiring();
+
+	/**
+	 * Creates a new Cookie with a new path on the server the cookie is available.
+	 *
+	 * @param string|null $path
+	 *
+	 * @return static
+	 */
+	public function withPath(?string $path);
+
+	/**
+	 * Creates a new Cookie with a new domain the cookie is available.
+	 *
+	 * @param string|null $domain
+	 *
+	 * @return static
+	 */
+	public function withDomain(?string $domain);
+
+	/**
+	 * Creates a new Cookie with a new "Secure" attribute.
+	 *
+	 * @param boolean $secure
+	 *
+	 * @return static
+	 */
+	public function withSecure(bool $secure = true);
+
+	/**
+	 * Creates a new Cookie with a new "HttpOnly" attribute
+	 *
+	 * @param boolean $httponly
+	 *
+	 * @return static
+	 */
+	public function withHTTPOnly(bool $httponly = true);
+
+	/**
+	 * Creates a new Cookie with a new "SameSite" attribute.
+	 *
+	 * @param string $samesite
+	 *
+	 * @return static
+	 */
+	public function withSameSite(string $samesite);
+
+	/**
+	 * Creates a new Cookie with URL encoding option updated.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return static
+	 */
+	public function withRaw(bool $raw = true);
+}
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
new file mode 100644
index 0000000..614f327
--- /dev/null
+++ b/system/Cookie/Cookie.php
@@ -0,0 +1,842 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cookie;
+
+use ArrayAccess;
+use CodeIgniter\Cookie\Exceptions\CookieException;
+use Config\Cookie as CookieConfig;
+use DateTimeInterface;
+use InvalidArgumentException;
+use LogicException;
+
+/**
+ * A `Cookie` class represents an immutable HTTP cookie value object.
+ *
+ * Being immutable, modifying one or more of its attributes will return
+ * a new `Cookie` instance, rather than modifying itself. Users should
+ * reassign this new instance to a new variable to capture it.
+ *
+ * ```php
+ * $cookie = new Cookie('test_cookie', 'test_value');
+ * $cookie->getName(); // test_cookie
+ *
+ * $cookie->withName('prod_cookie');
+ * $cookie->getName(); // test_cookie
+ *
+ * $cookie2 = $cookie->withName('prod_cookie');
+ * $cookie2->getName(); // prod_cookie
+ * ```
+ */
+class Cookie implements ArrayAccess, CloneableCookieInterface
+{
+	/**
+	 * @var string
+	 */
+	protected $prefix = '';
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * @var string
+	 */
+	protected $value;
+
+	/**
+	 * @var integer
+	 */
+	protected $expires;
+
+	/**
+	 * @var string
+	 */
+	protected $path = '/';
+
+	/**
+	 * @var string
+	 */
+	protected $domain = '';
+
+	/**
+	 * @var boolean
+	 */
+	protected $secure = false;
+
+	/**
+	 * @var boolean
+	 */
+	protected $httponly = true;
+
+	/**
+	 * @var string
+	 */
+	protected $samesite = self::SAMESITE_LAX;
+
+	/**
+	 * @var boolean
+	 */
+	protected $raw = false;
+
+	/**
+	 * Default attributes for a Cookie object. The keys here are the
+	 * lowercase attribute names. Do not camelCase!
+	 *
+	 * @var array<string, mixed>
+	 */
+	private static $defaults = [
+		'prefix'   => '',
+		'expires'  => 0,
+		'path'     => '/',
+		'domain'   => '',
+		'secure'   => false,
+		'httponly' => true,
+		'samesite' => self::SAMESITE_LAX,
+		'raw'      => false,
+	];
+
+	/**
+	 * A cookie name can be any US-ASCII characters, except control characters,
+	 * spaces, tabs, or separator characters.
+	 *
+	 * @var string
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
+	 * @see https://tools.ietf.org/html/rfc2616#section-2.2
+	 */
+	private static $reservedCharsList = "=,; \t\r\n\v\f()<>@:\\\"/[]?{}";
+
+	/**
+	 * Set the default attributes to a Cookie instance by injecting
+	 * the values from the `CookieConfig` config or an array.
+	 *
+	 * @param CookieConfig|array<string, mixed> $config
+	 *
+	 * @return array<string, mixed> The old defaults array. Useful for resetting.
+	 */
+	public static function setDefaults($config = [])
+	{
+		$oldDefaults = self::$defaults;
+		$newDefaults = [];
+
+		if ($config instanceof CookieConfig)
+		{
+			$newDefaults = [
+				'prefix'   => $config->prefix,
+				'expires'  => $config->expires,
+				'path'     => $config->path,
+				'domain'   => $config->domain,
+				'secure'   => $config->secure,
+				'httponly' => $config->httponly,
+				'samesite' => $config->samesite,
+				'raw'      => $config->raw,
+			];
+		}
+		elseif (is_array($config))
+		{
+			$newDefaults = $config;
+		}
+
+		// This array union ensures that even if passed `$config` is not
+		// `CookieConfig` or `array`, no empty defaults will occur.
+		self::$defaults = $newDefaults + $oldDefaults;
+
+		return $oldDefaults;
+	}
+
+	//=========================================================================
+	// CONSTRUCTORS
+	//=========================================================================
+
+	/**
+	 * Create a new Cookie instance from a `Set-Cookie` header.
+	 *
+	 * @param string  $cookie
+	 * @param boolean $raw
+	 *
+	 * @throws CookieException
+	 *
+	 * @return static
+	 */
+	public static function fromHeaderString(string $cookie, bool $raw = false)
+	{
+		$data        = self::$defaults;
+		$data['raw'] = $raw;
+
+		$parts = preg_split('/\;[\s]*/', $cookie);
+		$part  = explode('=', array_shift($parts), 2);
+
+		$name  = $raw ? $part[0] : urldecode($part[0]);
+		$value = isset($part[1]) ? ($raw ? $part[1] : urldecode($part[1])) : '';
+		unset($part);
+
+		foreach ($parts as $part)
+		{
+			if (strpos($part, '=') !== false)
+			{
+				[$attr, $val] = explode('=', $part);
+			}
+			else
+			{
+				$attr = $part;
+				$val  = true;
+			}
+
+			$data[strtolower($attr)] = $val;
+		}
+
+		return new static($name, $value, $data);
+	}
+
+	/**
+	 * Construct a new Cookie instance.
+	 *
+	 * @param string               $name    The cookie's name
+	 * @param string               $value   The cookie's value
+	 * @param array<string, mixed> $options The cookie's options
+	 *
+	 * @throws CookieException
+	 */
+	final public function __construct(string $name, string $value = '', array $options = [])
+	{
+		$options += self::$defaults;
+
+		$options['expires'] = static::convertExpiresTimestamp($options['expires']);
+
+		// If both `Expires` and `Max-Age` are set, `Max-Age` has precedence.
+		if (isset($options['max-age']) && is_numeric($options['max-age']))
+		{
+			$options['expires'] = time() + (int) $options['max-age'];
+			unset($options['max-age']);
+		}
+
+		// to preserve backward compatibility with array-based cookies in previous CI versions
+		$prefix = $options['prefix'] ?: self::$defaults['prefix'];
+		$path   = $options['path'] ?: self::$defaults['path'];
+		$domain = $options['domain'] ?: self::$defaults['domain'];
+
+		// empty string SameSite should use the default for browsers
+		$samesite = $options['samesite'] ?: self::$defaults['samesite'];
+
+		$raw      = $options['raw'];
+		$secure   = $options['secure'];
+		$httponly = $options['httponly'];
+
+		$this->validateName($name, $raw);
+		$this->validatePrefix($prefix, $secure, $path, $domain);
+		$this->validateSameSite($samesite, $secure);
+
+		$this->prefix   = $prefix;
+		$this->name     = $name;
+		$this->value    = $value;
+		$this->expires  = static::convertExpiresTimestamp($options['expires']);
+		$this->path     = $path;
+		$this->domain   = $domain;
+		$this->secure   = $secure;
+		$this->httponly = $httponly;
+		$this->samesite = ucfirst(strtolower($samesite));
+		$this->raw      = $raw;
+	}
+
+	//=========================================================================
+	// GETTERS
+	//=========================================================================
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getId(): string
+	{
+		return implode(';', [$this->getPrefixedName(), $this->getPath(), $this->getDomain()]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getPrefix(): string
+	{
+		return $this->prefix;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getPrefixedName(): string
+	{
+		$name = $this->getPrefix();
+
+		if ($this->isRaw())
+		{
+			$name .= $this->getName();
+		}
+		else
+		{
+			$search  = str_split(self::$reservedCharsList);
+			$replace = array_map('rawurlencode', $search);
+
+			$name .= str_replace($search, $replace, $this->getName());
+		}
+
+		return $name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getExpiresTimestamp(): int
+	{
+		return $this->expires;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getExpiresString(): string
+	{
+		return gmdate(self::EXPIRES_FORMAT, $this->expires);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isExpired(): bool
+	{
+		return $this->expires === 0 || $this->expires < time();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMaxAge(): int
+	{
+		$maxAge = $this->expires - time();
+
+		return $maxAge >= 0 ? $maxAge : 0;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getPath(): string
+	{
+		return $this->path;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getDomain(): string
+	{
+		return $this->domain;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isSecure(): bool
+	{
+		return $this->secure;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isHTTPOnly(): bool
+	{
+		return $this->httponly;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getSameSite(): string
+	{
+		return $this->samesite;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isRaw(): bool
+	{
+		return $this->raw;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getOptions(): array
+	{
+		// This is the order of options in `setcookie`. DO NOT CHANGE.
+		return [
+			'expires'  => $this->expires,
+			'path'     => $this->path,
+			'domain'   => $this->domain,
+			'secure'   => $this->secure,
+			'httponly' => $this->httponly,
+			'samesite' => $this->samesite ?: ucfirst(self::SAMESITE_LAX),
+		];
+	}
+
+	//=========================================================================
+	// CLONING
+	//=========================================================================
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withPrefix(string $prefix = '')
+	{
+		$this->validatePrefix($prefix, $this->secure, $this->path, $this->domain);
+
+		$cookie = clone $this;
+
+		$cookie->prefix = $prefix;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withName(string $name)
+	{
+		$this->validateName($name, $this->raw);
+
+		$cookie = clone $this;
+
+		$cookie->name = $name;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withValue(string $value)
+	{
+		$cookie = clone $this;
+
+		$cookie->value = $value;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withExpires($expires)
+	{
+		$cookie = clone $this;
+
+		$cookie->expires = static::convertExpiresTimestamp($expires);
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withExpired()
+	{
+		$cookie = clone $this;
+
+		$cookie->expires = 0;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withNeverExpiring()
+	{
+		$cookie = clone $this;
+
+		$cookie->expires = time() + 5 * YEAR;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withPath(?string $path)
+	{
+		$path = $path ?: self::$defaults['path'];
+		$this->validatePrefix($this->prefix, $this->secure, $path, $this->domain);
+
+		$cookie = clone $this;
+
+		$cookie->path = $path;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withDomain(?string $domain)
+	{
+		$domain = $domain ?? self::$defaults['domain'];
+		$this->validatePrefix($this->prefix, $this->secure, $this->path, $domain);
+
+		$cookie = clone $this;
+
+		$cookie->domain = $domain;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withSecure(bool $secure = true)
+	{
+		$this->validatePrefix($this->prefix, $secure, $this->path, $this->domain);
+		$this->validateSameSite($this->samesite, $secure);
+
+		$cookie = clone $this;
+
+		$cookie->secure = $secure;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withHTTPOnly(bool $httponly = true)
+	{
+		$cookie = clone $this;
+
+		$cookie->httponly = $httponly;
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withSameSite(string $samesite)
+	{
+		$this->validateSameSite($samesite, $this->secure);
+
+		$cookie = clone $this;
+
+		$cookie->samesite = ucfirst(strtolower($samesite));
+
+		return $cookie;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withRaw(bool $raw = true)
+	{
+		$this->validateName($this->name, $raw);
+
+		$cookie = clone $this;
+
+		$cookie->raw = $raw;
+
+		return $cookie;
+	}
+
+	//=========================================================================
+	// ARRAY ACCESS FOR BC
+	//=========================================================================
+
+	/**
+	 * Whether an offset exists.
+	 *
+	 * @param string $offset
+	 *
+	 * @return boolean
+	 */
+	public function offsetExists($offset)
+	{
+		return $offset === 'expire' ? true : property_exists($this, $offset);
+	}
+
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @param string $offset
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @return mixed
+	 */
+	public function offsetGet($offset)
+	{
+		if (! $this->offsetExists($offset))
+		{
+			throw new InvalidArgumentException(sprintf('Undefined offset "%s".', $offset));
+		}
+
+		return $offset === 'expire' ? $this->expires : $this->{$offset};
+	}
+
+	/**
+	 * Offset to set.
+	 *
+	 * @param string $offset
+	 * @param mixed  $value
+	 *
+	 * @throws LogicException
+	 *
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		throw new LogicException(sprintf('Cannot set values of properties of %s as it is immutable.', static::class));
+	}
+
+	/**
+	 * Offset to unset.
+	 *
+	 * @param string $offset
+	 *
+	 * @throws LogicException
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		throw new LogicException(sprintf('Cannot unset values of properties of %s as it is immutable.', static::class));
+	}
+
+	//=========================================================================
+	// CONVERTERS
+	//=========================================================================
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function toHeaderString(): string
+	{
+		return $this->__toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function __toString()
+	{
+		$cookieHeader = [];
+
+		if ($this->getValue() === '')
+		{
+			$cookieHeader[] = $this->getPrefixedName() . '=deleted';
+			$cookieHeader[] = 'Expires=' . gmdate(self::EXPIRES_FORMAT, 0);
+			$cookieHeader[] = 'Max-Age=0';
+		}
+		else
+		{
+			$value = $this->isRaw() ? $this->getValue() : rawurlencode($this->getValue());
+
+			$cookieHeader[] = sprintf('%s=%s', $this->getPrefixedName(), $value);
+
+			if ($this->getExpiresTimestamp() !== 0)
+			{
+				$cookieHeader[] = 'Expires=' . $this->getExpiresString();
+				$cookieHeader[] = 'Max-Age=' . $this->getMaxAge();
+			}
+		}
+
+		if ($this->getPath() !== '')
+		{
+			$cookieHeader[] = 'Path=' . $this->getPath();
+		}
+
+		if ($this->getDomain() !== '')
+		{
+			$cookieHeader[] = 'Domain=' . $this->getDomain();
+		}
+
+		if ($this->isSecure())
+		{
+			$cookieHeader[] = 'Secure';
+		}
+
+		if ($this->isHTTPOnly())
+		{
+			$cookieHeader[] = 'HttpOnly';
+		}
+
+		$samesite = $this->getSameSite();
+
+		if ($samesite === '')
+		{
+			// modern browsers warn in console logs that an empty SameSite attribute
+			// will be given the `Lax` value
+			$samesite = self::SAMESITE_LAX;
+		}
+
+		$cookieHeader[] = 'SameSite=' . ucfirst(strtolower($samesite));
+
+		return implode('; ', $cookieHeader);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function toArray(): array
+	{
+		return [
+			'name'   => $this->name,
+			'value'  => $this->value,
+			'prefix' => $this->prefix,
+			'raw'    => $this->raw,
+		] + $this->getOptions();
+	}
+
+	/**
+	 * Converts expires time to Unix format.
+	 *
+	 * @param DateTimeInterface|integer|string $expires
+	 *
+	 * @return integer
+	 */
+	protected static function convertExpiresTimestamp($expires = 0): int
+	{
+		if ($expires instanceof DateTimeInterface)
+		{
+			$expires = $expires->format('U');
+		}
+
+		if (! is_string($expires) && ! is_int($expires))
+		{
+			throw CookieException::forInvalidExpiresTime(gettype($expires));
+		}
+
+		if (! is_numeric($expires))
+		{
+			$expires = strtotime($expires);
+
+			if ($expires === false)
+			{
+				throw CookieException::forInvalidExpiresValue();
+			}
+		}
+
+		return $expires > 0 ? (int) $expires : 0;
+	}
+
+	//=========================================================================
+	// VALIDATION
+	//=========================================================================
+
+	/**
+	 * Validates the cookie name per RFC 2616.
+	 *
+	 * If `$raw` is true, names should not contain invalid characters
+	 * as `setrawcookie()` will reject this.
+	 *
+	 * @param string  $name
+	 * @param boolean $raw
+	 *
+	 * @throws CookieException
+	 *
+	 * @return void
+	 */
+	protected function validateName(string $name, bool $raw): void
+	{
+		if ($raw && strpbrk($name, self::$reservedCharsList) !== false)
+		{
+			throw CookieException::forInvalidCookieName($name);
+		}
+
+		if ($name === '')
+		{
+			throw CookieException::forEmptyCookieName();
+		}
+	}
+
+	/**
+	 * Validates the special prefixes if some attribute requirements are met.
+	 *
+	 * @param string  $prefix
+	 * @param boolean $secure
+	 * @param string  $path
+	 * @param string  $domain
+	 *
+	 * @throws CookieException
+	 *
+	 * @return void
+	 */
+	protected function validatePrefix(string $prefix, bool $secure, string $path, string $domain): void
+	{
+		if (strpos($prefix, '__Secure-') === 0 && ! $secure)
+		{
+			throw CookieException::forInvalidSecurePrefix();
+		}
+
+		if (strpos($prefix, '__Host-') === 0 && (! $secure || $domain !== '' || $path !== '/'))
+		{
+			throw CookieException::forInvalidHostPrefix();
+		}
+	}
+
+	/**
+	 * Validates the `SameSite` to be within the allowed types.
+	 *
+	 * @param string  $samesite
+	 * @param boolean $secure
+	 *
+	 * @throws CookieException
+	 *
+	 * @return void
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+	 */
+	protected function validateSameSite(string $samesite, bool $secure): void
+	{
+		if ($samesite === '')
+		{
+			$samesite = self::$defaults['samesite'];
+		}
+
+		if ($samesite === '')
+		{
+			$samesite = self::SAMESITE_LAX;
+		}
+
+		if (! in_array(strtolower($samesite), self::ALLOWED_SAMESITE_VALUES, true))
+		{
+			throw CookieException::forInvalidSameSite($samesite);
+		}
+
+		if (strtolower($samesite) === self::SAMESITE_NONE && ! $secure)
+		{
+			throw CookieException::forInvalidSameSiteNone();
+		}
+	}
+}
diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php
new file mode 100644
index 0000000..550323f
--- /dev/null
+++ b/system/Cookie/CookieInterface.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cookie;
+
+/**
+ * Interface for a value object representation of an HTTP cookie.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
+ */
+interface CookieInterface
+{
+	/**
+	 * Cookies will be sent in all contexts, i.e in responses to both
+	 * first-party and cross-origin requests. If `SameSite=None` is set,
+	 * the cookie `Secure` attribute must also be set (or the cookie will be blocked).
+	 */
+	public const SAMESITE_NONE = 'none';
+
+	/**
+	 * Cookies are not sent on normal cross-site subrequests (for example to
+	 * load images or frames into a third party site), but are sent when a
+	 * user is navigating to the origin site (i.e. when following a link).
+	 */
+	public const SAMESITE_LAX = 'lax';
+
+	/**
+	 * Cookies will only be sent in a first-party context and not be sent
+	 * along with requests initiated by third party websites.
+	 */
+	public const SAMESITE_STRICT = 'strict';
+
+	/**
+	 * RFC 6265 allowed values for the "SameSite" attribute.
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+	 */
+	public const ALLOWED_SAMESITE_VALUES = [
+		self::SAMESITE_NONE,
+		self::SAMESITE_LAX,
+		self::SAMESITE_STRICT,
+	];
+
+	/**
+	 * Expires date format.
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Date
+	 * @see https://tools.ietf.org/html/rfc7231#section-7.1.1.2
+	 */
+	public const EXPIRES_FORMAT = 'D, d-M-Y H:i:s T';
+
+	/**
+	 * Returns a unique identifier for the cookie consisting
+	 * of its prefixed name, path, and domain.
+	 *
+	 * @return string
+	 */
+	public function getId(): string;
+
+	/**
+	 * Gets the cookie prefix.
+	 *
+	 * @return string
+	 */
+	public function getPrefix(): string;
+
+	/**
+	 * Gets the cookie name.
+	 *
+	 * @return string
+	 */
+	public function getName(): string;
+
+	/**
+	 * Gets the cookie name prepended with the prefix, if any.
+	 *
+	 * @return string
+	 */
+	public function getPrefixedName(): string;
+
+	/**
+	 * Gets the cookie value.
+	 *
+	 * @return string
+	 */
+	public function getValue(): string;
+
+	/**
+	 * Gets the time in Unix timestamp the cookie expires.
+	 *
+	 * @return integer
+	 */
+	public function getExpiresTimestamp(): int;
+
+	/**
+	 * Gets the formatted expires time.
+	 *
+	 * @return string
+	 */
+	public function getExpiresString(): string;
+
+	/**
+	 * Checks if the cookie is expired.
+	 *
+	 * @return boolean
+	 */
+	public function isExpired(): bool;
+
+	/**
+	 * Gets the "Max-Age" cookie attribute.
+	 *
+	 * @return integer
+	 */
+	public function getMaxAge(): int;
+
+	/**
+	 * Gets the "Path" cookie attribute.
+	 *
+	 * @return string
+	 */
+	public function getPath(): string;
+
+	/**
+	 * Gets the "Domain" cookie attribute.
+	 *
+	 * @return string
+	 */
+	public function getDomain(): string;
+
+	/**
+	 * Gets the "Secure" cookie attribute.
+	 *
+	 * Checks if the cookie is only sent to the server when a request is made
+	 * with the `https:` scheme (except on `localhost`), and therefore is more
+	 * resistent to man-in-the-middle attacks.
+	 *
+	 * @return boolean
+	 */
+	public function isSecure(): bool;
+
+	/**
+	 * Gets the "HttpOnly" cookie attribute.
+	 *
+	 * Checks if JavaScript is forbidden from accessing the cookie.
+	 *
+	 * @return boolean
+	 */
+	public function isHTTPOnly(): bool;
+
+	/**
+	 * Gets the "SameSite" cookie attribute.
+	 *
+	 * @return string
+	 */
+	public function getSameSite(): string;
+
+	/**
+	 * Checks if the cookie should be sent with no URL encoding.
+	 *
+	 * @return boolean
+	 */
+	public function isRaw(): bool;
+
+	/**
+	 * Gets the options that are passable to the `setcookie` variant
+	 * available on PHP 7.3+
+	 *
+	 * @return array<string, mixed>
+	 */
+	public function getOptions(): array;
+
+	/**
+	 * Returns the Cookie as a header value.
+	 *
+	 * @return string
+	 */
+	public function toHeaderString(): string;
+
+	/**
+	 * Returns the string representation of the Cookie object.
+	 *
+	 * @return string
+	 */
+	public function __toString();
+
+	/**
+	 * Returns the array representation of the Cookie object.
+	 *
+	 * @return array<string, mixed>
+	 */
+	public function toArray(): array;
+}
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
new file mode 100644
index 0000000..f34b816
--- /dev/null
+++ b/system/Cookie/CookieStore.php
@@ -0,0 +1,305 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cookie;
+
+use ArrayIterator;
+use CodeIgniter\Cookie\Exceptions\CookieException;
+use Countable;
+use IteratorAggregate;
+use Traversable;
+
+/**
+ * The CookieStore object represents an immutable collection of `Cookie` value objects.
+ *
+ * @implements IteratorAggregate<string, Cookie>
+ */
+class CookieStore implements Countable, IteratorAggregate
+{
+	/**
+	 * The cookie collection.
+	 *
+	 * @var array<string, Cookie>
+	 */
+	protected $cookies = [];
+
+	/**
+	 * Creates a CookieStore from an array of `Set-Cookie` headers.
+	 *
+	 * @param string[] $headers
+	 * @param boolean  $raw
+	 *
+	 * @throws CookieException
+	 *
+	 * @return static
+	 */
+	public static function fromCookieHeaders(array $headers, bool $raw = false)
+	{
+		/**
+		 * @var Cookie[] $cookies
+		 */
+		$cookies = array_filter(array_map(function (string $header) use ($raw) {
+			try
+			{
+				return Cookie::fromHeaderString($header, $raw);
+			}
+			catch (CookieException $e)
+			{
+				log_message('error', $e->getMessage());
+				return false;
+			}
+		}, $headers));
+
+		return new static($cookies);
+	}
+
+	/**
+	 * @param Cookie[] $cookies
+	 *
+	 * @throws CookieException
+	 */
+	final public function __construct(array $cookies)
+	{
+		$this->validateCookies($cookies);
+
+		foreach ($cookies as $cookie)
+		{
+			$this->cookies[$cookie->getId()] = $cookie;
+		}
+	}
+
+	/**
+	 * Checks if a `Cookie` object identified by name and
+	 * prefix is present in the collection.
+	 *
+	 * @param string      $name
+	 * @param string      $prefix
+	 * @param string|null $value
+	 *
+	 * @return boolean
+	 */
+	public function has(string $name, string $prefix = '', string $value = null): bool
+	{
+		$name = $prefix . $name;
+
+		foreach ($this->cookies as $cookie)
+		{
+			if ($cookie->getPrefixedName() !== $name)
+			{
+				continue;
+			}
+
+			if ($value === null)
+			{
+				return true; // for BC
+			}
+
+			return $cookie->getValue() === $value;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retrieves an instance of `Cookie` identified by a name and prefix.
+	 * This throws an exception if not found.
+	 *
+	 * @param string $name
+	 * @param string $prefix
+	 *
+	 * @throws CookieException
+	 *
+	 * @return Cookie
+	 */
+	public function get(string $name, string $prefix = ''): Cookie
+	{
+		$name = $prefix . $name;
+
+		foreach ($this->cookies as $cookie)
+		{
+			if ($cookie->getPrefixedName() === $name)
+			{
+				return $cookie;
+			}
+		}
+
+		throw CookieException::forUnknownCookieInstance([$name, $prefix]);
+	}
+
+	/**
+	 * Store a new cookie and return a new collection. The original collection
+	 * is left unchanged.
+	 *
+	 * @param Cookie $cookie
+	 *
+	 * @return static
+	 */
+	public function put(Cookie $cookie)
+	{
+		$store = clone $this;
+
+		$store->cookies[$cookie->getId()] = $cookie;
+
+		return $store;
+	}
+
+	/**
+	 * Removes a cookie from a collection and returns an updated collection.
+	 * The original collection is left unchanged.
+	 *
+	 * Removing a cookie from the store **DOES NOT** delete it from the browser.
+	 * If you intend to delete a cookie *from the browser*, you must put an empty
+	 * value cookie with the same name to the store.
+	 *
+	 * @param string $name
+	 * @param string $prefix
+	 *
+	 * @return static
+	 */
+	public function remove(string $name, string $prefix = '')
+	{
+		$default = Cookie::setDefaults();
+
+		$id = implode(';', [$prefix . $name, $default['path'], $default['domain']]);
+
+		$store = clone $this;
+
+		foreach (array_keys($store->cookies) as $index)
+		{
+			if ($index === $id)
+			{
+				unset($store->cookies[$index]);
+			}
+		}
+
+		return $store;
+	}
+
+	/**
+	 * Dispatches all cookies in store.
+	 *
+	 * @return void
+	 */
+	public function dispatch(): void
+	{
+		foreach ($this->cookies as $cookie)
+		{
+			$name    = $cookie->getPrefixedName();
+			$value   = $cookie->getValue();
+			$options = $cookie->getOptions();
+
+			if ($cookie->isRaw())
+			{
+				$this->setRawCookie($name, $value, $options);
+			}
+			else
+			{
+				$this->setCookie($name, $value, $options);
+			}
+		}
+
+		$this->clear();
+	}
+
+	/**
+	 * Returns all cookie instances in store.
+	 *
+	 * @return array<string, Cookie>
+	 */
+	public function display(): array
+	{
+		return $this->cookies;
+	}
+
+	/**
+	 * Clears the cookie collection.
+	 *
+	 * @return void
+	 */
+	public function clear(): void
+	{
+		$this->cookies = [];
+	}
+
+	/**
+	 * Gets the Cookie count in this collection.
+	 *
+	 * @return integer
+	 */
+	public function count(): int
+	{
+		return count($this->cookies);
+	}
+
+	/**
+	 * Gets the iterator for the cookie collection.
+	 *
+	 * @return Traversable<string, Cookie>
+	 */
+	public function getIterator()
+	{
+		return new ArrayIterator($this->cookies);
+	}
+
+	/**
+	 * Validates all cookies passed to be instances of Cookie.
+	 *
+	 * @param array $cookies
+	 *
+	 * @throws CookieException
+	 *
+	 * @return void
+	 */
+	protected function validateCookies(array $cookies): void
+	{
+		foreach ($cookies as $index => $cookie)
+		{
+			$type = is_object($cookie) ? get_class($cookie) : gettype($cookie);
+
+			if (! $cookie instanceof Cookie)
+			{
+				throw CookieException::forInvalidCookieInstance([static::class, Cookie::class, $type, $index]);
+			}
+		}
+	}
+
+	/**
+	 * Extracted call to `setrawcookie()` in order to run unit tests on it.
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @param array  $options
+	 *
+	 * @return void
+	 */
+	protected function setRawCookie(string $name, string $value, array $options): void
+	{
+		setrawcookie($name, $value, $options);
+	}
+
+	/**
+	 * Extracted call to `setcookie()` in order to run unit tests on it.
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @param array  $options
+	 *
+	 * @return void
+	 */
+	protected function setCookie(string $name, string $value, array $options): void
+	{
+		setcookie($name, $value, $options);
+	}
+}
diff --git a/system/Cookie/Exceptions/CookieException.php b/system/Cookie/Exceptions/CookieException.php
new file mode 100644
index 0000000..31cf305
--- /dev/null
+++ b/system/Cookie/Exceptions/CookieException.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cookie\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+/**
+ * CookieException is thrown for invalid cookies initialization and management.
+ */
+class CookieException extends FrameworkException
+{
+	/**
+	 * Thrown for invalid type given for the "Expires" attribute.
+	 *
+	 * @param string $type
+	 *
+	 * @return static
+	 */
+	public static function forInvalidExpiresTime(string $type)
+	{
+		return new static(lang('Cookie.invalidExpiresTime', [$type]));
+	}
+
+	/**
+	 * Thrown when the value provided for "Expires" is invalid.
+	 *
+	 * @return static
+	 */
+	public static function forInvalidExpiresValue()
+	{
+		return new static(lang('Cookie.invalidExpiresValue'));
+	}
+
+	/**
+	 * Thrown when the cookie name contains invalid characters per RFC 2616.
+	 *
+	 * @param string $name
+	 *
+	 * @return static
+	 */
+	public static function forInvalidCookieName(string $name)
+	{
+		return new static(lang('Cookie.invalidCookieName', [$name]));
+	}
+
+	/**
+	 * Thrown when the cookie name is empty.
+	 *
+	 * @return static
+	 */
+	public static function forEmptyCookieName()
+	{
+		return new static(lang('Cookie.emptyCookieName'));
+	}
+
+	/**
+	 * Thrown when using the `__Secure-` prefix but the `Secure` attribute
+	 * is not set to true.
+	 *
+	 * @return static
+	 */
+	public static function forInvalidSecurePrefix()
+	{
+		return new static(lang('Cookie.invalidSecurePrefix'));
+	}
+
+	/**
+	 * Thrown when using the `__Host-` prefix but the `Secure` flag is not
+	 * set, the `Domain` is set, and the `Path` is not `/`.
+	 *
+	 * @return static
+	 */
+	public static function forInvalidHostPrefix()
+	{
+		return new static(lang('Cookie.invalidHostPrefix'));
+	}
+
+	/**
+	 * Thrown when the `SameSite` attribute given is not of the valid types.
+	 *
+	 * @param string $sameSite
+	 *
+	 * @return static
+	 */
+	public static function forInvalidSameSite(string $sameSite)
+	{
+		return new static(lang('Cookie.invalidSameSite', [$sameSite]));
+	}
+
+	/**
+	 * Thrown when the `SameSite` attribute is set to `None` but the `Secure`
+	 * attribute is not set.
+	 *
+	 * @return static
+	 */
+	public static function forInvalidSameSiteNone()
+	{
+		return new static(lang('Cookie.invalidSameSiteNone'));
+	}
+
+	/**
+	 * Thrown when the `CookieStore` class is filled with invalid Cookie objects.
+	 *
+	 * @param array<string|integer> $data
+	 *
+	 * @return static
+	 */
+	public static function forInvalidCookieInstance(array $data)
+	{
+		return new static(lang('Cookie.invalidCookieInstance', $data));
+	}
+
+	/**
+	 * Thrown when the queried Cookie object does not exist in the cookie collection.
+	 *
+	 * @param string[] $data
+	 *
+	 * @return static
+	 */
+	public static function forUnknownCookieInstance(array $data)
+	{
+		return new static(lang('Cookie.unknownCookieInstance', $data));
+	}
+}
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
new file mode 100644
index 0000000..127b918
--- /dev/null
+++ b/system/Database/BaseBuilder.php
@@ -0,0 +1,3524 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use Closure;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use InvalidArgumentException;
+
+/**
+ * Class BaseBuilder
+ *
+ * Provides the core Query Builder methods.
+ * Database-specific Builders might need to override
+ * certain methods to make them work.
+ */
+class BaseBuilder
+{
+	/**
+	 * Reset DELETE data flag
+	 *
+	 * @var boolean
+	 */
+	protected $resetDeleteData = false;
+
+	/**
+	 * QB SELECT data
+	 *
+	 * @var array
+	 */
+	protected $QBSelect = [];
+
+	/**
+	 * QB DISTINCT flag
+	 *
+	 * @var boolean
+	 */
+	protected $QBDistinct = false;
+
+	/**
+	 * QB FROM data
+	 *
+	 * @var array
+	 */
+	protected $QBFrom = [];
+
+	/**
+	 * QB JOIN data
+	 *
+	 * @var array
+	 */
+	protected $QBJoin = [];
+
+	/**
+	 * QB WHERE data
+	 *
+	 * @var array
+	 */
+	protected $QBWhere = [];
+
+	/**
+	 * QB GROUP BY data
+	 *
+	 * @var array
+	 */
+	public $QBGroupBy = [];
+
+	/**
+	 * QB HAVING data
+	 *
+	 * @var array
+	 */
+	protected $QBHaving = [];
+
+	/**
+	 * QB keys
+	 *
+	 * @var array
+	 */
+	protected $QBKeys = [];
+
+	/**
+	 * QB LIMIT data
+	 *
+	 * @var integer|boolean
+	 */
+	protected $QBLimit = false;
+
+	/**
+	 * QB OFFSET data
+	 *
+	 * @var integer|boolean
+	 */
+	protected $QBOffset = false;
+
+	/**
+	 * QB ORDER BY data
+	 *
+	 * @var array|null|string
+	 */
+	public $QBOrderBy = [];
+
+	/**
+	 * QB NO ESCAPE data
+	 *
+	 * @var array
+	 */
+	public $QBNoEscape = [];
+
+	/**
+	 * QB data sets
+	 *
+	 * @var array
+	 */
+	protected $QBSet = [];
+
+	/**
+	 * QB WHERE group started flag
+	 *
+	 * @var boolean
+	 */
+	protected $QBWhereGroupStarted = false;
+
+	/**
+	 * QB WHERE group count
+	 *
+	 * @var integer
+	 */
+	protected $QBWhereGroupCount = 0;
+
+	/**
+	 * Ignore data that cause certain
+	 * exceptions, for example in case of
+	 * duplicate keys.
+	 *
+	 * @var boolean
+	 */
+	protected $QBIgnore = false;
+
+	/**
+	 * A reference to the database connection.
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * Name of the primary table for this instance.
+	 * Tracked separately because $QBFrom gets escaped
+	 * and prefixed.
+	 *
+	 * @var string
+	 */
+	protected $tableName;
+
+	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'RAND()',
+		'RAND(%d)',
+	];
+
+	/**
+	 * COUNT string
+	 *
+	 * @used-by CI_DB_driver::count_all()
+	 * @used-by BaseBuilder::count_all_results()
+	 *
+	 * @var string
+	 */
+	protected $countString = 'SELECT COUNT(*) AS ';
+
+	/**
+	 * Collects the named parameters and
+	 * their values for later binding
+	 * in the Query object.
+	 *
+	 * @var array
+	 */
+	protected $binds = [];
+
+	/**
+	 * Collects the key count for named parameters
+	 * in the Query object.
+	 *
+	 * @var array
+	 */
+	protected $bindsKeyCount = [];
+
+	/**
+	 * Some databases, like SQLite, do not by default
+	 * allow limiting of delete clauses.
+	 *
+	 * @var boolean
+	 */
+	protected $canLimitDeletes = true;
+
+	/**
+	 * Some databases do not by default
+	 * allow limit update queries with WHERE.
+	 *
+	 * @var boolean
+	 */
+	protected $canLimitWhereUpdates = true;
+
+	/**
+	 * Specifies which sql statements
+	 * support the ignore option.
+	 *
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [];
+
+	/**
+	 * Builder testing mode status.
+	 *
+	 * @var boolean
+	 */
+	protected $testMode = false;
+
+	/**
+	 * Tables relation types
+	 *
+	 * @var array
+	 */
+	protected $joinTypes = [
+		'LEFT',
+		'RIGHT',
+		'OUTER',
+		'INNER',
+		'LEFT OUTER',
+		'RIGHT OUTER',
+	];
+
+	//--------------------------------------------------------------------
+	/**
+	 * Constructor
+	 *
+	 * @param  string|array        $tableName
+	 * @param  ConnectionInterface $db
+	 * @param  array               $options
+	 * @throws DatabaseException
+	 */
+	public function __construct($tableName, ConnectionInterface &$db, array $options = null)
+	{
+		if (empty($tableName))
+		{
+			throw new DatabaseException('A table must be specified when creating a new Query Builder.');
+		}
+
+		/**
+		 * @var BaseConnection $db
+		 */
+		$this->db = $db;
+
+		$this->tableName = $tableName;
+		$this->from($tableName);
+
+		if (! empty($options))
+		{
+			foreach ($options as $key => $value)
+			{
+				if (property_exists($this, $key))
+				{
+					$this->$key = $value;
+				}
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns the current database connection
+	 *
+	 * @return ConnectionInterface|BaseConnection
+	 */
+	public function db(): ConnectionInterface
+	{
+		return $this->db;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a test mode status.
+	 *
+	 * @param boolean $mode Mode to set
+	 *
+	 * @return $this
+	 */
+	public function testMode(bool $mode = true)
+	{
+		$this->testMode = $mode;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the name of the primary table.
+	 *
+	 * @return string
+	 */
+	public function getTable(): string
+	{
+		return $this->tableName;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of bind values and their
+	 * named parameters for binding in the Query object later.
+	 *
+	 * @return array
+	 */
+	public function getBinds(): array
+	{
+		return $this->binds;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ignore
+	 *
+	 * Set ignore Flag for next insert,
+	 * update or delete query.
+	 *
+	 * @param boolean $ignore
+	 *
+	 * @return $this
+	 */
+	public function ignore(bool $ignore = true)
+	{
+		$this->QBIgnore = $ignore;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select
+	 *
+	 * Generates the SELECT portion of the query
+	 *
+	 * @param string|array $select
+	 * @param boolean      $escape
+	 *
+	 * @return $this
+	 */
+	public function select($select = '*', bool $escape = null)
+	{
+		if (is_string($select))
+		{
+			$select = explode(',', $select);
+		}
+
+		// If the escape value was not set, we will base it on the global setting
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		foreach ($select as $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$this->QBSelect[] = $val;
+
+				/*
+				 * When doing 'SELECT NULL as field_alias FROM table'
+				 * null gets taken as a field, and therefore escaped
+				 * with backticks.
+				 * This prevents NULL being escaped
+				 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1169
+				 */
+				if (mb_stripos(trim($val), 'NULL') === 0)
+				{
+					$escape = false;
+				}
+
+				$this->QBNoEscape[] = $escape;
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select Max
+	 *
+	 * Generates a SELECT MAX(field) portion of a query
+	 *
+	 * @param string $select The field
+	 * @param string $alias  An alias
+	 *
+	 * @return $this
+	 */
+	public function selectMax(string $select = '', string $alias = '')
+	{
+		return $this->maxMinAvgSum($select, $alias);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select Min
+	 *
+	 * Generates a SELECT MIN(field) portion of a query
+	 *
+	 * @param string $select The field
+	 * @param string $alias  An alias
+	 *
+	 * @return $this
+	 */
+	public function selectMin(string $select = '', string $alias = '')
+	{
+		return $this->maxMinAvgSum($select, $alias, 'MIN');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select Average
+	 *
+	 * Generates a SELECT AVG(field) portion of a query
+	 *
+	 * @param string $select The field
+	 * @param string $alias  An alias
+	 *
+	 * @return $this
+	 */
+	public function selectAvg(string $select = '', string $alias = '')
+	{
+		return $this->maxMinAvgSum($select, $alias, 'AVG');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select Sum
+	 *
+	 * Generates a SELECT SUM(field) portion of a query
+	 *
+	 * @param string $select The field
+	 * @param string $alias  An alias
+	 *
+	 * @return $this
+	 */
+	public function selectSum(string $select = '', string $alias = '')
+	{
+		return $this->maxMinAvgSum($select, $alias, 'SUM');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select Count
+	 *
+	 * Generates a SELECT COUNT(field) portion of a query
+	 *
+	 * @param string $select The field
+	 * @param string $alias  An alias
+	 *
+	 * @return $this
+	 */
+	public function selectCount(string $select = '', string $alias = '')
+	{
+		return $this->maxMinAvgSum($select, $alias, 'COUNT');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * SELECT [MAX|MIN|AVG|SUM|COUNT]()
+	 *
+	 * @used-by selectMax()
+	 * @used-by selectMin()
+	 * @used-by selectAvg()
+	 * @used-by selectSum()
+	 *
+	 * @param string $select Field name
+	 * @param string $alias
+	 * @param string $type
+	 *
+	 * @return $this
+	 * @throws DataException
+	 * @throws DatabaseException
+	 */
+	protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
+	{
+		if ($select === '')
+		{
+			throw DataException::forEmptyInputGiven('Select');
+		}
+
+		if (strpos($select, ',') !== false)
+		{
+			throw DataException::forInvalidArgument('column name not separated by comma');
+		}
+
+		$type = strtoupper($type);
+
+		if (! in_array($type, ['MAX', 'MIN', 'AVG', 'SUM', 'COUNT'], true))
+		{
+			throw new DatabaseException('Invalid function type: ' . $type);
+		}
+
+		if ($alias === '')
+		{
+			$alias = $this->createAliasFromTable(trim($select));
+		}
+
+		$sql = $type . '(' . $this->db->protectIdentifiers(trim($select)) . ') AS ' . $this->db->escapeIdentifiers(trim($alias));
+
+		$this->QBSelect[]   = $sql;
+		$this->QBNoEscape[] = null;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the alias name based on the table
+	 *
+	 * @param string $item
+	 *
+	 * @return string
+	 */
+	protected function createAliasFromTable(string $item): string
+	{
+		if (strpos($item, '.') !== false)
+		{
+			$item = explode('.', $item);
+
+			return end($item);
+		}
+
+		return $item;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * DISTINCT
+	 *
+	 * Sets a flag which tells the query string compiler to add DISTINCT
+	 *
+	 * @param boolean $val
+	 *
+	 * @return $this
+	 */
+	public function distinct(bool $val = true)
+	{
+		$this->QBDistinct = $val;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * From
+	 *
+	 * Generates the FROM portion of the query
+	 *
+	 * @param mixed   $from      can be a string or array
+	 * @param boolean $overwrite Should we remove the first table existing?
+	 *
+	 * @return $this
+	 */
+	public function from($from, bool $overwrite = false)
+	{
+		if ($overwrite === true)
+		{
+			$this->QBFrom = [];
+			$this->db->setAliasedTables([]);
+		}
+
+		foreach ((array) $from as $val)
+		{
+			if (strpos($val, ',') !== false)
+			{
+				foreach (explode(',', $val) as $v)
+				{
+					$v = trim($v);
+					$this->trackAliases($v);
+
+					$this->QBFrom[] = $v = $this->db->protectIdentifiers($v, true, null, false);
+				}
+			}
+			else
+			{
+				$val = trim($val);
+
+				// Extract any aliases that might exist. We use this information
+				// in the protectIdentifiers to know whether to add a table prefix
+				$this->trackAliases($val);
+
+				$this->QBFrom[] = $this->db->protectIdentifiers($val, true, null, false);
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * JOIN
+	 *
+	 * Generates the JOIN portion of the query
+	 *
+	 * @param string  $table
+	 * @param string  $cond   The join condition
+	 * @param string  $type   The type of join
+	 * @param boolean $escape Whether not to try to escape identifiers
+	 *
+	 * @return $this
+	 */
+	public function join(string $table, string $cond, string $type = '', bool $escape = null)
+	{
+		if ($type !== '')
+		{
+			$type = strtoupper(trim($type));
+
+			if (! in_array($type, $this->joinTypes, true))
+			{
+				$type = '';
+			}
+			else
+			{
+				$type .= ' ';
+			}
+		}
+
+		// Extract any aliases that might exist. We use this information
+		// in the protectIdentifiers to know whether to add a table prefix
+		$this->trackAliases($table);
+
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		if (! $this->hasOperator($cond))
+		{
+			$cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
+		}
+		elseif ($escape === false)
+		{
+			$cond = ' ON ' . $cond;
+		}
+		else
+		{
+			// Split multiple conditions
+			if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE))
+			{
+				$conditions = [];
+				$joints     = $joints[0];
+				array_unshift($joints, ['', 0]);
+
+				for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i --)
+				{
+					$joints[$i][1] += strlen($joints[$i][0]); // offset
+					$conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
+					$pos            = $joints[$i][1] - strlen($joints[$i][0]);
+					$joints[$i]     = $joints[$i][0];
+				}
+				ksort($conditions);
+			}
+			else
+			{
+				$conditions = [$cond];
+				$joints     = [''];
+			}
+
+			$cond = ' ON ';
+			foreach ($conditions as $i => $condition)
+			{
+				$operator = $this->getOperator($condition);
+
+				$cond .= $joints[$i];
+				$cond .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+			}
+		}
+
+		// Do we want to escape the table name?
+		if ($escape === true)
+		{
+			$table = $this->db->protectIdentifiers($table, true, null, false);
+		}
+
+		// Assemble the JOIN statement
+		$this->QBJoin[] = $join = $type . 'JOIN ' . $table . $cond;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * WHERE
+	 *
+	 * Generates the WHERE portion of the query.
+	 * Separates multiple calls with 'AND'.
+	 *
+	 * @param mixed   $key
+	 * @param mixed   $value
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function where($key, $value = null, bool $escape = null)
+	{
+		return $this->whereHaving('QBWhere', $key, $value, 'AND ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR WHERE
+	 *
+	 * Generates the WHERE portion of the query.
+	 * Separates multiple calls with 'OR'.
+	 *
+	 * @param mixed   $key
+	 * @param mixed   $value
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function orWhere($key, $value = null, bool $escape = null)
+	{
+		return $this->whereHaving('QBWhere', $key, $value, 'OR ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * WHERE, HAVING
+	 *
+	 * @used-by where()
+	 * @used-by orWhere()
+	 * @used-by having()
+	 * @used-by orHaving()
+	 *
+	 * @param string  $qbKey  'QBWhere' or 'QBHaving'
+	 * @param mixed   $key
+	 * @param mixed   $value
+	 * @param string  $type
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
+	{
+		if (! is_array($key))
+		{
+			$key = [$key => $value];
+		}
+
+		// If the escape value was not set will base it on the global setting
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		foreach ($key as $k => $v)
+		{
+			$prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
+
+			if ($v !== null)
+			{
+				$op = $this->getOperator($k, true);
+
+				if (! empty($op))
+				{
+					$k = trim($k);
+
+					end($op);
+
+					$op = trim(current($op));
+
+					if (substr($k, -1 * strlen($op)) === $op)
+					{
+						$k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
+					}
+				}
+
+				$bind = $this->setBind($k, $v, $escape);
+
+				if (empty($op))
+				{
+					$k .= ' =';
+				}
+				else
+				{
+					$k .= " $op";
+				}
+
+				if ($v instanceof Closure)
+				{
+					$builder = $this->cleanClone();
+					$v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
+				}
+				else
+				{
+					$v = " :$bind:";
+				}
+			}
+			elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving')
+			{
+				// value appears not to have been set, assign the test to IS NULL
+				$k .= ' IS NULL';
+			}
+			elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
+			{
+				$k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
+			}
+
+			$this->{$qbKey}[] = [
+				'condition' => $prefix . $k . $v,
+				'escape'    => $escape,
+			];
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * WHERE IN
+	 *
+	 * Generates a WHERE field IN('item', 'item') SQL query,
+	 * joined with 'AND' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function whereIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, false, 'AND ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR WHERE IN
+	 *
+	 * Generates a WHERE field IN('item', 'item') SQL query,
+	 * joined with 'OR' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function orWhereIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, false, 'OR ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * WHERE NOT IN
+	 *
+	 * Generates a WHERE field NOT IN('item', 'item') SQL query,
+	 * joined with 'AND' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function whereNotIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, true, 'AND ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR WHERE NOT IN
+	 *
+	 * Generates a WHERE field NOT IN('item', 'item') SQL query,
+	 * joined with 'OR' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function orWhereNotIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, true, 'OR ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * HAVING IN
+	 *
+	 * Generates a HAVING field IN('item', 'item') SQL query,
+	 * joined with 'AND' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function havingIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, false, 'AND ', $escape, 'QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR HAVING IN
+	 *
+	 * Generates a HAVING field IN('item', 'item') SQL query,
+	 * joined with 'OR' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function orHavingIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, false, 'OR ', $escape, 'QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * HAVING NOT IN
+	 *
+	 * Generates a HAVING field NOT IN('item', 'item') SQL query,
+	 * joined with 'AND' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function havingNotIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, true, 'AND ', $escape, 'QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR HAVING NOT IN
+	 *
+	 * Generates a HAVING field NOT IN('item', 'item') SQL query,
+	 * joined with 'OR' if appropriate.
+	 *
+	 * @param string               $key    The field to search
+	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
+	 * @param boolean              $escape
+	 *
+	 * @return $this
+	 */
+	public function orHavingNotIn(string $key = null, $values = null, bool $escape = null)
+	{
+		return $this->_whereIn($key, $values, true, 'OR ', $escape, 'QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Internal WHERE IN
+	 *
+	 * @used-by WhereIn()
+	 * @used-by orWhereIn()
+	 * @used-by whereNotIn()
+	 * @used-by orWhereNotIn()
+	 *
+	 * @param  string             $key    The field to search
+	 * @param  array|Closure|null $values The values searched on, or anonymous function with subquery
+	 * @param  boolean            $not    If the statement would be IN or NOT IN
+	 * @param  string             $type
+	 * @param  boolean            $escape
+	 * @param  string             $clause (Internal use only)
+	 * @throws InvalidArgumentException
+	 *
+	 * @return $this
+	 */
+	protected function _whereIn(string $key = null, $values = null, bool $not = false, string $type = 'AND ', bool $escape = null, string $clause = 'QBWhere')
+	{
+		if (empty($key) || ! is_string($key))
+		{
+			if (CI_DEBUG)
+			{
+				throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
+			}
+			// @codeCoverageIgnoreStart
+			return $this;
+			// @codeCoverageIgnoreEnd
+		}
+
+		if ($values === null || (! is_array($values) && ! ($values instanceof Closure)))
+		{
+			if (CI_DEBUG)
+			{
+				throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
+			}
+			// @codeCoverageIgnoreStart
+			return $this;
+			// @codeCoverageIgnoreEnd
+		}
+
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		$ok = $key;
+
+		if ($escape === true)
+		{
+			$key = $this->db->protectIdentifiers($key);
+		}
+
+		$not = ($not) ? ' NOT' : '';
+
+		if ($values instanceof Closure)
+		{
+			$builder = $this->cleanClone();
+			$ok      = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
+		}
+		else
+		{
+			$whereIn = array_values($values);
+			$ok      = $this->setBind($ok, $whereIn, $escape);
+		}
+
+		$prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
+
+		$whereIn = [
+			'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ($ok)" : " IN :{$ok}:"),
+			'escape'    => false,
+		];
+
+		$this->{$clause}[] = $whereIn;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * LIKE
+	 *
+	 * Generates a %LIKE% portion of the query.
+	 * Separates multiple calls with 'AND'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
+	 *
+	 * @return $this
+	 */
+	public function like($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * NOT LIKE
+	 *
+	 * Generates a NOT LIKE portion of the query.
+	 * Separates multiple calls with 'AND'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
+	 *
+	 * @return $this
+	 */
+	public function notLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR LIKE
+	 *
+	 * Generates a %LIKE% portion of the query.
+	 * Separates multiple calls with 'OR'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
+	 *
+	 * @return $this
+	 */
+	public function orLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR NOT LIKE
+	 *
+	 * Generates a NOT LIKE portion of the query.
+	 * Separates multiple calls with 'OR'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
+	 *
+	 * @return $this
+	 */
+	public function orNotLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * LIKE with HAVING clause
+	 *
+	 * Generates a %LIKE% portion of the query.
+	 * Separates multiple calls with 'AND'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function havingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * NOT LIKE with HAVING clause
+	 *
+	 * Generates a NOT LIKE portion of the query.
+	 * Separates multiple calls with 'AND'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function notHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * OR LIKE with HAVING clause
+	 *
+	 * Generates a %LIKE% portion of the query.
+	 * Separates multiple calls with 'OR'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function orHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * OR NOT LIKE with HAVING clause
+	 *
+	 * Generates a NOT LIKE portion of the query.
+	 * Separates multiple calls with 'OR'.
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $side
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function orNotHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+	{
+		return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Internal LIKE
+	 *
+	 * @used-by like()
+	 * @used-by orLike()
+	 * @used-by notLike()
+	 * @used-by orNotLike()
+	 * @used-by havingLike()
+	 * @used-by orHavingLike()
+	 * @used-by notHavingLike()
+	 * @used-by orNotHavingLike()
+	 *
+	 * @param mixed   $field
+	 * @param string  $match
+	 * @param string  $type
+	 * @param string  $side
+	 * @param string  $not
+	 * @param boolean $escape
+	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
+	 * @param string  $clause            (Internal use only)
+	 *
+	 * @return $this
+	 */
+	protected function _like($field, string $match = '', string $type = 'AND ', string $side = 'both', string $not = '', bool $escape = null, bool $insensitiveSearch = false, string $clause = 'QBWhere')
+	{
+		if (! is_array($field))
+		{
+			$field = [$field => $match];
+		}
+
+		$escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
+
+		// lowercase $side in case somebody writes e.g. 'BEFORE' instead of 'before' (doh)
+		$side = strtolower($side);
+
+		foreach ($field as $k => $v)
+		{
+			if ($insensitiveSearch === true)
+			{
+				$v = strtolower($v);
+			}
+
+			$prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
+
+			if ($side === 'none')
+			{
+				$bind = $this->setBind($k, $v, $escape);
+			}
+			elseif ($side === 'before')
+			{
+				$bind = $this->setBind($k, "%$v", $escape);
+			}
+			elseif ($side === 'after')
+			{
+				$bind = $this->setBind($k, "$v%", $escape);
+			}
+			else
+			{
+				$bind = $this->setBind($k, "%$v%", $escape);
+			}
+
+			$likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
+
+			// some platforms require an escape sequence definition for LIKE wildcards
+			if ($escape === true && $this->db->likeEscapeStr !== '')
+			{
+				$likeStatement .= sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar);
+			}
+
+			$this->{$clause}[] = [
+				'condition' => $likeStatement,
+				'escape'    => $escape,
+			];
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform independent LIKE statement builder.
+	 *
+	 * @param string|null $prefix
+	 * @param string      $column
+	 * @param string|null $not
+	 * @param string      $bind
+	 * @param boolean     $insensitiveSearch
+	 *
+	 * @return string     $like_statement
+	 */
+	protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
+	{
+		if ($insensitiveSearch === true)
+		{
+			return "{$prefix} LOWER({$column}) {$not} LIKE :{$bind}:";
+		}
+
+		return "{$prefix} {$column} {$not} LIKE :{$bind}:";
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts a query group.
+	 *
+	 * @return $this
+	 */
+	public function groupStart()
+	{
+		return $this->groupStartPrepare();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts a query group, but ORs the group
+	 *
+	 * @return $this
+	 */
+	public function orGroupStart()
+	{
+		return $this->groupStartPrepare('', 'OR ');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts a query group, but NOTs the group
+	 *
+	 * @return $this
+	 */
+	public function notGroupStart()
+	{
+		return $this->groupStartPrepare('NOT ');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts a query group, but OR NOTs the group
+	 *
+	 * @return $this
+	 */
+	public function orNotGroupStart()
+	{
+		return $this->groupStartPrepare('NOT ', 'OR ');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ends a query group
+	 *
+	 * @return $this
+	 */
+	public function groupEnd()
+	{
+		return $this->groupEndPrepare();
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Starts a query group for HAVING clause.
+	 *
+	 * @return $this
+	 */
+	public function havingGroupStart()
+	{
+		return $this->groupStartPrepare('', 'AND ', 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Starts a query group for HAVING clause, but ORs the group.
+	 *
+	 * @return $this
+	 */
+	public function orHavingGroupStart()
+	{
+		return $this->groupStartPrepare('', 'OR ', 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Starts a query group for HAVING clause, but NOTs the group.
+	 *
+	 * @return $this
+	 */
+	public function notHavingGroupStart()
+	{
+		return $this->groupStartPrepare('NOT ', 'AND ', 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Starts a query group for HAVING clause, but OR NOTs the group.
+	 *
+	 * @return $this
+	 */
+	public function orNotHavingGroupStart()
+	{
+		return $this->groupStartPrepare('NOT ', 'OR ', 'QBHaving');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Ends a query group for HAVING clause.
+	 *
+	 * @return $this
+	 */
+	public function havingGroupEnd()
+	{
+		return $this->groupEndPrepare('QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepate a query group start.
+	 *
+	 * @param string $not
+	 * @param string $type
+	 * @param string $clause
+	 *
+	 * @return $this
+	 */
+	protected function groupStartPrepare(string $not = '', string $type = 'AND ', string $clause = 'QBWhere')
+	{
+		$type = $this->groupGetType($type);
+
+		$this->QBWhereGroupStarted = true;
+		$prefix                    = empty($this->$clause) ? '' : $type;
+		$where                     = [
+			'condition' => $prefix . $not . str_repeat(' ', ++ $this->QBWhereGroupCount) . ' (',
+			'escape'    => false,
+		];
+
+		$this->{$clause}[] = $where;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepate a query group end.
+	 *
+	 * @param string $clause
+	 *
+	 * @return $this
+	 */
+	protected function groupEndPrepare(string $clause = 'QBWhere')
+	{
+		$this->QBWhereGroupStarted = false;
+		$where                     = [
+			'condition' => str_repeat(' ', $this->QBWhereGroupCount--) . ')',
+			'escape'    => false,
+		];
+
+		$this->{$clause}[] = $where;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Group_get_type
+	 *
+	 * @used-by groupStart()
+	 * @used-by _like()
+	 * @used-by whereHaving()
+	 * @used-by _whereIn()
+	 * @used-by havingGroupStart()
+	 *
+	 * @param string $type
+	 *
+	 * @return string
+	 */
+	protected function groupGetType(string $type): string
+	{
+		if ($this->QBWhereGroupStarted)
+		{
+			$type                      = '';
+			$this->QBWhereGroupStarted = false;
+		}
+
+		return $type;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * GROUP BY
+	 *
+	 * @param string|array $by
+	 * @param boolean      $escape
+	 *
+	 * @return $this
+	 */
+	public function groupBy($by, bool $escape = null)
+	{
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		if (is_string($by))
+		{
+			$by = ($escape === true) ? explode(',', $by) : [$by];
+		}
+
+		foreach ($by as $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$val = [
+					'field'  => $val,
+					'escape' => $escape,
+				];
+
+				$this->QBGroupBy[] = $val;
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * HAVING
+	 *
+	 * Separates multiple calls with 'AND'.
+	 *
+	 * @param string|array $key
+	 * @param mixed        $value
+	 * @param boolean      $escape
+	 *
+	 * @return $this
+	 */
+	public function having($key, $value = null, bool $escape = null)
+	{
+		return $this->whereHaving('QBHaving', $key, $value, 'AND ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * OR HAVING
+	 *
+	 * Separates multiple calls with 'OR'.
+	 *
+	 * @param string|array $key
+	 * @param mixed        $value
+	 * @param boolean      $escape
+	 *
+	 * @return $this
+	 */
+	public function orHaving($key, $value = null, bool $escape = null)
+	{
+		return $this->whereHaving('QBHaving', $key, $value, 'OR ', $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ORDER BY
+	 *
+	 * @param string  $orderBy
+	 * @param string  $direction ASC, DESC or RANDOM
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
+	{
+		$direction = strtoupper(trim($direction));
+
+		if ($direction === 'RANDOM')
+		{
+			$direction = '';
+
+			// Do we have a seed value?
+			$orderBy = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
+		}
+		elseif (empty($orderBy))
+		{
+			return $this;
+		}
+		elseif ($direction !== '')
+		{
+			$direction = in_array($direction, ['ASC', 'DESC'], true) ? ' ' . $direction : '';
+		}
+
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		if ($escape === false)
+		{
+			$qbOrderBy[] = [
+				'field'     => $orderBy,
+				'direction' => $direction,
+				'escape'    => false,
+			];
+		}
+		else
+		{
+			$qbOrderBy = [];
+			foreach (explode(',', $orderBy) as $field)
+			{
+				$qbOrderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
+					?
+					[
+						'field'     => ltrim(substr($field, 0, $match[0][1])),
+						'direction' => ' ' . $match[1][0],
+						'escape'    => true,
+					]
+					:
+					[
+						'field'     => trim($field),
+						'direction' => $direction,
+						'escape'    => true,
+					];
+			}
+		}
+
+		$this->QBOrderBy = array_merge($this->QBOrderBy, $qbOrderBy);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * LIMIT
+	 *
+	 * @param integer|null $value  LIMIT value
+	 * @param integer|null $offset OFFSET value
+	 *
+	 * @return $this
+	 */
+	public function limit(?int $value = null, ?int $offset = 0)
+	{
+		if (! is_null($value))
+		{
+			$this->QBLimit = $value;
+		}
+
+		if (! empty($offset))
+		{
+			$this->QBOffset = $offset;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the OFFSET value
+	 *
+	 * @param integer $offset OFFSET value
+	 *
+	 * @return $this
+	 */
+	public function offset(int $offset)
+	{
+		if (! empty($offset))
+		{
+			$this->QBOffset = (int) $offset;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * LIMIT string
+	 *
+	 * Generates a platform-specific LIMIT clause.
+	 *
+	 * @param string $sql SQL Query
+	 *
+	 * @return string
+	 */
+	protected function _limit(string $sql, bool $offsetIgnore = false): string
+	{
+		return $sql . ' LIMIT ' . (false === $offsetIgnore && $this->QBOffset ? $this->QBOffset . ', ' : '') . $this->QBLimit;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The "set" function.
+	 *
+	 * Allows key/value pairs to be set for insert(), update() or replace().
+	 *
+	 * @param string|array|object $key    Field name, or an array of field/value pairs
+	 * @param string              $value  Field value, if $key is a single field
+	 * @param boolean             $escape Whether to escape values and identifiers
+	 *
+	 * @return $this
+	 */
+	public function set($key, ?string $value = '', bool $escape = null)
+	{
+		$key = $this->objectToArray($key);
+
+		if (! is_array($key))
+		{
+			$key = [$key => $value];
+		}
+
+		$escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
+
+		foreach ($key as $k => $v)
+		{
+			if ($escape)
+			{
+				$bind                                                           = $this->setBind($k, $v, $escape);
+				$this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":$bind:";
+			}
+			else
+			{
+				$this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = $v;
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the previously set() data, alternatively resetting it
+	 * if needed.
+	 *
+	 * @param boolean $clean
+	 *
+	 * @return array
+	 */
+	public function getSetData(bool $clean = false): array
+	{
+		$data = $this->QBSet;
+
+		if ($clean)
+		{
+			$this->QBSet = [];
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get SELECT query string
+	 *
+	 * Compiles a SELECT query string and returns the sql.
+	 *
+	 * @param boolean $reset TRUE: resets QB values; FALSE: leave QB values alone
+	 *
+	 * @return string
+	 */
+	public function getCompiledSelect(bool $reset = true): string
+	{
+		$select = $this->compileSelect();
+
+		if ($reset === true)
+		{
+			$this->resetSelect();
+		}
+
+		return $this->compileFinalQuery($select);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a finalized, compiled query string with the bindings
+	 * inserted and prefixes swapped out.
+	 *
+	 * @param string $sql
+	 *
+	 * @return string
+	 */
+	protected function compileFinalQuery(string $sql): string
+	{
+		$query = new Query($this->db);
+		$query->setQuery($sql, $this->binds, false);
+
+		if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix))
+		{
+			$query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
+		}
+
+		return $query->getQuery();
+	}
+
+	/**
+	 * Get
+	 *
+	 * Compiles the select statement based on the other functions called
+	 * and runs the query
+	 *
+	 * @param integer $limit  The limit clause
+	 * @param integer $offset The offset clause
+	 * @param boolean $reset  Are we want to clear query builder values?
+	 *
+	 * @return ResultInterface|false
+	 */
+	public function get(int $limit = null, int $offset = 0, bool $reset = true)
+	{
+		if (! is_null($limit))
+		{
+			$this->limit($limit, $offset);
+		}
+
+		$result = $this->testMode
+			? $this->getCompiledSelect($reset)
+			: $this->db->query($this->compileSelect(), $this->binds, false);
+
+		if ($reset === true)
+		{
+			$this->resetSelect();
+
+			// Clear our binds so we don't eat up memory
+			$this->binds = [];
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * "Count All" query
+	 *
+	 * Generates a platform-specific query string that counts all records in
+	 * the particular table
+	 *
+	 * @param boolean $reset Are we want to clear query builder values?
+	 *
+	 * @return integer|string when $test = true
+	 */
+	public function countAll(bool $reset = true)
+	{
+		$table = $this->QBFrom[0];
+
+		$sql = $this->countString . $this->db->escapeIdentifiers('numrows') . ' FROM ' .
+				$this->db->protectIdentifiers($table, true, null, false);
+
+		if ($this->testMode)
+		{
+			return $sql;
+		}
+
+		$query = $this->db->query($sql, null, false);
+		if (empty($query->getResult()))
+		{
+			return 0;
+		}
+
+		$query = $query->getRow();
+
+		if ($reset === true)
+		{
+			$this->resetSelect();
+		}
+
+		return (int) $query->numrows;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * "Count All Results" query
+	 *
+	 * Generates a platform-specific query string that counts all records
+	 * returned by an Query Builder query.
+	 *
+	 * @param boolean $reset
+	 *
+	 * @return integer|string when $test = true
+	 */
+	public function countAllResults(bool $reset = true)
+	{
+		// ORDER BY usage is often problematic here (most notably
+		// on Microsoft SQL Server) and ultimately unnecessary
+		// for selecting COUNT(*) ...
+		$orderBy = [];
+		if (! empty($this->QBOrderBy))
+		{
+			$orderBy         = $this->QBOrderBy;
+			$this->QBOrderBy = null;
+		}
+
+		// We cannot use a LIMIT when getting the single row COUNT(*) result
+		$limit         = $this->QBLimit;
+		$this->QBLimit = false;
+
+		if ($this->QBDistinct === true || ! empty($this->QBGroupBy))
+		{
+			// We need to backup the original SELECT in case DBPrefix is used
+			$select = $this->QBSelect;
+			$sql    = $this->countString . $this->db->protectIdentifiers('numrows') . "\nFROM (\n" . $this->compileSelect() . "\n) CI_count_all_results";
+			// Restore SELECT part
+			$this->QBSelect = $select;
+			unset($select);
+		}
+		else
+		{
+			$sql = $this->compileSelect($this->countString . $this->db->protectIdentifiers('numrows'));
+		}
+
+		if ($this->testMode)
+		{
+			return $sql;
+		}
+
+		$result = $this->db->query($sql, $this->binds, false);
+
+		if ($reset === true)
+		{
+			$this->resetSelect();
+		}
+		// If we've previously reset the QBOrderBy values, get them back
+		elseif (! isset($this->QBOrderBy))
+		{
+			$this->QBOrderBy = $orderBy;
+		}
+
+		// Restore the LIMIT setting
+		$this->QBLimit = $limit;
+
+		$row = (! $result instanceof ResultInterface)
+			? null
+			: $result->getRow();
+
+		if (empty($row))
+		{
+			return 0;
+		}
+
+		return (int) $row->numrows;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get compiled 'where' condition string
+	 *
+	 * Compiles the set conditions and returns the sql statement
+	 *
+	 * @return array
+	 */
+	public function getCompiledQBWhere()
+	{
+		return $this->QBWhere;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Get_Where
+	 *
+	 * Allows the where clause, limit and offset to be added directly
+	 *
+	 * @param string|array $where  Where condition
+	 * @param integer      $limit  Limit value
+	 * @param integer      $offset Offset value
+	 * @param boolean      $reset  Are we want to clear query builder values?
+	 *
+	 * @return ResultInterface
+	 */
+	public function getWhere($where = null, int $limit = null, ?int $offset = 0, bool $reset = true)
+	{
+		if ($where !== null)
+		{
+			$this->where($where);
+		}
+
+		if (! empty($limit))
+		{
+			$this->limit($limit, $offset);
+		}
+
+		$result = $this->testMode
+			? $this->getCompiledSelect($reset)
+			: $this->db->query($this->compileSelect(), $this->binds, false);
+
+		if ($reset === true)
+		{
+			$this->resetSelect();
+
+			// Clear our binds so we don't eat up memory
+			$this->binds = [];
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert_Batch
+	 *
+	 * Compiles batch insert strings and runs the queries
+	 *
+	 * @param array   $set       An associative array of insert values
+	 * @param boolean $escape    Whether to escape values and identifiers
+	 * @param integer $batchSize Batch size
+	 *
+	 * @return integer|false Number of rows inserted or FALSE on failure
+	 * @throws DatabaseException
+	 */
+	public function insertBatch(array $set = null, bool $escape = null, int $batchSize = 100)
+	{
+		if ($set === null)
+		{
+			if (empty($this->QBSet))
+			{
+				if (CI_DEBUG)
+				{
+					throw new DatabaseException('You must use the "set" method to update an entry.');
+				}
+				// @codeCoverageIgnoreStart
+				return false;
+				// @codeCoverageIgnoreEnd
+			}
+		}
+		else
+		{
+			if (empty($set))
+			{
+				if (CI_DEBUG)
+				{
+					throw new DatabaseException('insertBatch() called with no data');
+				}
+
+				return false; // @codeCoverageIgnore
+			}
+
+			$this->setInsertBatch($set, '', $escape);
+		}
+
+		$table = $this->QBFrom[0];
+
+		// Batch this baby
+		$affectedRows = 0;
+		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize)
+		{
+			$sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
+
+			if ($this->testMode)
+			{
+				++$affectedRows;
+			}
+			else
+			{
+				$this->db->query($sql, $this->binds, false);
+				$affectedRows += $this->db->affectedRows();
+			}
+		}
+
+		if (! $this->testMode)
+		{
+			$this->resetWrite();
+		}
+
+		return $affectedRows;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert batch statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data.
+	 *
+	 * @param string $table  Table name
+	 * @param array  $keys   INSERT keys
+	 * @param array  $values INSERT values
+	 *
+	 * @return string
+	 */
+	protected function _insertBatch(string $table, array $keys, array $values): string
+	{
+		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The "setInsertBatch" function.  Allows key/value pairs to be set for batch inserts
+	 *
+	 * @param mixed   $key
+	 * @param string  $value
+	 * @param boolean $escape
+	 *
+	 * @return $this|null
+	 */
+	public function setInsertBatch($key, string $value = '', bool $escape = null)
+	{
+		$key = $this->batchObjectToArray($key);
+
+		if (! is_array($key))
+		{
+			$key = [$key => $value];
+		}
+
+		$escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
+
+		$keys = array_keys($this->objectToArray(current($key)));
+		sort($keys);
+
+		foreach ($key as $row)
+		{
+			$row = $this->objectToArray($row);
+			if (array_diff($keys, array_keys($row)) !== [] || array_diff(array_keys($row), $keys) !== [])
+			{
+				// batch function above returns an error on an empty array
+				$this->QBSet[] = [];
+
+				return null;
+			}
+
+			ksort($row); // puts $row in the same order as our keys
+
+			$clean = [];
+
+			foreach ($row as $k => $value)
+			{
+				$clean[] = ':' . $this->setBind($k, $value, $escape) . ':';
+			}
+
+			$row = $clean;
+
+			$this->QBSet[] = '(' . implode(',', $row) . ')';
+		}
+
+		foreach ($keys as $k)
+		{
+			$this->QBKeys[] = $this->db->protectIdentifiers($k, false, $escape);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get INSERT query string
+	 *
+	 * Compiles an insert query and returns the sql
+	 *
+	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
+	 *
+	 * @throws DatabaseException
+	 *
+	 * @return string|boolean
+	 */
+	public function getCompiledInsert(bool $reset = true)
+	{
+		if ($this->validateInsert() === false)
+		{
+			return false;
+		}
+
+		$sql = $this->_insert(
+				$this->db->protectIdentifiers(
+						$this->QBFrom[0], true, null, false
+				), array_keys($this->QBSet), array_values($this->QBSet)
+		);
+
+		if ($reset === true)
+		{
+			$this->resetWrite();
+		}
+
+		return $this->compileFinalQuery($sql);
+	}
+
+	/**
+	 * Insert
+	 *
+	 * Compiles an insert string and runs the query
+	 *
+	 * @param array   $set    An associative array of insert values
+	 * @param boolean $escape Whether to escape values and identifiers
+	 *
+	 * @throws DatabaseException
+	 *
+	 * @return Query|boolean
+	 */
+	public function insert(array $set = null, bool $escape = null)
+	{
+		if ($set !== null)
+		{
+			$this->set($set, '', $escape);
+		}
+
+		if ($this->validateInsert() === false)
+		{
+			return false;
+		}
+
+		$sql = $this->_insert(
+				$this->db->protectIdentifiers(
+						$this->QBFrom[0], true, $escape, false
+				), array_keys($this->QBSet), array_values($this->QBSet)
+		);
+
+		if (! $this->testMode)
+		{
+			$this->resetWrite();
+
+			$result = $this->db->query($sql, $this->binds, false);
+
+			// Clear our binds so we don't eat up memory
+			$this->binds = [];
+
+			return $result;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate Insert
+	 *
+	 * This method is used by both insert() and getCompiledInsert() to
+	 * validate that the there data is actually being set and that table
+	 * has been chosen to be inserted into.
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	protected function validateInsert(): bool
+	{
+		if (empty($this->QBSet))
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('You must use the "set" method to update an entry.');
+			}
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 *
+	 * @param string $table         The table name
+	 * @param array  $keys          The insert keys
+	 * @param array  $unescapedKeys The insert values
+	 *
+	 * @return string
+	 */
+	protected function _insert(string $table, array $keys, array $unescapedKeys): string
+	{
+		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
+	}
+
+	/**
+	 * Replace
+	 *
+	 * Compiles an replace into string and runs the query
+	 *
+	 * @param array $set An associative array of insert values
+	 *
+	 * @return BaseResult|Query|string|false
+	 * @throws DatabaseException
+	 */
+	public function replace(array $set = null)
+	{
+		if ($set !== null)
+		{
+			$this->set($set);
+		}
+
+		if (empty($this->QBSet))
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('You must use the "set" method to update an entry.');
+			}
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		$table = $this->QBFrom[0];
+
+		$sql = $this->_replace($table, array_keys($this->QBSet), array_values($this->QBSet));
+
+		$this->resetWrite();
+
+		return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replace statement
+	 *
+	 * Generates a platform-specific replace string from the supplied data
+	 *
+	 * @param string $table  The table name
+	 * @param array  $keys   The insert keys
+	 * @param array  $values The insert values
+	 *
+	 * @return string
+	 */
+	protected function _replace(string $table, array $keys, array $values): string
+	{
+		return 'REPLACE INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $values) . ')';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * FROM tables
+	 *
+	 * Groups tables in FROM clauses if needed, so there is no confusion
+	 * about operator precedence.
+	 *
+	 * Note: This is only used (and overridden) by MySQL and SQLSRV.
+	 *
+	 * @return string
+	 */
+	protected function _fromTables(): string
+	{
+		return implode(', ', $this->QBFrom);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get UPDATE query string
+	 *
+	 * Compiles an update query and returns the sql
+	 *
+	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
+	 *
+	 * @return string|boolean
+	 */
+	public function getCompiledUpdate(bool $reset = true)
+	{
+		if ($this->validateUpdate() === false)
+		{
+			return false;
+		}
+
+		$sql = $this->_update($this->QBFrom[0], $this->QBSet);
+
+		if ($reset === true)
+		{
+			$this->resetWrite();
+		}
+
+		return $this->compileFinalQuery($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * UPDATE
+	 *
+	 * Compiles an update string and runs the query.
+	 *
+	 * @param array   $set   An associative array of update values
+	 * @param mixed   $where
+	 * @param integer $limit
+	 *
+	 * @throws DatabaseException
+	 *
+	 * @return boolean    TRUE on success, FALSE on failure
+	 */
+	public function update(array $set = null, $where = null, int $limit = null): bool
+	{
+		if ($set !== null)
+		{
+			$this->set($set);
+		}
+
+		if ($this->validateUpdate() === false)
+		{
+			return false;
+		}
+
+		if ($where !== null)
+		{
+			$this->where($where);
+		}
+
+		if (! empty($limit))
+		{
+			if (! $this->canLimitWhereUpdates)
+			{
+				throw new DatabaseException('This driver does not allow LIMITs on UPDATE queries using WHERE.');
+			}
+
+			$this->limit($limit);
+		}
+
+		$sql = $this->_update($this->QBFrom[0], $this->QBSet);
+
+		if (! $this->testMode)
+		{
+			$this->resetWrite();
+
+			$result = $this->db->query($sql, $this->binds, false);
+
+			if ($result !== false)
+			{
+				// Clear our binds so we don't eat up memory
+				$this->binds = [];
+
+				return true;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Update statement
+	 *
+	 * Generates a platform-specific update string from the supplied data
+	 *
+	 * @param string $table  the Table name
+	 * @param array  $values the Update data
+	 *
+	 * @return string
+	 */
+	protected function _update(string $table, array $values): string
+	{
+		$valStr = [];
+
+		foreach ($values as $key => $val)
+		{
+			$valStr[] = $key . ' = ' . $val;
+		}
+
+		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
+				. $this->compileWhereHaving('QBWhere')
+				. $this->compileOrderBy()
+				. ($this->QBLimit ? $this->_limit(' ', true) : '');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate Update
+	 *
+	 * This method is used by both update() and getCompiledUpdate() to
+	 * validate that data is actually being set and that a table has been
+	 * chosen to be update.
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	protected function validateUpdate(): bool
+	{
+		if (empty($this->QBSet))
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('You must use the "set" method to update an entry.');
+			}
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Update_Batch
+	 *
+	 * Compiles an update string and runs the query
+	 *
+	 * @param array   $set       An associative array of update values
+	 * @param string  $index     The where key
+	 * @param integer $batchSize The size of the batch to run
+	 *
+	 * @return mixed    Number of rows affected, SQL string, or FALSE on failure
+	 * @throws DatabaseException
+	 */
+	public function updateBatch(array $set = null, string $index = null, int $batchSize = 100)
+	{
+		if ($index === null)
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('You must specify an index to match on for batch updates.');
+			}
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		if ($set === null)
+		{
+			if (empty($this->QBSet))
+			{
+				if (CI_DEBUG)
+				{
+					throw new DatabaseException('You must use the "set" method to update an entry.');
+				}
+				// @codeCoverageIgnoreStart
+				return false;
+				// @codeCoverageIgnoreEnd
+			}
+		}
+		else
+		{
+			if (empty($set))
+			{
+				if (CI_DEBUG)
+				{
+					throw new DatabaseException('updateBatch() called with no data');
+				}
+				// @codeCoverageIgnoreStart
+				return false;
+				// @codeCoverageIgnoreEnd
+			}
+
+			$this->setUpdateBatch($set, $index);
+		}
+
+		$table = $this->QBFrom[0];
+
+		// Batch this baby
+		$affectedRows = 0;
+		$savedSQL     = [];
+		$savedQBWhere = $this->QBWhere;
+		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize)
+		{
+			$sql = $this->_updateBatch($table, array_slice($this->QBSet, $i, $batchSize), $this->db->protectIdentifiers($index)
+			);
+
+			if ($this->testMode)
+			{
+				$savedSQL[] = $sql;
+			}
+			else
+			{
+				$this->db->query($sql, $this->binds, false);
+				$affectedRows += $this->db->affectedRows();
+			}
+
+			$this->QBWhere = $savedQBWhere;
+		}
+
+		$this->resetWrite();
+
+		return $this->testMode ? $savedSQL : $affectedRows;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Update_Batch statement
+	 *
+	 * Generates a platform-specific batch update string from the supplied data
+	 *
+	 * @param string $table  Table name
+	 * @param array  $values Update data
+	 * @param string $index  WHERE key
+	 *
+	 * @return string
+	 */
+	protected function _updateBatch(string $table, array $values, string $index): string
+	{
+		$ids   = [];
+		$final = [];
+
+		foreach ($values as $val)
+		{
+			$ids[] = $val[$index];
+
+			foreach (array_keys($val) as $field)
+			{
+				if ($field !== $index)
+				{
+					$final[$field][] = 'WHEN ' . $index . ' = ' . $val[$index] . ' THEN ' . $val[$field];
+				}
+			}
+		}
+
+		$cases = '';
+		foreach ($final as $k => $v)
+		{
+			$cases .= $k . " = CASE \n"
+					. implode("\n", $v) . "\n"
+					. 'ELSE ' . $k . ' END, ';
+		}
+
+		$this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
+
+		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The "setUpdateBatch" function.  Allows key/value pairs to be set for batch updating
+	 *
+	 * @param array|object $key
+	 * @param string       $index
+	 * @param boolean      $escape
+	 *
+	 * @return $this|null
+	 * @throws DatabaseException
+	 */
+	public function setUpdateBatch($key, string $index = '', bool $escape = null)
+	{
+		$key = $this->batchObjectToArray($key);
+
+		if (! is_array($key))
+		{
+			return null;
+		}
+
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		foreach ($key as $v)
+		{
+			$indexSet = false;
+			$clean    = [];
+			foreach ($v as $k2 => $v2)
+			{
+				if ($k2 === $index)
+				{
+					$indexSet = true;
+				}
+
+				$bind = $this->setBind($k2, $v2, $escape);
+
+				$clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":$bind:";
+			}
+
+			if ($indexSet === false)
+			{
+				throw new DatabaseException('One or more rows submitted for batch updating is missing the specified index.');
+			}
+
+			$this->QBSet[] = $clean;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Empty Table
+	 *
+	 * Compiles a delete string and runs "DELETE FROM table"
+	 *
+	 * @return boolean|string    TRUE on success, FALSE on failure, string on testMode
+	 */
+	public function emptyTable()
+	{
+		$table = $this->QBFrom[0];
+
+		$sql = $this->_delete($table);
+
+		if ($this->testMode)
+		{
+			return $sql;
+		}
+
+		$this->resetWrite();
+
+		return $this->db->query($sql, null, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Truncate
+	 *
+	 * Compiles a truncate string and runs the query
+	 * If the database does not support the truncate() command
+	 * This function maps to "DELETE FROM table"
+	 *
+	 * @return boolean|string    TRUE on success, FALSE on failure, string on testMode
+	 */
+	public function truncate()
+	{
+		$table = $this->QBFrom[0];
+
+		$sql = $this->_truncate($table);
+
+		if ($this->testMode)
+		{
+			return $sql;
+		}
+
+		$this->resetWrite();
+
+		return $this->db->query($sql, null, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Truncate statement
+	 *
+	 * Generates a platform-specific truncate string from the supplied data
+	 *
+	 * If the database does not support the truncate() command,
+	 * then this method maps to 'DELETE FROM table'
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _truncate(string $table): string
+	{
+		return 'TRUNCATE ' . $table;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get DELETE query string
+	 *
+	 * Compiles a delete query string and returns the sql
+	 *
+	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
+	 *
+	 * @return string
+	 */
+	public function getCompiledDelete(bool $reset = true): string
+	{
+		$sql = $this->testMode()->delete('', null, $reset);
+		$this->testMode(false);
+
+		return $this->compileFinalQuery($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Delete
+	 *
+	 * Compiles a delete string and runs the query
+	 *
+	 * @param mixed   $where     The where clause
+	 * @param integer $limit     The limit clause
+	 * @param boolean $resetData
+	 *
+	 * @return string|boolean
+	 * @throws DatabaseException
+	 */
+	public function delete($where = '', int $limit = null, bool $resetData = true)
+	{
+		$table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
+
+		if ($where !== '')
+		{
+			$this->where($where);
+		}
+
+		if (empty($this->QBWhere))
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
+			}
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		$sql = $this->_delete($table);
+
+		if (! empty($limit))
+		{
+			$this->QBLimit = $limit;
+		}
+
+		if (! empty($this->QBLimit))
+		{
+			if (! $this->canLimitDeletes)
+			{
+				throw new DatabaseException('SQLite3 does not allow LIMITs on DELETE queries.');
+			}
+
+			$sql = $this->_limit($sql, true);
+		}
+
+		if ($resetData)
+		{
+			$this->resetWrite();
+		}
+
+		return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Increments a numeric column by the specified value.
+	 *
+	 * @param string  $column
+	 * @param integer $value
+	 *
+	 * @return boolean
+	 */
+	public function increment(string $column, int $value = 1)
+	{
+		$column = $this->db->protectIdentifiers($column);
+
+		$sql = $this->_update($this->QBFrom[0], [$column => "{$column} + {$value}"]);
+
+		return $this->db->query($sql, $this->binds, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Decrements a numeric column by the specified value.
+	 *
+	 * @param string  $column
+	 * @param integer $value
+	 *
+	 * @return boolean
+	 */
+	public function decrement(string $column, int $value = 1)
+	{
+		$column = $this->db->protectIdentifiers($column);
+
+		$sql = $this->_update($this->QBFrom[0], [$column => "{$column}-{$value}"]);
+
+		return $this->db->query($sql, $this->binds, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Delete statement
+	 *
+	 * Generates a platform-specific delete string from the supplied data
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _delete(string $table): string
+	{
+		return 'DELETE ' . $this->compileIgnore('delete') . 'FROM ' . $table . $this->compileWhereHaving('QBWhere');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Track Aliases
+	 *
+	 * Used to track SQL statements written with aliased tables.
+	 *
+	 * @param string|array $table The table to inspect
+	 *
+	 * @return string|void
+	 */
+	protected function trackAliases($table)
+	{
+		if (is_array($table))
+		{
+			foreach ($table as $t)
+			{
+				$this->trackAliases($t);
+			}
+			return;
+		}
+
+		// Does the string contain a comma?  If so, we need to separate
+		// the string into discreet statements
+		if (strpos($table, ',') !== false)
+		{
+			return $this->trackAliases(explode(',', $table));
+		}
+
+		// if a table alias is used we can recognize it by a space
+		if (strpos($table, ' ') !== false)
+		{
+			// if the alias is written with the AS keyword, remove it
+			$table = preg_replace('/\s+AS\s+/i', ' ', $table);
+
+			// Grab the alias
+			$table = trim(strrchr($table, ' '));
+
+			// Store the alias, if it doesn't already exist
+			$this->db->addTableAlias($table);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile the SELECT statement
+	 *
+	 * Generates a query string based on which functions were used.
+	 * Should not be called directly.
+	 *
+	 * @param mixed $selectOverride
+	 *
+	 * @return string
+	 */
+	protected function compileSelect($selectOverride = false): string
+	{
+		// Write the "select" portion of the query
+		if ($selectOverride !== false)
+		{
+			$sql = $selectOverride;
+		}
+		else
+		{
+			$sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+
+			if (empty($this->QBSelect))
+			{
+				$sql .= '*';
+			}
+			else
+			{
+				// Cycle through the "select" portion of the query and prep each column name.
+				// The reason we protect identifiers here rather than in the select() function
+				// is because until the user calls the from() function we don't know if there are aliases
+				foreach ($this->QBSelect as $key => $val)
+				{
+					$noEscape             = $this->QBNoEscape[$key] ?? null;
+					$this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
+				}
+
+				$sql .= implode(', ', $this->QBSelect);
+			}
+		}
+
+		// Write the "FROM" portion of the query
+		if (! empty($this->QBFrom))
+		{
+			$sql .= "\nFROM " . $this->_fromTables();
+		}
+
+		// Write the "JOIN" portion of the query
+		if (! empty($this->QBJoin))
+		{
+			$sql .= "\n" . implode("\n", $this->QBJoin);
+		}
+
+		$sql .= $this->compileWhereHaving('QBWhere')
+				. $this->compileGroupBy()
+				. $this->compileWhereHaving('QBHaving')
+				. $this->compileOrderBy(); // ORDER BY
+		// LIMIT
+		if ($this->QBLimit)
+		{
+			return $this->_limit($sql . "\n");
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile Ignore Statement
+	 *
+	 * Checks if the ignore option is supported by
+	 * the Database Driver for the specific statement.
+	 *
+	 * @param string $statement
+	 *
+	 * @return string
+	 */
+	protected function compileIgnore(string $statement)
+	{
+		if ($this->QBIgnore &&
+			isset($this->supportedIgnoreStatements[$statement])
+		)
+		{
+			return trim($this->supportedIgnoreStatements[$statement]) . ' ';
+		}
+
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile WHERE, HAVING statements
+	 *
+	 * Escapes identifiers in WHERE and HAVING statements at execution time.
+	 *
+	 * Required so that aliases are tracked properly, regardless of whether
+	 * where(), orWhere(), having(), orHaving are called prior to from(),
+	 * join() and prefixTable is added only if needed.
+	 *
+	 * @param string $qbKey 'QBWhere' or 'QBHaving'
+	 *
+	 * @return string    SQL statement
+	 */
+	protected function compileWhereHaving(string $qbKey): string
+	{
+		if (! empty($this->$qbKey))
+		{
+			foreach ($this->$qbKey as &$qbkey)
+			{
+				// Is this condition already compiled?
+				if (is_string($qbkey))
+				{
+					continue;
+				}
+
+				if ($qbkey['escape'] === false)
+				{
+					$qbkey = $qbkey['condition'];
+					continue;
+				}
+
+				// Split multiple conditions
+				$conditions = preg_split(
+						'/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i', $qbkey['condition'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+				);
+
+				foreach ($conditions as &$condition)
+				{
+					if (($op = $this->getOperator($condition)) === false
+							|| ! preg_match('/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i', $condition, $matches)
+					)
+					{
+						continue;
+					}
+					// $matches = array(
+					//	0 => '(test <= foo)',	/* the whole thing */
+					//	1 => '(',		/* optional */
+					//	2 => 'test',		/* the field name */
+					//	3 => ' <= ',		/* $op */
+					//	4 => 'foo',		/* optional, if $op is e.g. 'IS NULL' */
+					//	5 => ')'		/* optional */
+					// );
+
+					if (! empty($matches[4]))
+					{
+						$protectIdentifiers = false;
+						if (strpos($matches[4], '.') !== false)
+						{
+							$protectIdentifiers = true;
+						}
+
+						if (strpos($matches[4], ':') === false)
+						{
+							$matches[4] = $this->db->protectIdentifiers(trim($matches[4]), false, $protectIdentifiers);
+						}
+
+						$matches[4] = ' ' . $matches[4];
+					}
+
+					$condition = $matches[1] . $this->db->protectIdentifiers(trim($matches[2]))
+							. ' ' . trim($matches[3]) . $matches[4] . $matches[5];
+				}
+
+				$qbkey = implode('', $conditions);
+			}
+
+			return ($qbKey === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
+					. implode("\n", $this->$qbKey);
+		}
+
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile GROUP BY
+	 *
+	 * Escapes identifiers in GROUP BY statements at execution time.
+	 *
+	 * Required so that aliases are tracked properly, regardless of whether
+	 * groupBy() is called prior to from(), join() and prefixTable is added
+	 * only if needed.
+	 *
+	 * @return string    SQL statement
+	 */
+	protected function compileGroupBy(): string
+	{
+		if (! empty($this->QBGroupBy))
+		{
+			foreach ($this->QBGroupBy as &$groupBy)
+			{
+				// Is it already compiled?
+				if (is_string($groupBy))
+				{
+					continue;
+				}
+
+				$groupBy = ($groupBy['escape'] === false || $this->isLiteral($groupBy['field']))
+					? $groupBy['field']
+					: $this->db->protectIdentifiers($groupBy['field']);
+			}
+
+			return "\nGROUP BY " . implode(', ', $this->QBGroupBy);
+		}
+
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile ORDER BY
+	 *
+	 * Escapes identifiers in ORDER BY statements at execution time.
+	 *
+	 * Required so that aliases are tracked properly, regardless of whether
+	 * orderBy() is called prior to from(), join() and prefixTable is added
+	 * only if needed.
+	 *
+	 * @return string    SQL statement
+	 */
+	protected function compileOrderBy(): string
+	{
+		if (is_array($this->QBOrderBy) && ! empty($this->QBOrderBy))
+		{
+			foreach ($this->QBOrderBy as &$orderBy)
+			{
+				if ($orderBy['escape'] !== false && ! $this->isLiteral($orderBy['field']))
+				{
+					$orderBy['field'] = $this->db->protectIdentifiers($orderBy['field']);
+				}
+
+				$orderBy = $orderBy['field'] . $orderBy['direction'];
+			}
+
+			return $this->QBOrderBy = "\nORDER BY " . implode(', ', $this->QBOrderBy);
+		}
+
+		if (is_string($this->QBOrderBy))
+		{
+			return $this->QBOrderBy;
+		}
+
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Object to Array
+	 *
+	 * Takes an object as input and converts the class variables to array key/vals
+	 *
+	 * @param mixed $object
+	 *
+	 * @return mixed
+	 */
+	protected function objectToArray($object)
+	{
+		if (! is_object($object))
+		{
+			return $object;
+		}
+
+		$array = [];
+		foreach (get_object_vars($object) as $key => $val)
+		{
+			// There are some built in keys we need to ignore for this conversion
+			if (! is_object($val) && ! is_array($val) && $key !== '_parent_name')
+			{
+				$array[$key] = $val;
+			}
+		}
+
+		return $array;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Object to Array
+	 *
+	 * Takes an object as input and converts the class variables to array key/vals
+	 *
+	 * @param mixed $object
+	 *
+	 * @return mixed
+	 */
+	protected function batchObjectToArray($object)
+	{
+		if (! is_object($object))
+		{
+			return $object;
+		}
+
+		$array  = [];
+		$out    = get_object_vars($object);
+		$fields = array_keys($out);
+
+		foreach ($fields as $val)
+		{
+			// There are some built in keys we need to ignore for this conversion
+			if ($val !== '_parent_name')
+			{
+				$i = 0;
+				foreach ($out[$val] as $data)
+				{
+					$array[$i++][$val] = $data;
+				}
+			}
+		}
+
+		return $array;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Is literal
+	 *
+	 * Determines if a string represents a literal value or a field name
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	protected function isLiteral(string $str): bool
+	{
+		$str = trim($str);
+
+		if (empty($str)
+			|| ctype_digit($str)
+			|| (string) (float) $str === $str
+			|| in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
+		)
+		{
+			return true;
+		}
+
+		static $_str;
+
+		if (empty($_str))
+		{
+			$_str = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
+		}
+
+		return in_array($str[0], $_str, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reset Query Builder values.
+	 *
+	 * Publicly-visible method to reset the QB values.
+	 *
+	 * @return $this
+	 */
+	public function resetQuery()
+	{
+		$this->resetSelect();
+		$this->resetWrite();
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets the query builder values.  Called by the get() function
+	 *
+	 * @param array $qbResetItems An array of fields to reset
+	 *
+	 * @return void
+	 */
+	protected function resetRun(array $qbResetItems)
+	{
+		foreach ($qbResetItems as $item => $defaultValue)
+		{
+			$this->$item = $defaultValue;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets the query builder values.  Called by the get() function
+	 */
+	protected function resetSelect()
+	{
+		$this->resetRun([
+			'QBSelect'   => [],
+			'QBJoin'     => [],
+			'QBWhere'    => [],
+			'QBGroupBy'  => [],
+			'QBHaving'   => [],
+			'QBOrderBy'  => [],
+			'QBNoEscape' => [],
+			'QBDistinct' => false,
+			'QBLimit'    => false,
+			'QBOffset'   => false,
+		]);
+
+		if (! empty($this->db))
+		{
+			$this->db->setAliasedTables([]);
+		}
+
+		// Reset QBFrom part
+		if (! empty($this->QBFrom))
+		{
+			$this->from(array_shift($this->QBFrom), true);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets the query builder "write" values.
+	 *
+	 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
+	 */
+	protected function resetWrite()
+	{
+		$this->resetRun([
+			'QBSet'     => [],
+			'QBJoin'    => [],
+			'QBWhere'   => [],
+			'QBOrderBy' => [],
+			'QBKeys'    => [],
+			'QBLimit'   => false,
+			'QBIgnore'  => false,
+		]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Tests whether the string has an SQL operator
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	protected function hasOperator(string $str): bool
+	{
+		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Returns the SQL string operator
+	 *
+	 * @param string  $str
+	 * @param boolean $list
+	 *
+	 * @return mixed
+	 */
+	protected function getOperator(string $str, bool $list = false)
+	{
+		static $_operators;
+
+		if (empty($_operators))
+		{
+			$_les       = ($this->db->likeEscapeStr !== '') ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/') : '';
+			$_operators = [
+				'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
+				'\s*<>?\s*', // <, <>
+				'\s*>\s*', // >
+				'\s+IS NULL', // IS NULL
+				'\s+IS NOT NULL', // IS NOT NULL
+				'\s+EXISTS\s*\(.*\)', // EXISTS(sql)
+				'\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(sql)
+				'\s+BETWEEN\s+', // BETWEEN value AND value
+				'\s+IN\s*\(.*\)', // IN(list)
+				'\s+NOT IN\s*\(.*\)', // NOT IN (list)
+				'\s+LIKE\s+\S.*(' . $_les . ')?', // LIKE 'expr'[ ESCAPE '%s']
+				'\s+NOT LIKE\s+\S.*(' . $_les . ')?', // NOT LIKE 'expr'[ ESCAPE '%s']
+			];
+		}
+
+		return preg_match_all('/' . implode('|', $_operators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Stores a bind value after ensuring that it's unique.
+	 * While it might be nicer to have named keys for our binds array
+	 * with PHP 7+ we get a huge memory/performance gain with indexed
+	 * arrays instead, so lets take advantage of that here.
+	 *
+	 * @param string  $key
+	 * @param mixed   $value
+	 * @param boolean $escape
+	 *
+	 * @return string
+	 */
+	protected function setBind(string $key, $value = null, bool $escape = true): string
+	{
+		if (! array_key_exists($key, $this->binds))
+		{
+			$this->binds[$key] = [
+				$value,
+				$escape,
+			];
+
+			return $key;
+		}
+
+		if (! array_key_exists($key, $this->bindsKeyCount))
+		{
+			$this->bindsKeyCount[$key] = 1;
+		}
+
+		$count = $this->bindsKeyCount[$key]++;
+
+		$this->binds[$key . '.' . $count] = [
+			$value,
+			$escape,
+		];
+
+		return $key . '.' . $count;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a clone of a Base Builder with reset query builder values.
+	 *
+	 * @return $this
+	 */
+	protected function cleanClone()
+	{
+		return (clone $this)->from([], true)->resetQuery();
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
new file mode 100644
index 0000000..a37ffaa
--- /dev/null
+++ b/system/Database/BaseConnection.php
@@ -0,0 +1,1890 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use Closure;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Events\Events;
+use Throwable;
+
+/**
+ * Class BaseConnection
+ */
+abstract class BaseConnection implements ConnectionInterface
+{
+	/**
+	 * Data Source Name / Connect string
+	 *
+	 * @var string
+	 */
+	protected $DSN;
+
+	/**
+	 * Database port
+	 *
+	 * @var integer|string
+	 */
+	protected $port = '';
+
+	/**
+	 * Hostname
+	 *
+	 * @var string
+	 */
+	protected $hostname;
+
+	/**
+	 * Username
+	 *
+	 * @var string
+	 */
+	protected $username;
+
+	/**
+	 * Password
+	 *
+	 * @var string
+	 */
+	protected $password;
+
+	/**
+	 * Database name
+	 *
+	 * @var string
+	 */
+	protected $database;
+
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	protected $DBDriver = 'MySQLi';
+
+	/**
+	 * Sub-driver
+	 *
+	 * @used-by CI_DB_pdo_driver
+	 * @var     string
+	 */
+	protected $subdriver;
+
+	/**
+	 * Table prefix
+	 *
+	 * @var string
+	 */
+	protected $DBPrefix = '';
+
+	/**
+	 * Persistent connection flag
+	 *
+	 * @var boolean
+	 */
+	protected $pConnect = false;
+
+	/**
+	 * Debug flag
+	 *
+	 * Whether to display error messages.
+	 *
+	 * @var boolean
+	 */
+	protected $DBDebug = false;
+
+	/**
+	 * Character set
+	 *
+	 * @var string
+	 */
+	protected $charset = 'utf8';
+
+	/**
+	 * Collation
+	 *
+	 * @var string
+	 */
+	protected $DBCollat = 'utf8_general_ci';
+
+	/**
+	 * Swap Prefix
+	 *
+	 * @var string
+	 */
+	protected $swapPre = '';
+
+	/**
+	 * Encryption flag/data
+	 *
+	 * @var mixed
+	 */
+	protected $encrypt = false;
+
+	/**
+	 * Compression flag
+	 *
+	 * @var boolean
+	 */
+	protected $compress = false;
+
+	/**
+	 * Strict ON flag
+	 *
+	 * Whether we're running in strict SQL mode.
+	 *
+	 * @var boolean
+	 */
+	protected $strictOn;
+
+	/**
+	 * Settings for a failover connection.
+	 *
+	 * @var array
+	 */
+	protected $failover = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The last query object that was executed
+	 * on this connection.
+	 *
+	 * @var mixed
+	 */
+	protected $lastQuery;
+
+	/**
+	 * Connection ID
+	 *
+	 * @var object|resource|boolean
+	 */
+	public $connID = false;
+
+	/**
+	 * Result ID
+	 *
+	 * @var object|resource|boolean
+	 */
+	public $resultID = false;
+
+	/**
+	 * Protect identifiers flag
+	 *
+	 * @var boolean
+	 */
+	public $protectIdentifiers = true;
+
+	/**
+	 * List of reserved identifiers
+	 *
+	 * Identifiers that must NOT be escaped.
+	 *
+	 * @var array
+	 */
+	protected $reservedIdentifiers = ['*'];
+
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string|array
+	 */
+	public $escapeChar = '"';
+
+	/**
+	 * ESCAPE statement string
+	 *
+	 * @var string
+	 */
+	public $likeEscapeStr = " ESCAPE '%s' ";
+
+	/**
+	 * ESCAPE character
+	 *
+	 * @var string
+	 */
+	public $likeEscapeChar = '!';
+
+	/**
+	 * Holds previously looked up data
+	 * for performance reasons.
+	 *
+	 * @var array
+	 */
+	public $dataCache = [];
+
+	/**
+	 * Microtime when connection was made
+	 *
+	 * @var float
+	 */
+	protected $connectTime;
+
+	/**
+	 * How long it took to establish connection.
+	 *
+	 * @var float
+	 */
+	protected $connectDuration;
+
+	/**
+	 * If true, no queries will actually be
+	 * ran against the database.
+	 *
+	 * @var boolean
+	 */
+	protected $pretend = false;
+
+	/**
+	 * Transaction enabled flag
+	 *
+	 * @var boolean
+	 */
+	public $transEnabled = true;
+
+	/**
+	 * Strict transaction mode flag
+	 *
+	 * @var boolean
+	 */
+	public $transStrict = true;
+
+	/**
+	 * Transaction depth level
+	 *
+	 * @var integer
+	 */
+	protected $transDepth = 0;
+
+	/**
+	 * Transaction status flag
+	 *
+	 * Used with transactions to determine if a rollback should occur.
+	 *
+	 * @var boolean
+	 */
+	protected $transStatus = true;
+
+	/**
+	 * Transaction failure flag
+	 *
+	 * Used with transactions to determine if a transaction has failed.
+	 *
+	 * @var boolean
+	 */
+	protected $transFailure = false;
+
+	/**
+	 * Array of table aliases.
+	 *
+	 * @var array
+	 */
+	protected $aliasedTables = [];
+
+	/**
+	 * Query Class
+	 *
+	 * @var string
+	 */
+	protected $queryClass = 'CodeIgniter\\Database\\Query';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves our connection settings.
+	 *
+	 * @param array $params
+	 */
+	public function __construct(array $params)
+	{
+		foreach ($params as $key => $value)
+		{
+			$this->$key = $value;
+		}
+
+		$queryClass = str_replace('Connection', 'Query', static::class);
+
+		if (class_exists($queryClass))
+		{
+			$this->queryClass = $queryClass;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initializes the database connection/settings.
+	 *
+	 * @return mixed|void
+	 * @throws DatabaseException
+	 */
+	public function initialize()
+	{
+		/* If an established connection is available, then there's
+		 * no need to connect and select the database.
+		 *
+		 * Depending on the database driver, conn_id can be either
+		 * boolean TRUE, a resource or an object.
+		 */
+		if ($this->connID)
+		{
+			return;
+		}
+
+		//--------------------------------------------------------------------
+
+		$this->connectTime = microtime(true);
+		$connectionErrors  = [];
+
+		try
+		{
+			// Connect to the database and set the connection ID
+			$this->connID = $this->connect($this->pConnect);
+		}
+		catch (Throwable $e)
+		{
+			$connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage());
+			log_message('error', 'Error connecting to the database: ' . $e->getMessage());
+		}
+
+		// No connection resource? Check if there is a failover else throw an error
+		if (! $this->connID)
+		{
+			// Check if there is a failover set
+			if (! empty($this->failover) && is_array($this->failover))
+			{
+				// Go over all the failovers
+				foreach ($this->failover as $index => $failover)
+				{
+					// Replace the current settings with those of the failover
+					foreach ($failover as $key => $val)
+					{
+						if (property_exists($this, $key))
+						{
+							$this->$key = $val;
+						}
+					}
+
+					try
+					{
+						// Try to connect
+						$this->connID = $this->connect($this->pConnect);
+					}
+					catch (Throwable $e)
+					{
+						$connectionErrors[] = sprintf('Failover #%d [%s]: %s', ++$index, $this->DBDriver, $e->getMessage());
+						log_message('error', 'Error connecting to the database: ' . $e->getMessage());
+					}
+
+					// If a connection is made break the foreach loop
+					if ($this->connID)
+					{
+						break;
+					}
+				}
+			}
+
+			// We still don't have a connection?
+			if (! $this->connID)
+			{
+				throw new DatabaseException(sprintf(
+					'Unable to connect to the database.%s%s',
+					PHP_EOL,
+					implode(PHP_EOL, $connectionErrors)
+				));
+			}
+		}
+
+		$this->connectDuration = microtime(true) - $this->connectTime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param  boolean $persistent
+	 * @return mixed
+	 */
+	abstract public function connect(bool $persistent = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	public function close()
+	{
+		if ($this->connID)
+		{
+			$this->_close();
+			$this->connID = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent way method for closing the connection.
+	 *
+	 * @return mixed
+	 */
+	abstract protected function _close();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create a persistent database connection.
+	 *
+	 * @return mixed
+	 */
+	public function persistentConnect()
+	{
+		return $this->connect(true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return mixed
+	 */
+	abstract public function reconnect();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the actual connection object. If both a 'read' and 'write'
+	 * connection has been specified, you can pass either term in to
+	 * get that connection. If you pass either alias in and only a single
+	 * connection is present, it must return the sole connection.
+	 *
+	 * @param string|null $alias
+	 *
+	 * @return mixed
+	 */
+	public function getConnection(string $alias = null)
+	{
+		//@todo work with read/write connections
+		return $this->connID;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return mixed
+	 */
+	abstract public function setDatabase(string $databaseName);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the current database being used.
+	 *
+	 * @return string
+	 */
+	public function getDatabase(): string
+	{
+		return empty($this->database) ? '' : $this->database;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set DB Prefix
+	 *
+	 * Set's the DB Prefix to something new without needing to reconnect
+	 *
+	 * @param string $prefix The prefix
+	 *
+	 * @return string
+	 */
+	public function setPrefix(string $prefix = ''): string
+	{
+		return $this->DBPrefix = $prefix;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the database prefix.
+	 *
+	 * @return string
+	 */
+	public function getPrefix(): string
+	{
+		return $this->DBPrefix;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The name of the platform in use (MySQLi, mssql, etc)
+	 *
+	 * @return string
+	 */
+	public function getPlatform(): string
+	{
+		return $this->DBDriver;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	abstract public function getVersion(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the Table Aliases to use. These are typically
+	 * collected during use of the Builder, and set here
+	 * so queries are built correctly.
+	 *
+	 * @param array $aliases
+	 *
+	 * @return $this
+	 */
+	public function setAliasedTables(array $aliases)
+	{
+		$this->aliasedTables = $aliases;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add a table alias to our list.
+	 *
+	 * @param string $table
+	 *
+	 * @return $this
+	 */
+	public function addTableAlias(string $table)
+	{
+		if (! in_array($table, $this->aliasedTables, true))
+		{
+			$this->aliasedTables[] = $table;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Executes the query against the database.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	abstract protected function execute(string $sql);
+
+	/**
+	 * Orchestrates a query against the database. Queries must use
+	 * Database\Statement objects to store the query and build it.
+	 * This method works with the cache.
+	 *
+	 * Should automatically handle different connections for read/write
+	 * queries if needed.
+	 *
+	 * @param string  $sql
+	 * @param mixed   ...$binds
+	 * @param boolean $setEscapeFlags
+	 * @param string  $queryClass
+	 *
+	 * @return BaseResult|Query|boolean
+	 *
+	 * @todo BC set $queryClass default as null in 4.1
+	 */
+	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
+	{
+		$queryClass = $queryClass ?: $this->queryClass;
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		/**
+		 * @var Query $query
+		 */
+		$query = new $queryClass($this);
+
+		$query->setQuery($sql, $binds, $setEscapeFlags);
+
+		if (! empty($this->swapPre) && ! empty($this->DBPrefix))
+		{
+			$query->swapPrefix($this->DBPrefix, $this->swapPre);
+		}
+
+		$startTime = microtime(true);
+
+		// Always save the last query so we can use
+		// the getLastQuery() method.
+		$this->lastQuery = $query;
+
+		// Run the query for real
+		if (! $this->pretend && false === ($this->resultID = $this->simpleQuery($query->getQuery())))
+		{
+			$query->setDuration($startTime, $startTime);
+
+			// This will trigger a rollback if transactions are being used
+			if ($this->transDepth !== 0)
+			{
+				$this->transStatus = false;
+			}
+
+			if ($this->DBDebug)
+			{
+				// We call this function in order to roll-back queries
+				// if transactions are enabled. If we don't call this here
+				// the error message will trigger an exit, causing the
+				// transactions to remain in limbo.
+				while ($this->transDepth !== 0)
+				{
+					$transDepth = $this->transDepth;
+					$this->transComplete();
+
+					if ($transDepth === $this->transDepth)
+					{
+						log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
+						break;
+					}
+				}
+
+				return false;
+			}
+
+			if (! $this->pretend)
+			{
+				// Let others do something with this query.
+				Events::trigger('DBQuery', $query);
+			}
+
+			return false;
+		}
+
+		$query->setDuration($startTime);
+
+		if (! $this->pretend)
+		{
+			// Let others do something with this query
+			Events::trigger('DBQuery', $query);
+		}
+
+		// If $pretend is true, then we just want to return
+		// the actual query object here. There won't be
+		// any results to return.
+		if ($this->pretend)
+		{
+			return $query;
+		}
+
+		// resultID is not false, so it must be successful
+		if ($this->isWriteType($sql))
+		{
+			return true;
+		}
+
+		// query is not write-type, so it must be read-type query; return QueryResult
+		$resultClass = str_replace('Connection', 'Result', get_class($this));
+		return new $resultClass($this->connID, $this->resultID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs a basic query against the database. No binding or caching
+	 * is performed, nor are transactions handled. Simply takes a raw
+	 * query string and returns the database-specific result id.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	public function simpleQuery(string $sql)
+	{
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		return $this->execute($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disable Transactions
+	 *
+	 * This permits transactions to be disabled at run-time.
+	 *
+	 * @return void
+	 */
+	public function transOff()
+	{
+		$this->transEnabled = false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enable/disable Transaction Strict Mode
+	 *
+	 * When strict mode is enabled, if you are running multiple groups of
+	 * transactions, if one group fails all subsequent groups will be
+	 * rolled back.
+	 *
+	 * If strict mode is disabled, each group is treated autonomously,
+	 * meaning a failure of one group will not affect any others
+	 *
+	 * @param boolean $mode = true
+	 *
+	 * @return $this
+	 */
+	public function transStrict(bool $mode = true)
+	{
+		$this->transStrict = $mode;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Start Transaction
+	 *
+	 * @param  boolean $testMode = FALSE
+	 * @return boolean
+	 */
+	public function transStart(bool $testMode = false): bool
+	{
+		if (! $this->transEnabled)
+		{
+			return false;
+		}
+
+		return $this->transBegin($testMode);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Complete Transaction
+	 *
+	 * @return boolean
+	 */
+	public function transComplete(): bool
+	{
+		if (! $this->transEnabled)
+		{
+			return false;
+		}
+
+		// The query() function will set this flag to FALSE in the event that a query failed
+		if ($this->transStatus === false || $this->transFailure === true)
+		{
+			$this->transRollback();
+
+			// If we are NOT running in strict mode, we will reset
+			// the _trans_status flag so that subsequent groups of
+			// transactions will be permitted.
+			if ($this->transStrict === false)
+			{
+				$this->transStatus = true;
+			}
+
+			//            log_message('debug', 'DB Transaction Failure');
+			return false;
+		}
+
+		return $this->transCommit();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Lets you retrieve the transaction flag to determine if it has failed
+	 *
+	 * @return boolean
+	 */
+	public function transStatus(): bool
+	{
+		return $this->transStatus;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @param  boolean $testMode
+	 * @return boolean
+	 */
+	public function transBegin(bool $testMode = false): bool
+	{
+		if (! $this->transEnabled)
+		{
+			return false;
+		}
+
+		// When transactions are nested we only begin/commit/rollback the outermost ones
+		if ($this->transDepth > 0)
+		{
+			$this->transDepth ++;
+			return true;
+		}
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		// Reset the transaction failure flag.
+		// If the $test_mode flag is set to TRUE transactions will be rolled back
+		// even if the queries produce a successful result.
+		$this->transFailure = ($testMode === true);
+
+		if ($this->_transBegin())
+		{
+			$this->transDepth ++;
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	public function transCommit(): bool
+	{
+		if (! $this->transEnabled || $this->transDepth === 0)
+		{
+			return false;
+		}
+
+		// When transactions are nested we only begin/commit/rollback the outermost ones
+		if ($this->transDepth > 1 || $this->_transCommit())
+		{
+			$this->transDepth --;
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	public function transRollback(): bool
+	{
+		if (! $this->transEnabled || $this->transDepth === 0)
+		{
+			return false;
+		}
+
+		// When transactions are nested we only begin/commit/rollback the outermost ones
+		if ($this->transDepth > 1 || $this->_transRollback())
+		{
+			$this->transDepth --;
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	abstract protected function _transBegin(): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	abstract protected function _transCommit(): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	abstract protected function _transRollback(): bool;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns an instance of the query builder for this connection.
+	 *
+	 * @param string|array $tableName
+	 *
+	 * @return BaseBuilder
+	 * @throws DatabaseException
+	 */
+	public function table($tableName)
+	{
+		if (empty($tableName))
+		{
+			throw new DatabaseException('You must set the database table to be used with your query.');
+		}
+
+		$className = str_replace('Connection', 'Builder', get_class($this));
+
+		return new $className($tableName, $this);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Creates a prepared statement with the database that can then
+	 * be used to execute multiple statements against. Within the
+	 * closure, you would build the query in any normal way, though
+	 * the Query Builder is the expected manner.
+	 *
+	 * Example:
+	 *    $stmt = $db->prepare(function($db)
+	 *           {
+	 *             return $db->table('users')
+	 *                   ->where('id', 1)
+	 *                     ->get();
+	 *           })
+	 *
+	 * @param Closure $func
+	 * @param array   $options Passed to the prepare() method
+	 *
+	 * @return BasePreparedQuery|null
+	 */
+	public function prepare(Closure $func, array $options = [])
+	{
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		$this->pretend();
+
+		$sql = $func($this);
+
+		$this->pretend(false);
+
+		if ($sql instanceof QueryInterface)
+		{
+			// @phpstan-ignore-next-line
+			$sql = $sql->getOriginalQuery();
+		}
+
+		$class = str_ireplace('Connection', 'PreparedQuery', get_class($this));
+		/**
+		 * @var BasePreparedQuery $class
+		 */
+		$class = new $class($this);
+
+		return $class->prepare($sql, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last query's statement object.
+	 *
+	 * @return mixed
+	 */
+	public function getLastQuery()
+	{
+		return $this->lastQuery;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string representation of the last query's statement object.
+	 *
+	 * @return string
+	 */
+	public function showLastQuery(): string
+	{
+		return (string) $this->lastQuery;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the time we started to connect to this database in
+	 * seconds with microseconds.
+	 *
+	 * Used by the Debug Toolbar's timeline.
+	 *
+	 * @return float|null
+	 */
+	public function getConnectStart(): ?float
+	{
+		return $this->connectTime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of seconds with microseconds that it took
+	 * to connect to the database.
+	 *
+	 * Used by the Debug Toolbar's timeline.
+	 *
+	 * @param integer $decimals
+	 *
+	 * @return string
+	 */
+	public function getConnectDuration(int $decimals = 6): string
+	{
+		return number_format($this->connectDuration, $decimals);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Protect Identifiers
+	 *
+	 * This function is used extensively by the Query Builder class, and by
+	 * a couple functions in this class.
+	 * It takes a column or table name (optionally with an alias) and inserts
+	 * the table prefix onto it. Some logic is necessary in order to deal with
+	 * column names that include the path. Consider a query like this:
+	 *
+	 * SELECT hostname.database.table.column AS c FROM hostname.database.table
+	 *
+	 * Or a query with aliasing:
+	 *
+	 * SELECT m.member_id, m.member_name FROM members AS m
+	 *
+	 * Since the column name can include up to four segments (host, DB, table, column)
+	 * or also have an alias prefix, we need to do a bit of work to figure this out and
+	 * insert the table prefix (if it exists) in the proper position, and escape only
+	 * the correct identifiers.
+	 *
+	 * @param string|array $item
+	 * @param boolean      $prefixSingle
+	 * @param boolean      $protectIdentifiers
+	 * @param boolean      $fieldExists
+	 *
+	 * @return string|array
+	 */
+	public function protectIdentifiers($item, bool $prefixSingle = false, bool $protectIdentifiers = null, bool $fieldExists = true)
+	{
+		if (! is_bool($protectIdentifiers))
+		{
+			$protectIdentifiers = $this->protectIdentifiers;
+		}
+
+		if (is_array($item))
+		{
+			$escapedArray = [];
+			foreach ($item as $k => $v)
+			{
+				$escapedArray[$this->protectIdentifiers($k)] = $this->protectIdentifiers($v, $prefixSingle, $protectIdentifiers, $fieldExists);
+			}
+
+			return $escapedArray;
+		}
+
+		// This is basically a bug fix for queries that use MAX, MIN, etc.
+		// If a parenthesis is found we know that we do not need to
+		// escape the data or add a prefix. There's probably a more graceful
+		// way to deal with this, but I'm not thinking of it
+		//
+		// Added exception for single quotes as well, we don't want to alter
+		// literal strings.
+		if (strcspn($item, "()'") !== strlen($item))
+		{
+			return $item;
+		}
+
+		// Convert tabs or multiple spaces into single spaces
+		$item = preg_replace('/\s+/', ' ', trim($item));
+
+		// If the item has an alias declaration we remove it and set it aside.
+		// Note: strripos() is used in order to support spaces in table names
+		if ($offset = strripos($item, ' AS '))
+		{
+			$alias = ($protectIdentifiers) ? substr($item, $offset, 4) . $this->escapeIdentifiers(substr($item, $offset + 4)) : substr($item, $offset);
+			$item  = substr($item, 0, $offset);
+		}
+		elseif ($offset = strrpos($item, ' '))
+		{
+			$alias = ($protectIdentifiers) ? ' ' . $this->escapeIdentifiers(substr($item, $offset + 1)) : substr($item, $offset);
+			$item  = substr($item, 0, $offset);
+		}
+		else
+		{
+			$alias = '';
+		}
+
+		// Break the string apart if it contains periods, then insert the table prefix
+		// in the correct location, assuming the period doesn't indicate that we're dealing
+		// with an alias. While we're at it, we will escape the components
+		if (strpos($item, '.') !== false)
+		{
+			$parts = explode('.', $item);
+
+			// Does the first segment of the exploded item match
+			// one of the aliases previously identified? If so,
+			// we have nothing more to do other than escape the item
+			//
+			// NOTE: The ! empty() condition prevents this method
+			//       from breaking when QB isn't enabled.
+			if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true))
+			{
+				if ($protectIdentifiers === true)
+				{
+					foreach ($parts as $key => $val)
+					{
+						if (! in_array($val, $this->reservedIdentifiers, true))
+						{
+							$parts[$key] = $this->escapeIdentifiers($val);
+						}
+					}
+
+					$item = implode('.', $parts);
+				}
+
+				return $item . $alias;
+			}
+
+			// Is there a table prefix defined in the config file? If not, no need to do anything
+			if ($this->DBPrefix !== '')
+			{
+				// We now add the table prefix based on some logic.
+				// Do we have 4 segments (hostname.database.table.column)?
+				// If so, we add the table prefix to the column name in the 3rd segment.
+				if (isset($parts[3]))
+				{
+					$i = 2;
+				}
+				// Do we have 3 segments (database.table.column)?
+				// If so, we add the table prefix to the column name in 2nd position
+				elseif (isset($parts[2]))
+				{
+					$i = 1;
+				}
+				// Do we have 2 segments (table.column)?
+				// If so, we add the table prefix to the column name in 1st segment
+				else
+				{
+					$i = 0;
+				}
+
+				// This flag is set when the supplied $item does not contain a field name.
+				// This can happen when this function is being called from a JOIN.
+				if ($fieldExists === false)
+				{
+					$i++;
+				}
+
+				// Verify table prefix and replace if necessary
+				if ($this->swapPre !== '' && strpos($parts[$i], $this->swapPre) === 0)
+				{
+					$parts[$i] = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $parts[$i]);
+				}
+				// We only add the table prefix if it does not already exist
+				elseif (strpos($parts[$i], $this->DBPrefix) !== 0)
+				{
+					$parts[$i] = $this->DBPrefix . $parts[$i];
+				}
+
+				// Put the parts back together
+				$item = implode('.', $parts);
+			}
+
+			if ($protectIdentifiers === true)
+			{
+				$item = $this->escapeIdentifiers($item);
+			}
+
+			return $item . $alias;
+		}
+
+		// In some cases, especially 'from', we end up running through
+		// protect_identifiers twice. This algorithm won't work when
+		// it contains the escapeChar so strip it out.
+		$item = trim($item, $this->escapeChar);
+
+		// Is there a table prefix? If not, no need to insert it
+		if ($this->DBPrefix !== '')
+		{
+			// Verify table prefix and replace if necessary
+			if ($this->swapPre !== '' && strpos($item, $this->swapPre) === 0)
+			{
+				$item = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $item);
+			}
+			// Do we prefix an item with no segments?
+			elseif ($prefixSingle === true && strpos($item, $this->DBPrefix) !== 0)
+			{
+				$item = $this->DBPrefix . $item;
+			}
+		}
+
+		if ($protectIdentifiers === true && ! in_array($item, $this->reservedIdentifiers, true))
+		{
+			$item = $this->escapeIdentifiers($item);
+		}
+
+		return $item . $alias;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Escape the SQL Identifiers
+	 *
+	 * This function escapes column and table names
+	 *
+	 * @param mixed $item
+	 *
+	 * @return mixed
+	 */
+	public function escapeIdentifiers($item)
+	{
+		if ($this->escapeChar === '' || empty($item) || in_array($item, $this->reservedIdentifiers, true))
+		{
+			return $item;
+		}
+
+		if (is_array($item))
+		{
+			foreach ($item as $key => $value)
+			{
+				$item[$key] = $this->escapeIdentifiers($value);
+			}
+
+			return $item;
+		}
+
+		// Avoid breaking functions and literal values inside queries
+		if (ctype_digit($item)
+			|| $item[0] === "'"
+			|| ($this->escapeChar !== '"' && $item[0] === '"')
+			|| strpos($item, '(') !== false)
+		{
+			return $item;
+		}
+
+		static $pregEc = [];
+
+		if (empty($pregEc))
+		{
+			if (is_array($this->escapeChar))
+			{
+				$pregEc = [
+					preg_quote($this->escapeChar[0], '/'),
+					preg_quote($this->escapeChar[1], '/'),
+					$this->escapeChar[0],
+					$this->escapeChar[1],
+				];
+			}
+			else
+			{
+				$pregEc[0] = $pregEc[1] = preg_quote($this->escapeChar, '/');
+				$pregEc[2] = $pregEc[3] = $this->escapeChar;
+			}
+		}
+
+		foreach ($this->reservedIdentifiers as $id)
+		{
+			if (strpos($item, '.' . $id) !== false)
+			{
+				return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?\./i', $pregEc[2] . '$1' . $pregEc[3] . '.', $item);
+			}
+		}
+
+		return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepends a database prefix if one exists in configuration
+	 *
+	 * @param string $table the table
+	 *
+	 * @return string
+	 *
+	 * @throws DatabaseException
+	 */
+	public function prefixTable(string $table = ''): string
+	{
+		if ($table === '')
+		{
+			throw new DatabaseException('A table name is required for that operation.');
+		}
+
+		return $this->DBPrefix . $table;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	abstract public function affectedRows(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * "Smart" Escape String
+	 *
+	 * Escapes data based on type.
+	 * Sets boolean and null types
+	 *
+	 * @param mixed $str
+	 *
+	 * @return mixed
+	 */
+	public function escape($str)
+	{
+		if (is_array($str))
+		{
+			return array_map([&$this, 'escape'], $str);
+		}
+
+		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
+		{
+			return "'" . $this->escapeString($str) . "'";
+		}
+
+		if (is_bool($str))
+		{
+			return ($str === false) ? 0 : 1;
+		}
+
+		if (is_numeric($str) && $str < 0)
+		{
+			return "'{$str}'";
+		}
+
+		if ($str === null)
+		{
+			return 'NULL';
+		}
+
+		return $str;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Escape String
+	 *
+	 * @param  string|string[] $str  Input string
+	 * @param  boolean         $like Whether or not the string will be used in a LIKE condition
+	 * @return string|string[]
+	 */
+	public function escapeString($str, bool $like = false)
+	{
+		if (is_array($str))
+		{
+			foreach ($str as $key => $val)
+			{
+				$str[$key] = $this->escapeString($val, $like);
+			}
+
+			return $str;
+		}
+
+		$str = $this->_escapeString($str);
+
+		// escape LIKE condition wildcards
+		if ($like === true)
+		{
+			return str_replace([
+				$this->likeEscapeChar,
+				'%',
+				'_',
+			], [
+				$this->likeEscapeChar . $this->likeEscapeChar,
+				$this->likeEscapeChar . '%',
+				$this->likeEscapeChar . '_',
+			], $str
+			);
+		}
+
+		return $str;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Escape LIKE String
+	 *
+	 * Calls the individual driver for platform
+	 * specific escaping for LIKE conditions
+	 *
+	 * @param  string|string[] $str
+	 * @return string|string[]
+	 */
+	public function escapeLikeString($str)
+	{
+		return $this->escapeString($str, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform independent string escape.
+	 *
+	 * Will likely be overridden in child classes.
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function _escapeString(string $str): string
+	{
+		return str_replace("'", "''", remove_invisible_characters($str, false));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * This function enables you to call PHP database functions that are not natively included
+	 * in CodeIgniter, in a platform independent manner.
+	 *
+	 * @param string $functionName
+	 * @param array  ...$params
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function callFunction(string $functionName, ...$params): bool
+	{
+		$driver = strtolower($this->DBDriver);
+		$driver = ($driver === 'postgre' ? 'pg' : $driver) . '_';
+
+		if (false === strpos($driver, $functionName))
+		{
+			$functionName = $driver . $functionName;
+		}
+
+		if (! function_exists($functionName))
+		{
+			if ($this->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		return $functionName(...$params);
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// META Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of table names
+	 *
+	 * @param  boolean $constrainByPrefix = FALSE
+	 * @return boolean|array
+	 * @throws DatabaseException
+	 */
+	public function listTables(bool $constrainByPrefix = false)
+	{
+		// Is there a cached result?
+		if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])
+		{
+			return $constrainByPrefix ?
+				preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
+				: $this->dataCache['table_names'];
+		}
+
+		if (false === ($sql = $this->_listTables($constrainByPrefix)))
+		{
+			if ($this->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+			return false;
+		}
+
+		$this->dataCache['table_names'] = [];
+		$query                          = $this->query($sql);
+
+		foreach ($query->getResultArray() as $row)
+		{
+			// Do we know from which column to get the table name?
+			if (! isset($key))
+			{
+				if (isset($row['table_name']))
+				{
+					$key = 'table_name';
+				}
+				elseif (isset($row['TABLE_NAME']))
+				{
+					$key = 'TABLE_NAME';
+				}
+				else
+				{
+					/* We have no other choice but to just get the first element's key.
+					 * Due to array_shift() accepting its argument by reference, if
+					 * E_STRICT is on, this would trigger a warning. So we'll have to
+					 * assign it first.
+					 */
+					$key = array_keys($row);
+					$key = array_shift($key);
+				}
+			}
+
+			$this->dataCache['table_names'][] = $row[$key];
+		}
+
+		return $this->dataCache['table_names'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determine if a particular table exists
+	 *
+	 * @param  string $tableName
+	 * @return boolean
+	 */
+	public function tableExists(string $tableName): bool
+	{
+		return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch Field Names
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return array|false
+	 * @throws DatabaseException
+	 */
+	public function getFieldNames(string $table)
+	{
+		// Is there a cached result?
+		if (isset($this->dataCache['field_names'][$table]))
+		{
+			return $this->dataCache['field_names'][$table];
+		}
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		if (false === ($sql = $this->_listColumns($table)))
+		{
+			if ($this->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+			return false;
+		}
+
+		$query                                  = $this->query($sql);
+		$this->dataCache['field_names'][$table] = [];
+
+		foreach ($query->getResultArray() as $row)
+		{
+			// Do we know from where to get the column's name?
+			if (! isset($key))
+			{
+				if (isset($row['column_name']))
+				{
+					$key = 'column_name';
+				}
+				elseif (isset($row['COLUMN_NAME']))
+				{
+					$key = 'COLUMN_NAME';
+				}
+				else
+				{
+					// We have no other choice but to just get the first element's key.
+					$key = key($row);
+				}
+			}
+
+			$this->dataCache['field_names'][$table][] = $row[$key];
+		}
+
+		return $this->dataCache['field_names'][$table];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determine if a particular field exists
+	 *
+	 * @param  string $fieldName
+	 * @param  string $tableName
+	 * @return boolean
+	 */
+	public function fieldExists(string $fieldName, string $tableName): bool
+	{
+		return in_array($fieldName, $this->getFieldNames($tableName), true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an object with field data
+	 *
+	 * @param  string $table the table name
+	 * @return array
+	 */
+	public function getFieldData(string $table)
+	{
+		return $this->_fieldData($this->protectIdentifiers($table, true, false, false));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an object with key data
+	 *
+	 * @param  string $table the table name
+	 * @return array
+	 */
+	public function getIndexData(string $table)
+	{
+		return $this->_indexData($this->protectIdentifiers($table, true, false, false));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an object with foreign key data
+	 *
+	 * @param  string $table the table name
+	 * @return array
+	 */
+	public function getForeignKeyData(string $table)
+	{
+		return $this->_foreignKeyData($this->protectIdentifiers($table, true, false, false));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disables foreign key checks temporarily.
+	 */
+	public function disableForeignKeyChecks()
+	{
+		$sql = $this->_disableForeignKeyChecks();
+
+		return $this->query($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enables foreign key checks temporarily.
+	 */
+	public function enableForeignKeyChecks()
+	{
+		$sql = $this->_enableForeignKeyChecks();
+
+		return $this->query($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows the engine to be set into a mode where queries are not
+	 * actually executed, but they are still generated, timed, etc.
+	 *
+	 * This is primarily used by the prepared query functionality.
+	 *
+	 * @param boolean $pretend
+	 *
+	 * @return $this
+	 */
+	public function pretend(bool $pretend = true)
+	{
+		$this->pretend = $pretend;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Empties our data cache. Especially helpful during testing.
+	 *
+	 * @return $this
+	 */
+	public function resetDataCache()
+	{
+		$this->dataCache = [];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the statement is a write-type query or not.
+	 *
+	 * @param  string $sql
+	 * @return boolean
+	 */
+	public function isWriteType($sql): bool
+	{
+		return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX|MERGE)\s/i', $sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error code and message.
+	 *
+	 * Must return an array with keys 'code' and 'message':
+	 *
+	 *  return ['code' => null, 'message' => null);
+	 *
+	 * @return array
+	 */
+	abstract public function error(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer|string
+	 */
+	abstract public function insertID();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 *
+	 * @param boolean $constrainByPrefix
+	 *
+	 * @return string|false
+	 */
+	abstract protected function _listTables(bool $constrainByPrefix = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string|false
+	 */
+	abstract protected function _listColumns(string $table = '');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-specific field data information.
+	 *
+	 * @param  string $table
+	 * @see    getFieldData()
+	 * @return array
+	 */
+	abstract protected function _fieldData(string $table): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-specific index data.
+	 *
+	 * @param  string $table
+	 * @see    getIndexData()
+	 * @return array
+	 */
+	abstract protected function _indexData(string $table): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-specific foreign keys data.
+	 *
+	 * @param  string $table
+	 * @see    getForeignKeyData()
+	 * @return array
+	 */
+	abstract protected function _foreignKeyData(string $table): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Accessor for properties if they exist.
+	 *
+	 * @param string $key
+	 *
+	 * @return mixed
+	 */
+	public function __get(string $key)
+	{
+		if (property_exists($this, $key))
+		{
+			return $this->$key;
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checker for properties existence.
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function __isset(string $key): bool
+	{
+		return property_exists($this, $key);
+	}
+
+	//--------------------------------------------------------------------
+
+}
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
new file mode 100644
index 0000000..00f477b
--- /dev/null
+++ b/system/Database/BasePreparedQuery.php
@@ -0,0 +1,244 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use BadMethodCallException;
+use CodeIgniter\Events\Events;
+
+/**
+ * Base prepared query
+ */
+abstract class BasePreparedQuery implements PreparedQueryInterface
+{
+	/**
+	 * The prepared statement itself.
+	 *
+	 * @var object|resource
+	 */
+	protected $statement;
+
+	/**
+	 * The error code, if any.
+	 *
+	 * @var integer
+	 */
+	protected $errorCode;
+
+	/**
+	 * The error message, if any.
+	 *
+	 * @var string
+	 */
+	protected $errorString;
+
+	/**
+	 * Holds the prepared query object
+	 * that is cloned during execute.
+	 *
+	 * @var Query
+	 */
+	protected $query;
+
+	/**
+	 * A reference to the db connection to use.
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Constructor.
+	 *
+	 * @param BaseConnection $db
+	 */
+	public function __construct(BaseConnection $db)
+	{
+		$this->db = &$db;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options    Passed to the connection's prepare statement.
+	 * @param string $queryClass
+	 *
+	 * @return mixed
+	 */
+	public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
+	{
+		// We only supports positional placeholders (?)
+		// in order to work with the execute method below, so we
+		// need to replace our named placeholders (:name)
+		$sql = preg_replace('/:[^\s,)]+/', '?', $sql);
+
+		/**
+		 * @var Query $query
+		 */
+		$query = new $queryClass($this->db);
+
+		$query->setQuery($sql);
+
+		if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix))
+		{
+			$query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
+		}
+
+		$this->query = $query;
+
+		return $this->_prepare($query->getOriginalQuery(), $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The database-dependent portion of the prepare statement.
+	 *
+	 * @param string $sql
+	 * @param array  $options Passed to the connection's prepare statement.
+	 *
+	 * @return mixed
+	 */
+	abstract public function _prepare(string $sql, array $options = []);
+
+	//--------------------------------------------------------------------
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @param array $data
+	 *
+	 * @return ResultInterface
+	 */
+	public function execute(...$data)
+	{
+		// Execute the Query.
+		$startTime = microtime(true);
+
+		$result = $this->_execute($data);
+
+		// Update our query object
+		$query = clone $this->query;
+		$query->setBinds($data);
+
+		$query->setDuration($startTime);
+
+		// Let others do something with this query
+		Events::trigger('DBQuery', $query);
+
+		// Return a result object
+		$resultClass = str_replace('PreparedQuery', 'Result', get_class($this));
+
+		$resultID = $this->_getResult();
+
+		return new $resultClass($this->db->connID, $resultID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The database dependant version of the execute method.
+	 *
+	 * @param array $data
+	 *
+	 * @return boolean
+	 */
+	abstract public function _execute(array $data): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result object for the prepared query.
+	 *
+	 * @return mixed
+	 */
+	abstract public function _getResult();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Explicitly closes the statement.
+	 *
+	 * @return void
+	 */
+	public function close()
+	{
+		if (! is_object($this->statement))
+		{
+			return;
+		}
+
+		$this->statement->close();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the SQL that has been prepared.
+	 *
+	 * @return string
+	 */
+	public function getQueryString(): string
+	{
+		if (! $this->query instanceof QueryInterface)
+		{
+			throw new BadMethodCallException('Cannot call getQueryString on a prepared query until after the query has been prepared.');
+		}
+
+		return $this->query->getQuery();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A helper to determine if any error exists.
+	 *
+	 * @return boolean
+	 */
+	public function hasError(): bool
+	{
+		return ! empty($this->errorString);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error code created while executing this statement.
+	 *
+	 * @return integer
+	 */
+	public function getErrorCode(): int
+	{
+		return $this->errorCode;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error message created while executing this statement.
+	 *
+	 * @return string
+	 */
+	public function getErrorMessage(): string
+	{
+		return $this->errorString;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
new file mode 100644
index 0000000..c1bdecc
--- /dev/null
+++ b/system/Database/BaseResult.php
@@ -0,0 +1,635 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Entity\Entity;
+
+/**
+ * Class BaseResult
+ */
+abstract class BaseResult implements ResultInterface
+{
+	/**
+	 * Connection ID
+	 *
+	 * @var resource|object
+	 */
+	public $connID;
+
+	/**
+	 * Result ID
+	 *
+	 * @var resource|object|boolean
+	 */
+	public $resultID;
+
+	/**
+	 * Result Array
+	 *
+	 * @var array[]
+	 */
+	public $resultArray = [];
+
+	/**
+	 * Result Object
+	 *
+	 * @var object[]
+	 */
+	public $resultObject = [];
+
+	/**
+	 * Custom Result Object
+	 *
+	 * @var array
+	 */
+	public $customResultObject = [];
+
+	/**
+	 * Current Row index
+	 *
+	 * @var integer
+	 */
+	public $currentRow = 0;
+
+	/**
+	 * The number of records in the query result
+	 *
+	 * @var integer|null
+	 */
+	protected $numRows = null;
+
+	/**
+	 * Row data
+	 *
+	 * @var array|null
+	 */
+	public $rowData;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param object|resource $connID
+	 * @param object|resource $resultID
+	 */
+	public function __construct(&$connID, &$resultID)
+	{
+		$this->connID   = $connID;
+		$this->resultID = $resultID;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the results of the query. Typically an array of
+	 * individual data rows, which can be either an 'array', an
+	 * 'object', or a custom class name.
+	 *
+	 * @param string $type The row type. Either 'array', 'object', or a class name to use
+	 *
+	 * @return array
+	 */
+	public function getResult(string $type = 'object'): array
+	{
+		if ($type === 'array')
+		{
+			return $this->getResultArray();
+		}
+
+		if ($type === 'object')
+		{
+			return $this->getResultObject();
+		}
+
+		return $this->getCustomResultObject($type);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the results as an array of custom objects.
+	 *
+	 * @param string $className The name of the class to use.
+	 *
+	 * @return mixed
+	 */
+	public function getCustomResultObject(string $className)
+	{
+		if (isset($this->customResultObject[$className]))
+		{
+			return $this->customResultObject[$className];
+		}
+
+		if (is_bool($this->resultID) || ! $this->resultID)
+		{
+			return [];
+		}
+
+		// Don't fetch the result set again if we already have it
+		$_data = null;
+		if (($c = count($this->resultArray)) > 0)
+		{
+			$_data = 'resultArray';
+		}
+		elseif (($c = count($this->resultObject)) > 0)
+		{
+			$_data = 'resultObject';
+		}
+
+		if ($_data !== null)
+		{
+			for ($i = 0; $i < $c; $i ++)
+			{
+				$this->customResultObject[$className][$i] = new $className();
+
+				foreach ($this->{$_data}[$i] as $key => $value)
+				{
+					$this->customResultObject[$className][$i]->$key = $value;
+				}
+			}
+
+			return $this->customResultObject[$className];
+		}
+
+		is_null($this->rowData) || $this->dataSeek();
+		$this->customResultObject[$className] = [];
+
+		while ($row = $this->fetchObject($className))
+		{
+			if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal'))
+			{
+				$row->syncOriginal();
+			}
+
+			$this->customResultObject[$className][] = $row;
+		}
+
+		// @phpstan-ignore-next-line
+		return $this->customResultObject[$className];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the results as an array of arrays.
+	 *
+	 * If no results, an empty array is returned.
+	 *
+	 * @return array
+	 */
+	public function getResultArray(): array
+	{
+		if (! empty($this->resultArray))
+		{
+			return $this->resultArray;
+		}
+
+		// In the event that query caching is on, the result_id variable
+		// will not be a valid resource so we'll simply return an empty
+		// array.
+		if (is_bool($this->resultID) || ! $this->resultID)
+		{
+			return [];
+		}
+
+		if ($this->resultObject)
+		{
+			foreach ($this->resultObject as $row)
+			{
+				$this->resultArray[] = (array) $row;
+			}
+
+			return $this->resultArray;
+		}
+
+		is_null($this->rowData) || $this->dataSeek();
+		while ($row = $this->fetchAssoc())
+		{
+			$this->resultArray[] = $row;
+		}
+
+		return $this->resultArray;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the results as an array of objects.
+	 *
+	 * If no results, an empty array is returned.
+	 *
+	 * @return array
+	 */
+	public function getResultObject(): array
+	{
+		if (! empty($this->resultObject))
+		{
+			return $this->resultObject;
+		}
+
+		// In the event that query caching is on, the result_id variable
+		// will not be a valid resource so we'll simply return an empty
+		// array.
+		if (is_bool($this->resultID) || ! $this->resultID)
+		{
+			return [];
+		}
+
+		if ($this->resultArray)
+		{
+			foreach ($this->resultArray as $row)
+			{
+				$this->resultObject[] = (object) $row;
+			}
+
+			return $this->resultObject;
+		}
+
+		is_null($this->rowData) || $this->dataSeek();
+		while ($row = $this->fetchObject())
+		{
+			if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal'))
+			{
+				$row->syncOriginal();
+			}
+
+			$this->resultObject[] = $row;
+		}
+
+		// @phpstan-ignore-next-line
+		return $this->resultObject;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrapper object to return a row as either an array, an object, or
+	 * a custom class.
+	 *
+	 * If row doesn't exist, returns null.
+	 *
+	 * @param mixed  $n    The index of the results to return
+	 * @param string $type The type of result object. 'array', 'object' or class name.
+	 *
+	 * @return mixed
+	 */
+	public function getRow($n = 0, string $type = 'object')
+	{
+		if (! is_numeric($n))
+		{
+			// We cache the row data for subsequent uses
+			if (! is_array($this->rowData))
+			{
+				$this->rowData = $this->getRowArray();
+			}
+
+			// array_key_exists() instead of isset() to allow for NULL values
+			if (empty($this->rowData) || ! array_key_exists($n, $this->rowData))
+			{
+				return null;
+			}
+
+			return $this->rowData[$n];
+		}
+
+		if ($type === 'object')
+		{
+			return $this->getRowObject($n);
+		}
+
+		if ($type === 'array')
+		{
+			return $this->getRowArray($n);
+		}
+
+		return $this->getCustomRowObject($n, $type);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a row as a custom class instance.
+	 *
+	 * If row doesn't exists, returns null.
+	 *
+	 * @param integer $n
+	 * @param string  $className
+	 *
+	 * @return mixed
+	 */
+	public function getCustomRowObject(int $n, string $className)
+	{
+		isset($this->customResultObject[$className]) || $this->getCustomResultObject($className);
+
+		if (empty($this->customResultObject[$className]))
+		{
+			return null;
+		}
+
+		if ($n !== $this->currentRow && isset($this->customResultObject[$className][$n]))
+		{
+			$this->currentRow = $n;
+		}
+
+		return $this->customResultObject[$className][$this->currentRow];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single row from the results as an array.
+	 *
+	 * If row doesn't exist, returns null.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function getRowArray(int $n = 0)
+	{
+		$result = $this->getResultArray();
+		if (empty($result))
+		{
+			return null;
+		}
+
+		if ($n !== $this->currentRow && isset($result[$n]))
+		{
+			$this->currentRow = $n;
+		}
+
+		return $result[$this->currentRow];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single row from the results as an object.
+	 *
+	 * If row doesn't exist, returns null.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function getRowObject(int $n = 0)
+	{
+		$result = $this->getResultObject();
+		if (empty($result))
+		{
+			return null;
+		}
+
+		if ($n !== $this->customResultObject && isset($result[$n]))
+		{
+			$this->currentRow = $n;
+		}
+
+		return $result[$this->currentRow];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Assigns an item into a particular column slot.
+	 *
+	 * @param mixed $key
+	 * @param mixed $value
+	 *
+	 * @return mixed
+	 */
+	public function setRow($key, $value = null)
+	{
+		// We cache the row data for subsequent uses
+		if (! is_array($this->rowData))
+		{
+			$this->rowData = $this->getRowArray();
+		}
+
+		if (is_array($key))
+		{
+			foreach ($key as $k => $v)
+			{
+				$this->rowData[$k] = $v;
+			}
+
+			return;
+		}
+
+		if ($key !== '' && $value !== null)
+		{
+			$this->rowData[$key] = $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "first" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getFirstRow(string $type = 'object')
+	{
+		$result = $this->getResult($type);
+
+		return (empty($result)) ? null : $result[0];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "last" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getLastRow(string $type = 'object')
+	{
+		$result = $this->getResult($type);
+
+		return (empty($result)) ? null : $result[count($result) - 1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "next" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getNextRow(string $type = 'object')
+	{
+		$result = $this->getResult($type);
+		if (empty($result))
+		{
+			return null;
+		}
+
+		return isset($result[$this->currentRow + 1]) ? $result[++ $this->currentRow] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "previous" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getPreviousRow(string $type = 'object')
+	{
+		$result = $this->getResult($type);
+		if (empty($result))
+		{
+			return null;
+		}
+
+		if (isset($result[$this->currentRow - 1]))
+		{
+			-- $this->currentRow;
+		}
+
+		return $result[$this->currentRow];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an unbuffered row and move the pointer to the next row.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getUnbufferedRow(string $type = 'object')
+	{
+		if ($type === 'array')
+		{
+			return $this->fetchAssoc();
+		}
+
+		if ($type === 'object')
+		{
+			return $this->fetchObject();
+		}
+
+		return $this->fetchObject($type);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Number of rows in the result set; checks for previous count, falls
+	 * back on counting resultArray or resultObject, finally fetching resultArray
+	 * if nothing was previously fetched
+	 *
+	 * @return integer
+	 */
+	public function getNumRows(): int
+	{
+		if (is_int($this->numRows))
+		{
+			return $this->numRows;
+		}
+		if ($this->resultArray !== [])
+		{
+			return $this->numRows = count($this->resultArray);
+		}
+		if ($this->resultObject !== [])
+		{
+			return $this->numRows = count($this->resultObject);
+		}
+
+		return $this->numRows = count($this->getResultArray());
+	}
+
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	abstract public function getFieldCount(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	abstract public function getFieldNames(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	abstract public function getFieldData(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	abstract public function freeResult();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	abstract public function dataSeek(int $n = 0);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	abstract protected function fetchAssoc();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object
+	 */
+	abstract protected function fetchObject(string $className = 'stdClass');
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
new file mode 100644
index 0000000..9922133
--- /dev/null
+++ b/system/Database/BaseUtils.php
@@ -0,0 +1,393 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Class BaseUtils
+ */
+abstract class BaseUtils
+{
+	/**
+	 * Database object
+	 *
+	 * @var object
+	 */
+	protected $db;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * List databases statement
+	 *
+	 * @var string|boolean
+	 */
+	protected $listDatabases = false;
+
+	/**
+	 * OPTIMIZE TABLE statement
+	 *
+	 * @var string|boolean
+	 */
+	protected $optimizeTable = false;
+
+	/**
+	 * REPAIR TABLE statement
+	 *
+	 * @var string|boolean
+	 */
+	protected $repairTable = false;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Class constructor
+	 *
+	 * @param ConnectionInterface $db
+	 */
+	public function __construct(ConnectionInterface &$db)
+	{
+		$this->db = & $db;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * List databases
+	 *
+	 * @return array|boolean
+	 * @throws DatabaseException
+	 */
+	public function listDatabases()
+	{
+		// Is there a cached result?
+		if (isset($this->db->dataCache['db_names']))
+		{
+			return $this->db->dataCache['db_names'];
+		}
+
+		if ($this->listDatabases === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unsupported feature of the database platform you are using.');
+			}
+			return false;
+		}
+
+		$this->db->dataCache['db_names'] = [];
+
+		$query = $this->db->query($this->listDatabases);
+		if ($query === false)
+		{
+			return $this->db->dataCache['db_names'];
+		}
+
+		for ($i = 0, $query = $query->getResultArray(), $c = count($query); $i < $c; $i ++)
+		{
+			$this->db->dataCache['db_names'][] = current($query[$i]);
+		}
+
+		return $this->db->dataCache['db_names'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determine if a particular database exists
+	 *
+	 * @param  string $databaseName
+	 * @return boolean
+	 */
+	public function databaseExists(string $databaseName): bool
+	{
+		return in_array($databaseName, $this->listDatabases(), true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Optimize Table
+	 *
+	 * @param  string $tableName
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function optimizeTable(string $tableName)
+	{
+		if ($this->optimizeTable === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unsupported feature of the database platform you are using.');
+			}
+			return false;
+		}
+
+		$query = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
+
+		return $query !== false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Optimize Database
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function optimizeDatabase()
+	{
+		if ($this->optimizeTable === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unsupported feature of the database platform you are using.');
+			}
+			return false;
+		}
+
+		$result = [];
+		foreach ($this->db->listTables() as $tableName)
+		{
+			$res = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
+			if (is_bool($res))
+			{
+				return $res;
+			}
+
+			// Build the result array...
+
+			$res = $res->getResultArray();
+
+			// Postgre & SQLite3 returns empty array
+			if (empty($res))
+			{
+				$key = $tableName;
+			}
+			else
+			{
+				$res  = current($res);
+				$key  = str_replace($this->db->database . '.', '', current($res));
+				$keys = array_keys($res);
+				unset($res[$keys[0]]);
+			}
+
+			$result[$key] = $res;
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Repair Table
+	 *
+	 * @param  string $tableName
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function repairTable(string $tableName)
+	{
+		if ($this->repairTable === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unsupported feature of the database platform you are using.');
+			}
+			return false;
+		}
+
+		$query = $this->db->query(sprintf($this->repairTable, $this->db->escapeIdentifiers($tableName)));
+		if (is_bool($query))
+		{
+			return $query;
+		}
+
+		$query = $query->getResultArray();
+		return current($query);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Generate CSV from a query result object
+	 *
+	 * @param ResultInterface $query     Query result object
+	 * @param string          $delim     Delimiter (default: ,)
+	 * @param string          $newline   Newline character (default: \n)
+	 * @param string          $enclosure Enclosure (default: ")
+	 *
+	 * @return string
+	 */
+	public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
+	{
+		$out = '';
+		// First generate the headings from the table column names
+		foreach ($query->getFieldNames() as $name)
+		{
+			$out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
+		}
+
+		$out = substr($out, 0, -strlen($delim)) . $newline;
+
+		// Next blast through the result array and build out the rows
+		while ($row = $query->getUnbufferedRow('array'))
+		{
+			$line = [];
+			foreach ($row as $item)
+			{
+				$line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
+			}
+			$out .= implode($delim, $line) . $newline;
+		}
+
+		return $out;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Generate XML data from a query result object
+	 *
+	 * @param ResultInterface $query  Query result object
+	 * @param array           $params Any preferences
+	 *
+	 * @return string
+	 */
+	public function getXMLFromResult(ResultInterface $query, array $params = []): string
+	{
+		// Set our default values
+		foreach (['root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t"] as $key => $val)
+		{
+			if (! isset($params[$key]))
+			{
+				$params[$key] = $val;
+			}
+		}
+
+		// Create variables for convenience
+		$root    = $params['root'];
+		$newline = $params['newline'];
+		$tab     = $params['tab'];
+		$element = $params['element'];
+
+		// Load the xml helper
+		helper('xml');
+		// Generate the result
+		$xml = '<' . $root . '>' . $newline;
+		while ($row = $query->getUnbufferedRow())
+		{
+			$xml .= $tab . '<' . $element . '>' . $newline;
+
+			foreach ($row as $key => $val)
+			{
+				$val = (! empty($val)) ? xml_convert($val) : '';
+
+				$xml .= $tab . $tab . '<' . $key . '>' . $val . '</' . $key . '>' . $newline;
+			}
+
+			$xml .= $tab . '</' . $element . '>' . $newline;
+		}
+
+		return $xml . '</' . $root . '>' . $newline;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Database Backup
+	 *
+	 * @param  array|string $params
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function backup($params = [])
+	{
+		// If the parameters have not been submitted as an
+		// array then we know that it is simply the table
+		// name, which is a valid short cut.
+		if (is_string($params))
+		{
+			$params = ['tables' => $params];
+		}
+
+		// Set up our default preferences
+		$prefs = [
+			'tables'             => [],
+			'ignore'             => [],
+			'filename'           => '',
+			'format'             => 'gzip', // gzip, txt
+			'add_drop'           => true,
+			'add_insert'         => true,
+			'newline'            => "\n",
+			'foreign_key_checks' => true,
+		];
+
+		// Did the user submit any preferences? If so set them....
+		if (! empty($params))
+		{
+			foreach (array_keys($prefs) as $key)
+			{
+				if (isset($params[$key]))
+				{
+					$prefs[$key] = $params[$key];
+				}
+			}
+		}
+
+		// Are we backing up a complete database or individual tables?
+		// If no table names were submitted we'll fetch the entire table list
+		if (empty($prefs['tables']))
+		{
+			$prefs['tables'] = $this->db->listTables();
+		}
+
+		// Validate the format
+		if (! in_array($prefs['format'], ['gzip', 'txt'], true))
+		{
+			$prefs['format'] = 'txt';
+		}
+
+		// Is the encoder supported? If not, we'll either issue an
+		// error or use plain text depending on the debug settings
+		if ($prefs['format'] === 'gzip' && ! function_exists('gzencode'))
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('The file compression format you chose is not supported by your server.');
+			}
+
+			$prefs['format'] = 'txt';
+		}
+
+		if ($prefs['format'] === 'txt') // Was a text file requested?
+		{
+			return $this->_backup($prefs);
+		}
+
+		return gzencode($this->_backup($prefs));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent version of the backup function.
+	 *
+	 * @param array|null $prefs
+	 *
+	 * @return mixed
+	 */
+	abstract public function _backup(array $prefs = null);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/Config.php b/system/Database/Config.php
new file mode 100644
index 0000000..b84067d
--- /dev/null
+++ b/system/Database/Config.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Config\BaseConfig;
+use InvalidArgumentException;
+
+/**
+ * Class Config
+ */
+class Config extends BaseConfig
+{
+	/**
+	 * Cache for instance of any connections that
+	 * have been requested as a "shared" instance.
+	 *
+	 * @var array
+	 */
+	static protected $instances = [];
+
+	/**
+	 * The main instance used to manage all of
+	 * our open database connections.
+	 *
+	 * @var Database|null
+	 */
+	static protected $factory;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Creates the default
+	 *
+	 * @param string|array $group     The name of the connection group to use,
+	 *                                or an array of configuration settings.
+	 * @param boolean      $getShared Whether to return a shared instance of the connection.
+	 *
+	 * @return BaseConnection
+	 */
+	public static function connect($group = null, bool $getShared = true)
+	{
+		// If a DB connection is passed in, just pass it back
+		if ($group instanceof BaseConnection)
+		{
+			return $group;
+		}
+
+		if (is_array($group))
+		{
+			$config = $group;
+			$group  = 'custom-' . md5(json_encode($config));
+		}
+
+		$config = $config ?? config('Database');
+
+		if (empty($group))
+		{
+			$group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
+		}
+
+		if (is_string($group) && ! isset($config->$group) && strpos($group, 'custom-') !== 0)
+		{
+			throw new InvalidArgumentException($group . ' is not a valid database connection group.');
+		}
+
+		if ($getShared && isset(static::$instances[$group]))
+		{
+			return static::$instances[$group];
+		}
+
+		static::ensureFactory();
+
+		if (isset($config->$group))
+		{
+			$config = $config->$group;
+		}
+
+		$connection = static::$factory->load($config, $group);
+
+		static::$instances[$group] = &$connection;
+
+		return $connection;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of all db connections currently made.
+	 *
+	 * @return array
+	 */
+	public static function getConnections(): array
+	{
+		return static::$instances;
+	}
+
+	/**
+	 * Loads and returns an instance of the Forge for the specified
+	 * database group, and loads the group if it hasn't been loaded yet.
+	 *
+	 * @param ConnectionInterface|string|array|null $group
+	 *
+	 * @return Forge
+	 */
+	public static function forge($group = null)
+	{
+		$db = static::connect($group);
+
+		return static::$factory->loadForge($db);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns a new instance of the Database Utilities class.
+	 *
+	 * @param string|array|null $group
+	 *
+	 * @return BaseUtils
+	 */
+	public static function utils($group = null)
+	{
+		$db = static::connect($group);
+
+		return static::$factory->loadUtils($db);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns a new instance of the Database Seeder.
+	 *
+	 * @param string|null $group
+	 *
+	 * @return Seeder
+	 */
+	public static function seeder(string $group = null)
+	{
+		$config = config('Database');
+
+		return new Seeder($config, static::connect($group));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures the database Connection Manager/Factory is loaded and ready to use.
+	 */
+	protected static function ensureFactory()
+	{
+		if (static::$factory instanceof Database)
+		{
+			return;
+		}
+
+		static::$factory = new Database();
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
new file mode 100644
index 0000000..43806ad
--- /dev/null
+++ b/system/Database/ConnectionInterface.php
@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+/**
+ * Interface ConnectionInterface
+ */
+interface ConnectionInterface
+{
+	/**
+	 * Initializes the database connection/settings.
+	 *
+	 * @return mixed
+	 */
+	public function initialize();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param  boolean $persistent
+	 * @return mixed
+	 */
+	public function connect(bool $persistent = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create a persistent database connection.
+	 *
+	 * @return mixed
+	 */
+	public function persistentConnect();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return mixed
+	 */
+	public function reconnect();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the actual connection object. If both a 'read' and 'write'
+	 * connection has been specified, you can pass either term in to
+	 * get that connection. If you pass either alias in and only a single
+	 * connection is present, it must return the sole connection.
+	 *
+	 * @param string|null $alias
+	 *
+	 * @return mixed
+	 */
+	public function getConnection(string $alias = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return mixed
+	 */
+	public function setDatabase(string $databaseName);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the current database being used.
+	 *
+	 * @return string
+	 */
+	public function getDatabase(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error encountered by this connection.
+	 * Must return this format: ['code' => string|int, 'message' => string]
+	 * intval(code) === 0 means "no error".
+	 *
+	 * @return array<string,string|int>
+	 */
+	public function error(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The name of the platform in use (MySQLi, mssql, etc)
+	 *
+	 * @return string
+	 */
+	public function getPlatform(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Orchestrates a query against the database. Queries must use
+	 * Database\Statement objects to store the query and build it.
+	 * This method works with the cache.
+	 *
+	 * Should automatically handle different connections for read/write
+	 * queries if needed.
+	 *
+	 * @param string $sql
+	 * @param mixed  ...$binds
+	 *
+	 * @return BaseResult|Query|boolean
+	 */
+	public function query(string $sql, $binds = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs a basic query against the database. No binding or caching
+	 * is performed, nor are transactions handled. Simply takes a raw
+	 * query string and returns the database-specific result id.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	public function simpleQuery(string $sql);
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns an instance of the query builder for this connection.
+	 *
+	 * @param string|array $tableName Table name.
+	 *
+	 * @return BaseBuilder Builder.
+	 */
+	public function table($tableName);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last query's statement object.
+	 *
+	 * @return mixed
+	 */
+	public function getLastQuery();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * "Smart" Escaping
+	 *
+	 * Escapes data based on type.
+	 * Sets boolean and null types.
+	 *
+	 * @param mixed $str
+	 *
+	 * @return mixed
+	 */
+	public function escape($str);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows for custom calls to the database engine that are not
+	 * supported through our database layer.
+	 *
+	 * @param string $functionName
+	 * @param array  ...$params
+	 *
+	 * @return mixed
+	 */
+	public function callFunction(string $functionName, ...$params);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the statement is a write-type query or not.
+	 *
+	 * @param  string $sql
+	 * @return boolean
+	 */
+	public function isWriteType($sql): bool;
+}
diff --git a/system/Database/Database.php b/system/Database/Database.php
new file mode 100644
index 0000000..e173907
--- /dev/null
+++ b/system/Database/Database.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use InvalidArgumentException;
+
+/**
+ * Database Connection Factory
+ *
+ * Creates and returns an instance of the appropriate DatabaseConnection
+ */
+class Database
+{
+	/**
+	 * Maintains an array of the instances of all connections that have
+	 * been created.
+	 *
+	 * Helps to keep track of all open connections for performance
+	 * monitoring, logging, etc.
+	 *
+	 * @var array
+	 */
+	protected $connections = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the connection binds and returns an instance of the driver
+	 * ready to go.
+	 *
+	 * @param array  $params
+	 * @param string $alias
+	 *
+	 * @return mixed
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @internal param bool $useBuilder
+	 */
+	public function load(array $params = [], string $alias = '')
+	{
+		if ($alias === '')
+		{
+			throw new InvalidArgumentException('You must supply the parameter: alias.');
+		}
+
+		// Handle universal DSN connection string
+		if (! empty($params['DSN']) && strpos($params['DSN'], '://') !== false)
+		{
+			$params = $this->parseDSN($params);
+		}
+
+		// No DB specified? Beat them senseless...
+		if (empty($params['DBDriver']))
+		{
+			throw new InvalidArgumentException('You have not selected a database type to connect to.');
+		}
+
+		// Store the connection
+		$this->connections[$alias] = $this->initDriver($params['DBDriver'], 'Connection', $params);
+
+		return $this->connections[$alias];
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Creates a Forge instance for the current database type.
+	 *
+	 * @param ConnectionInterface $db
+	 *
+	 * @return object
+	 */
+	public function loadForge(ConnectionInterface $db): object
+	{
+		// Initialize database connection if not exists.
+		if (! $db->connID)
+		{
+			$db->initialize();
+		}
+
+		return $this->initDriver($db->DBDriver, 'Forge', $db);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Creates a Utils instance for the current database type.
+	 *
+	 * @param ConnectionInterface $db
+	 *
+	 * @return object
+	 */
+	public function loadUtils(ConnectionInterface $db): object
+	{
+		// Initialize database connection if not exists.
+		if (! $db->connID)
+		{
+			$db->initialize();
+		}
+
+		return $this->initDriver($db->DBDriver, 'Utils', $db);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse universal DSN string
+	 *
+	 * @param array $params
+	 *
+	 * @return array
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	protected function parseDSN(array $params): array
+	{
+		$dsn = parse_url($params['DSN']);
+
+		if (! $dsn)
+		{
+			throw new InvalidArgumentException('Your DSN connection string is invalid.');
+		}
+
+		$dsnParams = [
+			'DSN'      => '',
+			'DBDriver' => $dsn['scheme'],
+			'hostname' => isset($dsn['host']) ? rawurldecode($dsn['host']) : '',
+			'port'     => isset($dsn['port']) ? rawurldecode((string) $dsn['port']) : '',
+			'username' => isset($dsn['user']) ? rawurldecode($dsn['user']) : '',
+			'password' => isset($dsn['pass']) ? rawurldecode($dsn['pass']) : '',
+			'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : '',
+		];
+
+		// Do we have additional config items set?
+		if (! empty($dsn['query']))
+		{
+			parse_str($dsn['query'], $extra);
+
+			foreach ($extra as $key => $val)
+			{
+				if (is_string($val) && in_array(strtolower($val), ['true', 'false', 'null'], true))
+				{
+					$val = $val === 'null' ? null : filter_var($val, FILTER_VALIDATE_BOOLEAN);
+				}
+
+				$dsnParams[$key] = $val;
+			}
+		}
+
+		return array_merge($params, $dsnParams);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initialize database driver.
+	 *
+	 * @param string       $driver   Database driver name (e.g. 'MySQLi')
+	 * @param string       $class    Database class name (e.g. 'Forge')
+	 * @param array|object $argument
+	 *
+	 * @return object
+	 */
+	protected function initDriver(string $driver, string $class, $argument): object
+	{
+		$class = $driver . '\\' . $class;
+
+		if (strpos($driver, '\\') === false)
+		{
+			$class = "CodeIgniter\Database\\{$class}";
+		}
+
+		return new $class($argument);
+	}
+}
diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php
new file mode 100644
index 0000000..ff0f212
--- /dev/null
+++ b/system/Database/Exceptions/DataException.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use RuntimeException;
+
+class DataException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Used by the Model's trigger() method when the callback cannot be found.
+	 *
+	 * @param string $method
+	 *
+	 * @return DataException
+	 */
+	public static function forInvalidMethodTriggered(string $method)
+	{
+		return new static(lang('Database.invalidEvent', [$method]));
+	}
+
+	/**
+	 * Used by Model's insert/update methods when there isn't
+	 * any data to actually work with.
+	 *
+	 * @param string $mode
+	 *
+	 * @return DataException
+	 */
+	public static function forEmptyDataset(string $mode)
+	{
+		return new static(lang('Database.emptyDataset', [$mode]));
+	}
+
+	/**
+	 * Used by Model's insert/update methods when there is no
+	 * primary key defined and Model has option `useAutoIncrement`
+	 * set to false.
+	 *
+	 * @param string $mode
+	 *
+	 * @return DataException
+	 */
+	public static function forEmptyPrimaryKey(string $mode)
+	{
+		return new static(lang('Database.emptyPrimaryKey', [$mode]));
+	}
+
+	/**
+	 * Thrown when an argument for one of the Model's methods
+	 * were empty or otherwise invalid, and they could not be
+	 * to work correctly for that method.
+	 *
+	 * @param string $argument
+	 *
+	 * @return DataException
+	 */
+	public static function forInvalidArgument(string $argument)
+	{
+		return new static(lang('Database.invalidArgument', [$argument]));
+	}
+
+	public static function forInvalidAllowedFields(string $model)
+	{
+		return new static(lang('Database.invalidAllowedFields', [$model]));
+	}
+
+	public static function forTableNotFound(string $table)
+	{
+		return new static(lang('Database.tableNotFound', [$table]));
+	}
+
+	public static function forEmptyInputGiven(string $argument)
+	{
+		return new static(lang('Database.forEmptyInputGiven', [$argument]));
+	}
+
+	public static function forFindColumnHaveMultipleColumns()
+	{
+		return new static(lang('Database.forFindColumnHaveMultipleColumns'));
+	}
+}
diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php
new file mode 100644
index 0000000..8717f3b
--- /dev/null
+++ b/system/Database/Exceptions/DatabaseException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Exceptions;
+
+use Error;
+
+class DatabaseException extends Error implements ExceptionInterface
+{
+	/**
+	 * Exit status code
+	 *
+	 * @var integer
+	 */
+	protected $code = 8;
+}
diff --git a/system/Database/Exceptions/ExceptionInterface.php b/system/Database/Exceptions/ExceptionInterface.php
new file mode 100644
index 0000000..3820c55
--- /dev/null
+++ b/system/Database/Exceptions/ExceptionInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Exceptions;
+
+/**
+ * Provides a domain-level interface for broad capture
+ * of all database-related exceptions.
+ *
+ * catch (\CodeIgniter\Database\Exceptions\ExceptionInterface) { ... }
+ */
+interface ExceptionInterface extends \CodeIgniter\Exceptions\ExceptionInterface
+{
+}
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
new file mode 100644
index 0000000..f2e2ee5
--- /dev/null
+++ b/system/Database/Forge.php
@@ -0,0 +1,1331 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use InvalidArgumentException;
+use RuntimeException;
+use Throwable;
+
+/**
+ * The Forge class transforms migrations to executable
+ * SQL statements.
+ */
+class Forge
+{
+	/**
+	 * The active database connection.
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * List of fields.
+	 *
+	 * @var array
+	 */
+	protected $fields = [];
+
+	/**
+	 * List of keys.
+	 *
+	 * @var array
+	 */
+	protected $keys = [];
+
+	/**
+	 * List of unique keys.
+	 *
+	 * @var array
+	 */
+	protected $uniqueKeys = [];
+
+	/**
+	 * List of primary keys.
+	 *
+	 * @var array
+	 */
+	protected $primaryKeys = [];
+
+	/**
+	 * List of foreign keys.
+	 *
+	 * @var array
+	 */
+	protected $foreignKeys = [];
+
+	/**
+	 * Character set used.
+	 *
+	 * @var string
+	 */
+	protected $charset = '';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CREATE DATABASE statement
+	 *
+	 * @var string|false
+	 */
+	protected $createDatabaseStr = 'CREATE DATABASE %s';
+
+	/**
+	 * CREATE DATABASE IF statement
+	 *
+	 * @var string
+	 */
+	protected $createDatabaseIfStr;
+
+	/**
+	 * CHECK DATABASE EXIST statement
+	 *
+	 * @var string
+	 */
+	protected $checkDatabaseExistStr;
+
+	/**
+	 * DROP DATABASE statement
+	 *
+	 * @var string|false
+	 */
+	protected $dropDatabaseStr = 'DROP DATABASE %s';
+
+	/**
+	 * CREATE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $createTableStr = "%s %s (%s\n)";
+
+	/**
+	 * CREATE TABLE IF statement
+	 *
+	 * @var string|boolean
+	 */
+	protected $createTableIfStr = 'CREATE TABLE IF NOT EXISTS';
+
+	/**
+	 * CREATE TABLE keys flag
+	 *
+	 * Whether table keys are created from within the
+	 * CREATE TABLE statement.
+	 *
+	 * @var boolean
+	 */
+	protected $createTableKeys = false;
+
+	/**
+	 * DROP TABLE IF EXISTS statement
+	 *
+	 * @var string|boolean
+	 */
+	protected $dropTableIfStr = 'DROP TABLE IF EXISTS';
+
+	/**
+	 * RENAME TABLE statement
+	 *
+	 * @var string|false
+	 */
+	protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s;';
+
+	/**
+	 * UNSIGNED support
+	 *
+	 * @var boolean|array
+	 */
+	protected $unsigned = true;
+
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var string
+	 *
+	 * @internal Used for marking nullable fields. Not covered by BC promise.
+	 */
+	protected $null = '';
+
+	/**
+	 * DEFAULT value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var string|false
+	 */
+	protected $default = ' DEFAULT ';
+
+	//--------------------------------------------------------------------
+	/**
+	 * Constructor.
+	 *
+	 * @param BaseConnection $db
+	 */
+	public function __construct(BaseConnection $db)
+	{
+		$this->db = &$db;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Provides access to the forge's current database connection.
+	 *
+	 * @return ConnectionInterface
+	 */
+	public function getConnection()
+	{
+		return $this->db;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create database
+	 *
+	 * @param string  $dbName
+	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function createDatabase(string $dbName, bool $ifNotExists = false): bool
+	{
+		if ($ifNotExists && $this->createDatabaseIfStr === null)
+		{
+			if ($this->databaseExists($dbName))
+			{
+				return true;
+			}
+
+			$ifNotExists = false;
+		}
+
+		if ($this->createDatabaseStr === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false; // @codeCoverageIgnore
+		}
+
+		try
+		{
+			if (! $this->db->query(sprintf($ifNotExists ? $this->createDatabaseIfStr : $this->createDatabaseStr, $dbName, $this->db->charset, $this->db->DBCollat)))
+			{
+				// @codeCoverageIgnoreStart
+				if ($this->db->DBDebug)
+				{
+					throw new DatabaseException('Unable to create the specified database.');
+				}
+
+				return false;
+				// @codeCoverageIgnoreEnd
+			}
+
+			if (! empty($this->db->dataCache['db_names']))
+			{
+				$this->db->dataCache['db_names'][] = $dbName;
+			}
+
+			return true;
+		}
+		catch (Throwable $e)
+		{
+			// @phpstan-ignore-next-line
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unable to create the specified database.', 0, $e);
+			}
+			return false; // @codeCoverageIgnore
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determine if a database exists
+	 *
+	 * @param string $dbName
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	private function databaseExists(string $dbName): bool
+	{
+		if ($this->checkDatabaseExistStr === null)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		return $this->db->query($this->checkDatabaseExistStr, $dbName)->getRow() !== null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Drop database
+	 *
+	 * @param string $dbName
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function dropDatabase(string $dbName): bool
+	{
+		if ($this->dropDatabaseStr === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		if (! $this->db->query(sprintf($this->dropDatabaseStr, $dbName)))
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unable to drop the specified database.');
+			}
+
+			return false;
+		}
+
+		if (! empty($this->db->dataCache['db_names']))
+		{
+			$key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
+			if ($key !== false)
+			{
+				unset($this->db->dataCache['db_names'][$key]);
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add Key
+	 *
+	 * @param string|array $key
+	 * @param boolean      $primary
+	 * @param boolean      $unique
+	 *
+	 * @return Forge
+	 */
+	public function addKey($key, bool $primary = false, bool $unique = false)
+	{
+		if ($primary)
+		{
+			foreach ((array) $key as $one)
+			{
+				$this->primaryKeys[] = $one;
+			}
+		}
+		else
+		{
+			$this->keys[] = $key;
+
+			if ($unique)
+			{
+				$this->uniqueKeys[] = count($this->keys) - 1;
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add Primary Key
+	 *
+	 * @param string|array $key
+	 *
+	 * @return Forge
+	 */
+	public function addPrimaryKey($key)
+	{
+		return $this->addKey($key, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add Unique Key
+	 *
+	 * @param string|array $key
+	 *
+	 * @return Forge
+	 */
+	public function addUniqueKey($key)
+	{
+		return $this->addKey($key, false, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add Field
+	 *
+	 * @param array|string $field
+	 *
+	 * @return Forge
+	 */
+	public function addField($field)
+	{
+		if (is_string($field))
+		{
+			if ($field === 'id')
+			{
+				$this->addField([
+					'id' => [
+						'type'           => 'INT',
+						'constraint'     => 9,
+						'auto_increment' => true,
+					],
+				]);
+				$this->addKey('id', true);
+			}
+			else
+			{
+				if (strpos($field, ' ') === false)
+				{
+					throw new InvalidArgumentException('Field information is required for that operation.');
+				}
+
+				$this->fields[] = $field;
+			}
+		}
+
+		if (is_array($field))
+		{
+			$this->fields = array_merge($this->fields, $field);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add Foreign Key
+	 *
+	 * @param string $fieldName
+	 * @param string $tableName
+	 * @param string $tableField
+	 * @param string $onUpdate
+	 * @param string $onDelete
+	 *
+	 * @return Forge
+	 * @throws DatabaseException
+	 */
+	public function addForeignKey(string $fieldName = '', string $tableName = '', string $tableField = '', string $onUpdate = '', string $onDelete = '')
+	{
+		if (! isset($this->fields[$fieldName]))
+		{
+			throw new DatabaseException(lang('Database.fieldNotExists', [$fieldName]));
+		}
+
+		$this->foreignKeys[$fieldName] = [
+			'table'    => $tableName,
+			'field'    => $tableField,
+			'onDelete' => strtoupper($onDelete),
+			'onUpdate' => strtoupper($onUpdate),
+		];
+
+		return $this;
+	}
+
+	/**
+	 * Foreign Key Drop
+	 *
+	 * @param string $table       Table name
+	 * @param string $foreignName Foreign name
+	 *
+	 * @return boolean|BaseResult|Query|false|mixed
+	 * @throws DatabaseException
+	 */
+	public function dropForeignKey(string $table, string $foreignName)
+	{
+		$sql = sprintf($this->dropConstraintStr, $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
+			$this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName));
+
+		if ($sql === false) // @phpstan-ignore-line
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		return $this->db->query($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create Table
+	 *
+	 * @param string  $table       Table name
+	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
+	 * @param array   $attributes  Associative array of table attributes
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function createTable(string $table, bool $ifNotExists = false, array $attributes = [])
+	{
+		if ($table === '')
+		{
+			throw new InvalidArgumentException('A table name is required for that operation.');
+		}
+
+		$table = $this->db->DBPrefix . $table;
+
+		if ($this->fields === [])
+		{
+			throw new RuntimeException('Field information is required.');
+		}
+
+		$sql = $this->_createTable($table, $ifNotExists, $attributes);
+
+		if (is_bool($sql))
+		{
+			$this->reset();
+			if ($sql === false)
+			{
+				if ($this->db->DBDebug)
+				{
+					throw new DatabaseException('This feature is not available for the database you are using.');
+				}
+
+				return false;
+			}
+		}
+
+		if (($result = $this->db->query($sql)) !== false)
+		{
+			if (isset($this->db->dataCache['table_names']) && ! in_array($table, $this->db->dataCache['table_names'], true))
+			{
+				$this->db->dataCache['table_names'][] = $table;
+			}
+
+			// Most databases don't support creating indexes from within the CREATE TABLE statement
+			if (! empty($this->keys))
+			{
+				for ($i = 0, $sqls = $this->_processIndexes($table), $c = count($sqls); $i < $c; $i++)
+				{
+					$this->db->query($sqls[$i]);
+				}
+			}
+		}
+
+		$this->reset();
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create Table
+	 *
+	 * @param string  $table       Table name
+	 * @param boolean $ifNotExists Whether to add 'IF NOT EXISTS' condition
+	 * @param array   $attributes  Associative array of table attributes
+	 *
+	 * @return mixed
+	 */
+	protected function _createTable(string $table, bool $ifNotExists, array $attributes)
+	{
+		// For any platforms that don't support Create If Not Exists...
+		if ($ifNotExists === true && $this->createTableIfStr === false)
+		{
+			if ($this->db->tableExists($table))
+			{
+				return true;
+			}
+
+			$ifNotExists = false;
+		}
+
+		$sql = ($ifNotExists) ? sprintf($this->createTableIfStr, $this->db->escapeIdentifiers($table))
+			: 'CREATE TABLE';
+
+		$columns = $this->_processFields(true);
+		for ($i = 0, $c = count($columns); $i < $c; $i++)
+		{
+			$columns[$i] = ($columns[$i]['_literal'] !== false) ? "\n\t" . $columns[$i]['_literal']
+				: "\n\t" . $this->_processColumn($columns[$i]);
+		}
+
+		$columns = implode(',', $columns);
+
+		$columns .= $this->_processPrimaryKeys($table);
+		$columns .= $this->_processForeignKeys($table);
+
+		// Are indexes created from within the CREATE TABLE statement? (e.g. in MySQL)
+		if ($this->createTableKeys === true)
+		{
+			$indexes = $this->_processIndexes($table);
+			if (is_string($indexes))
+			{
+				$columns .= $indexes;
+			}
+		}
+
+		// createTableStr will usually have the following format: "%s %s (%s\n)"
+		$sql = sprintf($this->createTableStr . '%s', $sql, $this->db->escapeIdentifiers($table), $columns,
+			$this->_createTableAttributes($attributes));
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CREATE TABLE attributes
+	 *
+	 * @param array $attributes Associative array of table attributes
+	 *
+	 * @return string
+	 */
+	protected function _createTableAttributes(array $attributes): string
+	{
+		$sql = '';
+
+		foreach (array_keys($attributes) as $key)
+		{
+			if (is_string($key))
+			{
+				$sql .= ' ' . strtoupper($key) . ' ' . $this->db->escape($attributes[$key]);
+			}
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Drop Table
+	 *
+	 * @param string  $tableName Table name
+	 * @param boolean $ifExists  Whether to add an IF EXISTS condition
+	 * @param boolean $cascade   Whether to add an CASCADE condition
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function dropTable(string $tableName, bool $ifExists = false, bool $cascade = false)
+	{
+		if ($tableName === '')
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('A table name is required for that operation.');
+			}
+
+			return false;
+		}
+
+		// If the prefix is already starting the table name, remove it...
+		if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0)
+		{
+			$tableName = substr($tableName, strlen($this->db->DBPrefix));
+		}
+
+		if (($query = $this->_dropTable($this->db->DBPrefix . $tableName, $ifExists, $cascade)) === true)
+		{
+			return true;
+		}
+
+		$this->db->disableForeignKeyChecks();
+
+		$query = $this->db->query($query);
+
+		$this->db->enableForeignKeyChecks();
+
+		// Update table list cache
+		if ($query && ! empty($this->db->dataCache['table_names']))
+		{
+			$key = array_search(strtolower($this->db->DBPrefix . $tableName),
+				array_map('strtolower', $this->db->dataCache['table_names']), true);
+			if ($key !== false)
+			{
+				unset($this->db->dataCache['table_names'][$key]);
+			}
+		}
+
+		return $query;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Drop Table
+	 *
+	 * Generates a platform-specific DROP TABLE string
+	 *
+	 * @param string  $table    Table name
+	 * @param boolean $ifExists Whether to add an IF EXISTS condition
+	 * @param boolean $cascade  Whether to add an CASCADE condition
+	 *
+	 * @return string|boolean
+	 */
+	protected function _dropTable(string $table, bool $ifExists, bool $cascade)
+	{
+		$sql = 'DROP TABLE';
+
+		if ($ifExists)
+		{
+			if ($this->dropTableIfStr === false)
+			{
+				if (! $this->db->tableExists($table))
+				{
+					return true;
+				}
+			}
+			else
+			{
+				$sql = sprintf($this->dropTableIfStr, $this->db->escapeIdentifiers($table));
+			}
+		}
+
+		return $sql . ' ' . $this->db->escapeIdentifiers($table);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rename Table
+	 *
+	 * @param string $tableName    Old table name
+	 * @param string $newTableName New table name
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function renameTable(string $tableName, string $newTableName)
+	{
+		if ($tableName === '' || $newTableName === '')
+		{
+			throw new InvalidArgumentException('A table name is required for that operation.');
+		}
+
+		if ($this->renameTableStr === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		$result = $this->db->query(sprintf($this->renameTableStr,
+				$this->db->escapeIdentifiers($this->db->DBPrefix . $tableName),
+				$this->db->escapeIdentifiers($this->db->DBPrefix . $newTableName))
+		);
+
+		if ($result && ! empty($this->db->dataCache['table_names']))
+		{
+			$key = array_search(strtolower($this->db->DBPrefix . $tableName),
+				array_map('strtolower', $this->db->dataCache['table_names']), true);
+			if ($key !== false)
+			{
+				$this->db->dataCache['table_names'][$key] = $this->db->DBPrefix . $newTableName;
+			}
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Column Add
+	 *
+	 * @param string       $table Table name
+	 * @param string|array $field Column definition
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function addColumn(string $table, $field): bool
+	{
+		// Work-around for literal column definitions
+		if (! is_array($field))
+		{
+			$field = [$field];
+		}
+
+		foreach (array_keys($field) as $k)
+		{
+			$this->addField([$k => $field[$k]]);
+		}
+
+		$sqls = $this->_alterTable('ADD', $this->db->DBPrefix . $table, $this->_processFields());
+		$this->reset();
+		if ($sqls === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		foreach ($sqls as $sql)
+		{
+			if ($this->db->query($sql) === false)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Column Drop
+	 *
+	 * @param string       $table      Table name
+	 * @param string|array $columnName Column name Array or comma separated
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function dropColumn(string $table, $columnName)
+	{
+		$sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $columnName);
+		if ($sql === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		return $this->db->query($sql);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Column Modify
+	 *
+	 * @param string       $table Table name
+	 * @param string|array $field Column definition
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function modifyColumn(string $table, $field): bool
+	{
+		// Work-around for literal column definitions
+		if (! is_array($field))
+		{
+			$field = [$field];
+		}
+
+		foreach (array_keys($field) as $k)
+		{
+			$this->addField([$k => $field[$k]]);
+		}
+
+		if ($this->fields === [])
+		{
+			throw new RuntimeException('Field information is required');
+		}
+
+		$sqls = $this->_alterTable('CHANGE', $this->db->DBPrefix . $table, $this->_processFields());
+		$this->reset();
+		if ($sqls === false)
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('This feature is not available for the database you are using.');
+			}
+
+			return false;
+		}
+
+		if ($sqls !== null)
+		{
+			foreach ($sqls as $sql)
+			{
+				if ($this->db->query($sql) === false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ALTER TABLE
+	 *
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $fields    Column definition
+	 *
+	 * @return string|string[]|false
+	 */
+	protected function _alterTable(string $alterType, string $table, $fields)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) . ' ';
+
+		// DROP has everything it needs now.
+		if ($alterType === 'DROP')
+		{
+			if (is_string($fields))
+			{
+				$fields = explode(',', $fields);
+			}
+
+			$fields = array_map(function ($field) {
+				return 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field));
+			}, $fields);
+
+			return $sql . implode(', ', $fields);
+		}
+
+		$sql .= ($alterType === 'ADD') ? 'ADD ' : $alterType . ' COLUMN ';
+
+		$sqls = [];
+		foreach ($fields as $data)
+		{
+			$sqls[] = $sql
+					  . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
+		}
+
+		return $sqls;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process fields
+	 *
+	 * @param boolean $createTable
+	 *
+	 * @return array
+	 */
+	protected function _processFields(bool $createTable = false): array
+	{
+		$fields = [];
+
+		foreach ($this->fields as $key => $attributes)
+		{
+			if (is_int($key) && ! is_array($attributes))
+			{
+				$fields[] = ['_literal' => $attributes];
+				continue;
+			}
+
+			$attributes = array_change_key_case($attributes, CASE_UPPER);
+
+			if ($createTable === true && empty($attributes['TYPE']))
+			{
+				continue;
+			}
+
+			// @phpstan-ignore-next-line
+			isset($attributes['TYPE']) && $this->_attributeType($attributes);
+
+			$field = [
+				'name'           => $key,
+				'new_name'       => $attributes['NAME'] ?? null,
+				'type'           => $attributes['TYPE'] ?? null,
+				'length'         => '',
+				'unsigned'       => '',
+				'null'           => '',
+				'unique'         => '',
+				'default'        => '',
+				'auto_increment' => '',
+				'_literal'       => false,
+			];
+
+			// @phpstan-ignore-next-line
+			isset($attributes['TYPE']) && $this->_attributeUnsigned($attributes, $field);
+
+			if ($createTable === false)
+			{
+				if (isset($attributes['AFTER']))
+				{
+					$field['after'] = $attributes['AFTER'];
+				}
+				elseif (isset($attributes['FIRST']))
+				{
+					$field['first'] = (bool) $attributes['FIRST'];
+				}
+			}
+
+			$this->_attributeDefault($attributes, $field);
+
+			if (isset($attributes['NULL']))
+			{
+				if ($attributes['NULL'] === true)
+				{
+					$field['null'] = empty($this->null) ? '' : ' ' . $this->null;
+				}
+				else
+				{
+					$field['null'] = ' NOT NULL';
+				}
+			}
+			elseif ($createTable === true)
+			{
+				$field['null'] = ' NOT NULL';
+			}
+
+			$this->_attributeAutoIncrement($attributes, $field);
+			$this->_attributeUnique($attributes, $field);
+
+			if (isset($attributes['COMMENT']))
+			{
+				$field['comment'] = $this->db->escape($attributes['COMMENT']);
+			}
+
+			if (isset($attributes['TYPE']) && ! empty($attributes['CONSTRAINT']))
+			{
+				if (is_array($attributes['CONSTRAINT']))
+				{
+					$attributes['CONSTRAINT'] = $this->db->escape($attributes['CONSTRAINT']);
+					$attributes['CONSTRAINT'] = implode(',', $attributes['CONSTRAINT']);
+				}
+
+				$field['length'] = '(' . $attributes['CONSTRAINT'] . ')';
+			}
+
+			$fields[] = $field;
+		}
+
+		return $fields;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process column
+	 *
+	 * @param array $field
+	 *
+	 * @return string
+	 */
+	protected function _processColumn(array $field): string
+	{
+		return $this->db->escapeIdentifiers($field['name'])
+			   . ' ' . $field['type'] . $field['length']
+			   . $field['unsigned']
+			   . $field['default']
+			   . $field['null']
+			   . $field['auto_increment']
+			   . $field['unique'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute TYPE
+	 *
+	 * Performs a data type mapping between different databases.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	protected function _attributeType(array &$attributes)
+	{
+		// Usually overridden by drivers
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute UNSIGNED
+	 *
+	 * Depending on the unsigned property value:
+	 *
+	 *    - TRUE will always set $field['unsigned'] to 'UNSIGNED'
+	 *    - FALSE will always set $field['unsigned'] to ''
+	 *    - array(TYPE) will set $field['unsigned'] to 'UNSIGNED',
+	 *        if $attributes['TYPE'] is found in the array
+	 *    - array(TYPE => UTYPE) will change $field['type'],
+	 *        from TYPE to UTYPE in case of a match
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return null|void
+	 */
+	protected function _attributeUnsigned(array &$attributes, array &$field)
+	{
+		if (empty($attributes['UNSIGNED']) || $attributes['UNSIGNED'] !== true)
+		{
+			return;
+		}
+
+		// Reset the attribute in order to avoid issues if we do type conversion
+		$attributes['UNSIGNED'] = false;
+
+		if (is_array($this->unsigned))
+		{
+			foreach (array_keys($this->unsigned) as $key)
+			{
+				if (is_int($key) && strcasecmp($attributes['TYPE'], $this->unsigned[$key]) === 0)
+				{
+					$field['unsigned'] = ' UNSIGNED';
+
+					return;
+				}
+
+				if (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
+				{
+					$field['type'] = $key;
+
+					return;
+				}
+			}
+
+			return;
+		}
+
+		$field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute DEFAULT
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return null|void
+	 */
+	protected function _attributeDefault(array &$attributes, array &$field)
+	{
+		if ($this->default === false)
+		{
+			return;
+		}
+
+		if (array_key_exists('DEFAULT', $attributes))
+		{
+			if ($attributes['DEFAULT'] === null)
+			{
+				$field['default'] = empty($this->null) ? '' : $this->default . $this->null;
+
+				// Override the NULL attribute if that's our default
+				$attributes['NULL'] = true;
+				$field['null']      = empty($this->null) ? '' : ' ' . $this->null;
+			}
+			else
+			{
+				$field['default'] = $this->default . $this->db->escape($attributes['DEFAULT']);
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute UNIQUE
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	protected function _attributeUnique(array &$attributes, array &$field)
+	{
+		if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true)
+		{
+			$field['unique'] = ' UNIQUE';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute AUTO_INCREMENT
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	protected function _attributeAutoIncrement(array &$attributes, array &$field)
+	{
+		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
+			&& stripos($field['type'], 'int') !== false
+		)
+		{
+			$field['auto_increment'] = ' AUTO_INCREMENT';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process primary keys
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return string
+	 */
+	protected function _processPrimaryKeys(string $table): string
+	{
+		$sql = '';
+
+		for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++)
+		{
+			if (! isset($this->fields[$this->primaryKeys[$i]]))
+			{
+				unset($this->primaryKeys[$i]);
+			}
+		}
+
+		if ($this->primaryKeys !== [])
+		{
+			$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
+					. ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process indexes
+	 *
+	 * @param string $table
+	 *
+	 * @return array|string
+	 */
+	protected function _processIndexes(string $table)
+	{
+		$sqls = [];
+
+		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
+		{
+			$this->keys[$i] = (array) $this->keys[$i];
+
+			for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++)
+			{
+				if (! isset($this->fields[$this->keys[$i][$i2]]))
+				{
+					unset($this->keys[$i][$i2]);
+				}
+			}
+			if (count($this->keys[$i]) <= 0)
+			{
+				continue;
+			}
+
+			if (in_array($i, $this->uniqueKeys, true))
+			{
+				$sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table)
+						  . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+						  . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+				continue;
+			}
+
+			$sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+					  . ' ON ' . $this->db->escapeIdentifiers($table)
+					  . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+		}
+
+		return $sqls;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process foreign keys
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return string
+	 */
+	protected function _processForeignKeys(string $table): string
+	{
+		$sql = '';
+
+		$allowActions = [
+			'CASCADE',
+			'SET NULL',
+			'NO ACTION',
+			'RESTRICT',
+			'SET DEFAULT',
+		];
+
+		if ($this->foreignKeys !== [])
+		{
+			foreach ($this->foreignKeys as $field => $fkey)
+			{
+				$nameIndex = $table . '_' . $field . '_foreign';
+
+				$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
+					. ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+
+				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true))
+				{
+					$sql .= ' ON DELETE ' . $fkey['onDelete'];
+				}
+
+				if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true))
+				{
+					$sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+				}
+			}
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reset
+	 *
+	 * Resets table creation vars
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->fields = $this->keys = $this->uniqueKeys = $this->primaryKeys = $this->foreignKeys = [];
+	}
+}
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
new file mode 100644
index 0000000..670c278
--- /dev/null
+++ b/system/Database/Migration.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use Config\Database;
+
+/**
+ * Class Migration
+ */
+abstract class Migration
+{
+	/**
+	 * The name of the database group to use.
+	 *
+	 * @var string
+	 */
+	protected $DBGroup;
+
+	/**
+	 * Database Connection instance
+	 *
+	 * @var ConnectionInterface
+	 */
+	protected $db;
+
+	/**
+	 * Database Forge instance.
+	 *
+	 * @var Forge
+	 */
+	protected $forge;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Constructor.
+	 *
+	 * @param Forge $forge
+	 */
+	public function __construct(Forge $forge = null)
+	{
+		$this->forge = ! is_null($forge) ? $forge : Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
+
+		$this->db = $this->forge->getConnection();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the database group name this migration uses.
+	 *
+	 * @return string
+	 */
+	public function getDBGroup(): ?string
+	{
+		return $this->DBGroup;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Perform a migration step.
+	 */
+	abstract public function up();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Revert a migration step.
+	 */
+	abstract public function down();
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
new file mode 100644
index 0000000..861fd72
--- /dev/null
+++ b/system/Database/MigrationRunner.php
@@ -0,0 +1,1070 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\ConfigException;
+use Config\Database;
+use Config\Migrations as MigrationsConfig;
+use Config\Services;
+use RuntimeException;
+use stdClass;
+
+/**
+ * Class MigrationRunner
+ */
+class MigrationRunner
+{
+	/**
+	 * Whether or not migrations are allowed to run.
+	 *
+	 * @var boolean
+	 */
+	protected $enabled = false;
+
+	/**
+	 * Name of table to store meta information
+	 *
+	 * @var string
+	 */
+	protected $table;
+
+	/**
+	 * The Namespace  where migrations can be found.
+	 *
+	 * @var string|null
+	 */
+	protected $namespace;
+
+	/**
+	 * The database Group to migrate.
+	 *
+	 * @var string
+	 */
+	protected $group;
+
+	/**
+	 * The migration name.
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * The pattern used to locate migration file versions.
+	 *
+	 * @var string
+	 */
+	protected $regex = '/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}_(\w+)$/';
+
+	/**
+	 * The main database connection. Used to store
+	 * migration information in.
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * If true, will continue instead of throwing
+	 * exceptions.
+	 *
+	 * @var boolean
+	 */
+	protected $silent = false;
+
+	/**
+	 * used to return messages for CLI.
+	 *
+	 * @var array
+	 */
+	protected $cliMessages = [];
+
+	/**
+	 * Tracks whether we have already ensured
+	 * the table exists or not.
+	 *
+	 * @var boolean
+	 */
+	protected $tableChecked = false;
+
+	/**
+	 * The full path to locate migration files.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * The database Group filter.
+	 *
+	 * @var string|null
+	 */
+	protected $groupFilter;
+
+	/**
+	 * Used to skip current migration.
+	 *
+	 * @var boolean
+	 */
+	protected $groupSkip = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * When passing in $db, you may pass any of the following to connect:
+	 * - group name
+	 * - existing connection instance
+	 * - array of database configuration values
+	 *
+	 * @param MigrationsConfig                      $config
+	 * @param ConnectionInterface|array|string|null $db
+	 *
+	 * @throws ConfigException
+	 */
+	public function __construct(MigrationsConfig $config, $db = null)
+	{
+		$this->enabled = $config->enabled ?? false;
+		$this->table   = $config->table ?? 'migrations';
+
+		// Default name space is the app namespace
+		$this->namespace = APP_NAMESPACE;
+
+		// get default database group
+		$config      = config('Database');
+		$this->group = $config->defaultGroup;
+		unset($config);
+
+		// If no db connection passed in, use
+		// default database group.
+		$this->db = db_connect($db);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Locate and run all new migrations
+	 *
+	 * @param string|null $group
+	 *
+	 * @throws ConfigException
+	 * @throws RuntimeException
+	 *
+	 * @return boolean
+	 */
+	public function latest(string $group = null)
+	{
+		if (! $this->enabled)
+		{
+			throw ConfigException::forDisabledMigrations();
+		}
+
+		$this->ensureTable();
+
+		// Set database group if not null
+		if (! is_null($group))
+		{
+			$this->groupFilter = $group;
+			$this->setGroup($group);
+		}
+
+		// Locate the migrations
+		$migrations = $this->findMigrations();
+
+		// If nothing was found then we're done
+		if (empty($migrations))
+		{
+			return true;
+		}
+
+		// Remove any migrations already in the history
+		foreach ($this->getHistory((string) $group) as $history)
+		{
+			unset($migrations[$this->getObjectUid($history)]);
+		}
+
+		// Start a new batch
+		$batch = $this->getLastBatch() + 1;
+
+		// Run each migration
+		foreach ($migrations as $migration)
+		{
+			if ($this->migrate('up', $migration))
+			{
+				if ($this->groupSkip === true)
+				{
+					$this->groupSkip = false;
+					continue;
+				}
+
+				$this->addHistory($migration, $batch);
+			}
+			// If a migration failed then try to back out what was done
+			else
+			{
+				$this->regress(-1);
+
+				$message = lang('Migrations.generalFault');
+
+				if ($this->silent)
+				{
+					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+					return false;
+				}
+
+				throw new RuntimeException($message);
+			}
+		}
+
+		$data           = get_object_vars($this);
+		$data['method'] = 'latest';
+		Events::trigger('migrate', $data);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Migrate down to a previous batch
+	 *
+	 * Calls each migration step required to get to the provided batch
+	 *
+	 * @param integer     $targetBatch Target batch number, or negative for a relative batch, 0 for all
+	 * @param string|null $group
+	 *
+	 * @throws ConfigException
+	 * @throws RuntimeException
+	 *
+	 * @return mixed Current batch number on success, FALSE on failure or no migrations are found
+	 */
+	public function regress(int $targetBatch = 0, string $group = null)
+	{
+		if (! $this->enabled)
+		{
+			throw ConfigException::forDisabledMigrations();
+		}
+
+		// Set database group if not null
+		if (! is_null($group))
+		{
+			$this->setGroup($group);
+		}
+
+		$this->ensureTable();
+
+		// Get all the batches
+		$batches = $this->getBatches();
+
+		// Convert a relative batch to its absolute
+		if ($targetBatch < 0)
+		{
+			$targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
+		}
+
+		// If the goal was rollback then check if it is done
+		if (empty($batches) && $targetBatch === 0)
+		{
+			return true;
+		}
+
+		// Make sure $targetBatch is found
+		if ($targetBatch !== 0 && ! in_array($targetBatch, $batches, true))
+		{
+			$message = lang('Migrations.batchNotFound') . $targetBatch;
+
+			if ($this->silent)
+			{
+				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+				return false;
+			}
+
+			throw new RuntimeException($message);
+		}
+
+		// Save the namespace to restore it after loading migrations
+		$tmpNamespace = $this->namespace;
+
+		// Get all migrations
+		$this->namespace = null;
+		$allMigrations   = $this->findMigrations();
+
+		// Gather migrations down through each batch until reaching the target
+		$migrations = [];
+
+		while ($batch = array_pop($batches))
+		{
+			// Check if reached target
+			if ($batch <= $targetBatch)
+			{
+				break;
+			}
+
+			// Get the migrations from each history
+			foreach ($this->getBatchHistory($batch, 'desc') as $history)
+			{
+				// Create a UID from the history to match its migration
+				$uid = $this->getObjectUid($history);
+
+				// Make sure the migration is still available
+				if (! isset($allMigrations[$uid]))
+				{
+					$message = lang('Migrations.gap') . ' ' . $history->version;
+
+					if ($this->silent)
+					{
+						$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+						return false;
+					}
+
+					throw new RuntimeException($message);
+				}
+
+				// Add the history and put it on the list
+				$migration          = $allMigrations[$uid];
+				$migration->history = $history;
+				$migrations[]       = $migration;
+			}
+		}
+
+		// Run each migration
+		foreach ($migrations as $migration)
+		{
+			if ($this->migrate('down', $migration))
+			{
+				$this->removeHistory($migration->history);
+			}
+			// If a migration failed then quit so as not to ruin the whole batch
+			else
+			{
+				$message = lang('Migrations.generalFault');
+
+				if ($this->silent)
+				{
+					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+					return false;
+				}
+
+				throw new RuntimeException($message);
+			}
+		}
+
+		$data           = get_object_vars($this);
+		$data['method'] = 'regress';
+		Events::trigger('migrate', $data);
+
+		// Restore the namespace
+		$this->namespace = $tmpNamespace;
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Migrate a single file regardless of order or batches.
+	 * Method "up" or "down" determined by presence in history.
+	 * NOTE: This is not recommended and provided mostly for testing.
+	 *
+	 * @param string      $path  Full path to a valid migration file
+	 * @param string      $path  Namespace of the target migration
+	 * @param string|null $group
+	 */
+	public function force(string $path, string $namespace, string $group = null)
+	{
+		if (! $this->enabled)
+		{
+			throw ConfigException::forDisabledMigrations();
+		}
+
+		$this->ensureTable();
+
+		// Set database group if not null
+		if (! is_null($group))
+		{
+			$this->groupFilter = $group;
+			$this->setGroup($group);
+		}
+
+		// Create and validate the migration
+		$migration = $this->migrationFromFile($path, $namespace);
+		if (empty($migration))
+		{
+			$message = lang('Migrations.notFound');
+
+			if ($this->silent)
+			{
+				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+				return false;
+			}
+			throw new RuntimeException($message);
+		}
+
+		// Check the history for a match
+		$method = 'up';
+		$this->setNamespace($migration->namespace);
+		foreach ($this->getHistory($this->group) as $history)
+		{
+			if ($this->getObjectUid($history) === $migration->uid)
+			{
+				$method             = 'down';
+				$migration->history = $history;
+				break;
+			}
+		}
+
+		// up
+		if ($method === 'up')
+		{
+			// Start a new batch
+			$batch = $this->getLastBatch() + 1;
+
+			if ($this->migrate('up', $migration) && $this->groupSkip === false)
+			{
+				$this->addHistory($migration, $batch);
+				return true;
+			}
+
+			$this->groupSkip = false;
+		}
+
+		// down
+		elseif ($this->migrate('down', $migration))
+		{
+			$this->removeHistory($migration->history);
+			return true;
+		}
+
+		// If it came this far the migration failed
+		$message = lang('Migrations.generalFault');
+
+		if ($this->silent)
+		{
+			$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+			return false;
+		}
+		throw new RuntimeException($message);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves list of available migration scripts
+	 *
+	 * @return array    List of all located migrations by their UID
+	 */
+	public function findMigrations(): array
+	{
+		// If a namespace is set then use it, otherwise load all namespaces from the autoloader
+		$namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
+
+		// Collect the migrations to run by their sortable UID
+		$migrations = [];
+		foreach ($namespaces as $namespace)
+		{
+			foreach ($this->findNamespaceMigrations($namespace) as $migration)
+			{
+				$migrations[$migration->uid] = $migration;
+			}
+		}
+
+		// Sort migrations ascending by their UID (version)
+		ksort($migrations);
+
+		return $migrations;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a list of available migration scripts for one namespace
+	 *
+	 * @param string $namespace The namespace to search for migrations
+	 *
+	 * @return array    List of unsorted migrations from the namespace
+	 */
+	public function findNamespaceMigrations(string $namespace): array
+	{
+		$migrations = [];
+		$locator    = Services::locator(true);
+
+		// If $this->path contains a valid directory use it.
+		if (! empty($this->path))
+		{
+			helper('filesystem');
+			$dir   = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
+			$files = get_filenames($dir, true);
+		}
+		// Otherwise use FileLocator to search files in the subdirectory of the namespace
+		else
+		{
+			$files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');
+		}
+
+		// Load all *_*.php files in the migrations path
+		// We can't use glob if we want it to be testable....
+		foreach ($files as $file)
+		{
+			// Clean up the file path
+			$file = empty($this->path) ? $file : $this->path . str_replace($this->path, '', $file);
+
+			// Create the migration object from the file and save it
+			if ($migration = $this->migrationFromFile($file, $namespace))
+			{
+				$migrations[] = $migration;
+			}
+		}
+
+		return $migrations;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create a migration object from a file path.
+	 *
+	 * @param string $path The path to the file
+	 * @param string $path The namespace of the target migration
+	 *
+	 * @return object|false    Returns the migration object, or false on failure
+	 */
+	protected function migrationFromFile(string $path, string $namespace)
+	{
+		if (substr($path, -4) !== '.php')
+		{
+			return false;
+		}
+
+		// Remove the extension
+		$name = basename($path, '.php');
+
+		// Filter out non-migration files
+		if (! preg_match($this->regex, $name))
+		{
+			return false;
+		}
+
+		$locator = Services::locator(true);
+
+		// Create migration object using stdClass
+		$migration = new stdClass();
+
+		// Get migration version number
+		$migration->version   = $this->getMigrationNumber($name);
+		$migration->name      = $this->getMigrationName($name);
+		$migration->path      = $path;
+		$migration->class     = $locator->getClassname($path);
+		$migration->namespace = $namespace;
+		$migration->uid       = $this->getObjectUid($migration);
+
+		return $migration;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set namespace.
+	 * Allows other scripts to modify on the fly as needed.
+	 *
+	 * @param string $namespace or null for "all"
+	 *
+	 * @return MigrationRunner
+	 */
+	public function setNamespace(?string $namespace)
+	{
+		$this->namespace = $namespace;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set database Group.
+	 * Allows other scripts to modify on the fly as needed.
+	 *
+	 * @param string $group
+	 *
+	 * @return MigrationRunner
+	 */
+	public function setGroup(string $group)
+	{
+		$this->group = $group;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set migration Name.
+	 *
+	 * @param string $name
+	 *
+	 * @return MigrationRunner
+	 */
+	public function setName(string $name)
+	{
+		$this->name = $name;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If $silent == true, then will not throw exceptions and will
+	 * attempt to continue gracefully.
+	 *
+	 * @param boolean $silent
+	 *
+	 * @return MigrationRunner
+	 */
+	public function setSilent(bool $silent)
+	{
+		$this->silent = $silent;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the migration number from a filename
+	 *
+	 * @param string $migration
+	 *
+	 * @return string    Numeric portion of a migration filename
+	 */
+	protected function getMigrationNumber(string $migration): string
+	{
+		preg_match('/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}/', $migration, $matches);
+
+		return count($matches) ? $matches[0] : '0';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the migration class name from a filename
+	 *
+	 * @param string $migration
+	 *
+	 * @return string    text portion of a migration filename
+	 */
+	protected function getMigrationName(string $migration): string
+	{
+		$parts = explode('_', $migration);
+		array_shift($parts);
+
+		return implode('_', $parts);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Uses the non-repeatable portions of a migration or history
+	 * to create a sortable unique key
+	 *
+	 * @param object $object migration or $history
+	 *
+	 * @return string
+	 */
+	public function getObjectUid($object): string
+	{
+		return preg_replace('/[^0-9]/', '', $object->version) . $object->class;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves messages formatted for CLI output
+	 *
+	 * @return array    Current migration version
+	 */
+	public function getCliMessages(): array
+	{
+		return $this->cliMessages;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears any CLI messages.
+	 *
+	 * @return MigrationRunner
+	 */
+	public function clearCliMessages()
+	{
+		$this->cliMessages = [];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Truncates the history table.
+	 *
+	 * @return void
+	 */
+	public function clearHistory()
+	{
+		if ($this->db->tableExists($this->table))
+		{
+			$this->db->table($this->table)->truncate();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add a history to the table.
+	 *
+	 * @param object  $migration
+	 * @param integer $batch
+	 *
+	 * @return void
+	 */
+	protected function addHistory($migration, int $batch)
+	{
+		$this->db->table($this->table)->insert([
+			'version'   => $migration->version,
+			'class'     => $migration->class,
+			'group'     => $this->group,
+			'namespace' => $migration->namespace,
+			'time'      => time(),
+			'batch'     => $batch,
+		]);
+
+		if (is_cli())
+		{
+			$this->cliMessages[] = sprintf(
+				"\t%s(%s) %s_%s",
+				CLI::color(lang('Migrations.added'), 'yellow'),
+				$migration->namespace,
+				$migration->version,
+				$migration->class
+			);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single history
+	 *
+	 * @param object $history
+	 *
+	 * @return void
+	 */
+	protected function removeHistory($history)
+	{
+		$this->db->table($this->table)->where('id', $history->id)->delete();
+
+		if (is_cli())
+		{
+			$this->cliMessages[] = sprintf(
+				"\t%s(%s) %s_%s",
+				CLI::color(lang('Migrations.removed'), 'yellow'),
+				$history->namespace,
+				$history->version,
+				$history->class
+			);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Grabs the full migration history from the database for a group
+	 *
+	 * @param string $group
+	 *
+	 * @return array
+	 */
+	public function getHistory(string $group = 'default'): array
+	{
+		$this->ensureTable();
+
+		$builder = $this->db->table($this->table);
+
+		// If group was specified then use it
+		if (! empty($group))
+		{
+			$builder->where('group', $group);
+		}
+
+		// If a namespace was specified then use it
+		if ($this->namespace)
+		{
+			$builder->where('namespace', $this->namespace);
+		}
+
+		$query = $builder->orderBy('id', 'ASC')->get();
+
+		return ! empty($query) ? $query->getResultObject() : [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the migration history for a single batch.
+	 *
+	 * @param integer $batch
+	 *
+	 * @return array
+	 */
+	public function getBatchHistory(int $batch, $order = 'asc'): array
+	{
+		$this->ensureTable();
+
+		$query = $this->db->table($this->table)
+						  ->where('batch', $batch)
+						  ->orderBy('id', $order)
+						  ->get();
+
+		return ! empty($query) ? $query->getResultObject() : [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns all the batches from the database history in order
+	 *
+	 * @return array
+	 */
+	public function getBatches(): array
+	{
+		$this->ensureTable();
+
+		$batches = $this->db->table($this->table)
+						  ->select('batch')
+						  ->distinct()
+						  ->orderBy('batch', 'asc')
+						  ->get()
+						  ->getResultArray();
+
+		return array_map('intval', array_column($batches, 'batch'));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the value of the last batch in the database.
+	 *
+	 * @return integer
+	 */
+	public function getLastBatch(): int
+	{
+		$this->ensureTable();
+
+		$batch = $this->db->table($this->table)
+						  ->selectMax('batch')
+						  ->get()
+						  ->getResultObject();
+
+		$batch = is_array($batch) && count($batch)
+			? end($batch)->batch
+			: 0;
+
+		return (int) $batch;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the version number of the first migration for a batch.
+	 * Mostly just for tests.
+	 *
+	 * @param integer $batch
+	 *
+	 * @return string
+	 */
+	public function getBatchStart(int $batch): string
+	{
+		// Convert a relative batch to its absolute
+		if ($batch < 0)
+		{
+			$batches = $this->getBatches();
+			$batch   = $batches[count($batches) - 1] ?? 0;
+		}
+
+		$migration = $this->db->table($this->table)
+			->where('batch', $batch)
+			->orderBy('id', 'asc')
+			->limit(1)
+			->get()
+			->getResultObject();
+
+		return count($migration) ? $migration[0]->version : '0';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the version number of the last migration for a batch.
+	 * Mostly just for tests.
+	 *
+	 * @param integer $batch
+	 *
+	 * @return string
+	 */
+	public function getBatchEnd(int $batch): string
+	{
+		// Convert a relative batch to its absolute
+		if ($batch < 0)
+		{
+			$batches = $this->getBatches();
+			$batch   = $batches[count($batches) - 1] ?? 0;
+		}
+
+		$migration = $this->db->table($this->table)
+			  ->where('batch', $batch)
+			  ->orderBy('id', 'desc')
+			  ->limit(1)
+			  ->get()
+			  ->getResultObject();
+
+		return count($migration) ? $migration[0]->version : 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures that we have created our migrations table
+	 * in the database.
+	 */
+	public function ensureTable()
+	{
+		if ($this->tableChecked || $this->db->tableExists($this->table))
+		{
+			return;
+		}
+
+		$forge = Database::forge($this->db);
+
+		$forge->addField([
+			'id'        => [
+				'type'           => 'BIGINT',
+				'constraint'     => 20,
+				'unsigned'       => true,
+				'auto_increment' => true,
+			],
+			'version'   => [
+				'type'       => 'VARCHAR',
+				'constraint' => 255,
+				'null'       => false,
+			],
+			'class'     => [
+				'type'       => 'VARCHAR',
+				'constraint' => 255,
+				'null'       => false,
+			],
+			'group'     => [
+				'type'       => 'VARCHAR',
+				'constraint' => 255,
+				'null'       => false,
+			],
+			'namespace' => [
+				'type'       => 'VARCHAR',
+				'constraint' => 255,
+				'null'       => false,
+			],
+			'time'      => [
+				'type'       => 'INT',
+				'constraint' => 11,
+				'null'       => false,
+			],
+			'batch'     => [
+				'type'       => 'INT',
+				'constraint' => 11,
+				'unsigned'   => true,
+				'null'       => false,
+			],
+		]);
+
+		$forge->addPrimaryKey('id');
+		$forge->createTable($this->table, true);
+
+		$this->tableChecked = true;
+	}
+
+	/**
+	 * Handles the actual running of a migration.
+	 *
+	 * @param string $direction "up" or "down"
+	 * @param object $migration The migration to run
+	 *
+	 * @return boolean
+	 */
+	protected function migrate($direction, $migration): bool
+	{
+		include_once $migration->path;
+
+		$class = $migration->class;
+		$this->setName($migration->name);
+
+		// Validate the migration file structure
+		if (! class_exists($class, false))
+		{
+			$message = sprintf(lang('Migrations.classNotFound'), $class);
+
+			if ($this->silent)
+			{
+				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+				return false;
+			}
+			throw new RuntimeException($message);
+		}
+
+		// Initialize migration
+		$instance = new $class();
+		// Determine DBGroup to use
+		$group = $instance->getDBGroup() ?? config('Database')->defaultGroup;
+
+		// Skip tests db group when not running in testing environment
+		if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests')
+		{
+			// @codeCoverageIgnoreStart
+			$this->groupSkip = true;
+			return true;
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Skip migration if group filtering was set
+		if ($direction === 'up' && ! is_null($this->groupFilter) && $this->groupFilter !== $group)
+		{
+			$this->groupSkip = true;
+			return true;
+		}
+
+		$this->setGroup($group);
+
+		if (! is_callable([$instance, $direction]))
+		{
+			$message = sprintf(lang('Migrations.missingMethod'), $direction);
+
+			if ($this->silent)
+			{
+				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
+				return false;
+			}
+			throw new RuntimeException($message);
+		}
+
+		$instance->{$direction}();
+
+		return true;
+	}
+}
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
new file mode 100644
index 0000000..6900fa3
--- /dev/null
+++ b/system/Database/ModelFactory.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Config\Factories;
+
+/**
+ * Returns new or shared Model instances
+ *
+ * @deprecated Use CodeIgniter\Config\Factories::models()
+ *
+ * @codeCoverageIgnore
+ */
+class ModelFactory
+{
+	/**
+	 * Creates new Model instances or returns a shared instance
+	 *
+	 * @param string              $name       Model name, namespace optional
+	 * @param boolean             $getShared  Use shared instance
+	 * @param ConnectionInterface $connection
+	 *
+	 * @return mixed|null
+	 */
+	public static function get(string $name, bool $getShared = true, ConnectionInterface $connection = null)
+	{
+		return Factories::models($name, ['getShared' => $getShared], $connection);
+	}
+
+	/**
+	 * Helper method for injecting mock instances while testing.
+	 *
+	 * @param string $name
+	 * @param object $instance
+	 */
+	public static function injectMock(string $name, $instance)
+	{
+		Factories::injectMock('models', $name, $instance);
+	}
+
+	/**
+	 * Resets the static arrays
+	 */
+	public static function reset()
+	{
+		Factories::reset('models');
+	}
+}
diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
new file mode 100644
index 0000000..a64b3ae
--- /dev/null
+++ b/system/Database/MySQLi/Builder.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseBuilder;
+
+/**
+ * Builder for MySQLi
+ */
+class Builder extends BaseBuilder
+{
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	protected $escapeChar = '`';
+
+	/**
+	 * Specifies which sql statements
+	 * support the ignore option.
+	 *
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [
+		'update' => 'IGNORE',
+		'insert' => 'IGNORE',
+		'delete' => 'IGNORE',
+	];
+
+	/**
+	 * FROM tables
+	 *
+	 * Groups tables in FROM clauses if needed, so there is no confusion
+	 * about operator precedence.
+	 *
+	 * Note: This is only used (and overridden) by MySQL.
+	 *
+	 * @return string
+	 */
+	protected function _fromTables(): string
+	{
+		if (! empty($this->QBJoin) && count($this->QBFrom) > 1)
+		{
+			return '(' . implode(', ', $this->QBFrom) . ')';
+		}
+
+		return implode(', ', $this->QBFrom);
+	}
+}
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
new file mode 100644
index 0000000..e3c2838
--- /dev/null
+++ b/system/Database/MySQLi/Connection.php
@@ -0,0 +1,728 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use LogicException;
+use MySQLi;
+use mysqli_sql_exception;
+use stdClass;
+use Throwable;
+
+/**
+ * Connection for MySQLi
+ */
+class Connection extends BaseConnection
+{
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	public $DBDriver = 'MySQLi';
+
+	/**
+	 * DELETE hack flag
+	 *
+	 * Whether to use the MySQL "delete hack" which allows the number
+	 * of affected rows to be shown. Uses a preg_replace when enabled,
+	 * adding a bit more processing to all queries.
+	 *
+	 * @var boolean
+	 */
+	public $deleteHack = true;
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	public $escapeChar = '`';
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * MySQLi object
+	 *
+	 * Has to be preserved without being assigned to $conn_id.
+	 *
+	 * @var MySQLi
+	 */
+	public $mysqli;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param boolean $persistent
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function connect(bool $persistent = false)
+	{
+		// Do we have a socket path?
+		if ($this->hostname[0] === '/')
+		{
+			$hostname = null;
+			$port     = null;
+			$socket   = $this->hostname;
+		}
+		else
+		{
+			$hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
+			$port     = empty($this->port) ? null : $this->port;
+			$socket   = '';
+		}
+
+		$clientFlags  = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
+		$this->mysqli = mysqli_init();
+
+		mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);
+
+		$this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10);
+
+		if (isset($this->strictOn))
+		{
+			if ($this->strictOn)
+			{
+				$this->mysqli->options(MYSQLI_INIT_COMMAND,
+					'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
+			}
+			else
+			{
+				$this->mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode =
+						REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+												@@sql_mode,
+												"STRICT_ALL_TABLES,", ""),
+											",STRICT_ALL_TABLES", ""),
+										"STRICT_ALL_TABLES", ""),
+									"STRICT_TRANS_TABLES,", ""),
+								",STRICT_TRANS_TABLES", ""),
+							"STRICT_TRANS_TABLES", "")'
+				);
+			}
+		}
+
+		if (is_array($this->encrypt))
+		{
+			$ssl = [];
+
+			if (! empty($this->encrypt['ssl_key']))
+			{
+				$ssl['key'] = $this->encrypt['ssl_key'];
+			}
+			if (! empty($this->encrypt['ssl_cert']))
+			{
+				$ssl['cert'] = $this->encrypt['ssl_cert'];
+			}
+			if (! empty($this->encrypt['ssl_ca']))
+			{
+				$ssl['ca'] = $this->encrypt['ssl_ca'];
+			}
+			if (! empty($this->encrypt['ssl_capath']))
+			{
+				$ssl['capath'] = $this->encrypt['ssl_capath'];
+			}
+			if (! empty($this->encrypt['ssl_cipher']))
+			{
+				$ssl['cipher'] = $this->encrypt['ssl_cipher'];
+			}
+
+			if (! empty($ssl))
+			{
+				if (isset($this->encrypt['ssl_verify']))
+				{
+					if ($this->encrypt['ssl_verify'])
+					{
+						defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
+						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
+					}
+					// Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
+					// to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
+					// constant ...
+					//
+					// https://secure.php.net/ChangeLog-5.php#5.6.16
+					// https://bugs.php.net/bug.php?id=68344
+					elseif (defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT') && version_compare($this->mysqli->client_info, 'mysqlnd 5.6', '>='))
+					{
+						$clientFlags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
+					}
+				}
+
+				$clientFlags += MYSQLI_CLIENT_SSL;
+				$this->mysqli->ssl_set(
+					$ssl['key'] ?? null, $ssl['cert'] ?? null, $ssl['ca'] ?? null,
+					$ssl['capath'] ?? null, $ssl['cipher'] ?? null
+				);
+			}
+		}
+
+		try
+		{
+			if ($this->mysqli->real_connect($hostname, $this->username, $this->password,
+				$this->database, $port, $socket, $clientFlags)
+			)
+			{
+				// Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
+				if (($clientFlags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, 'mysqlnd 5.7.3', '<=')
+					&& empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
+										  ->fetch_object()->Value)
+				)
+				{
+					$this->mysqli->close();
+					$message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
+					log_message('error', $message);
+
+					if ($this->DBDebug)
+					{
+						throw new DatabaseException($message);
+					}
+
+					return false;
+				}
+
+				if (! $this->mysqli->set_charset($this->charset))
+				{
+					log_message('error',
+						"Database: Unable to set the configured connection charset ('{$this->charset}').");
+					$this->mysqli->close();
+
+					if ($this->DBDebug)
+					{
+						throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);
+					}
+
+					return false;
+				}
+
+				return $this->mysqli;
+			}
+		}
+		catch (Throwable $e)
+		{
+			// Clean sensitive information from errors.
+			$msg = $e->getMessage();
+
+			$msg = str_replace($this->username, '****', $msg);
+			$msg = str_replace($this->password, '****', $msg);
+
+			throw new DatabaseException($msg, $e->getCode(), $e);
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return void
+	 */
+	public function reconnect()
+	{
+		$this->close();
+		$this->initialize();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	protected function _close()
+	{
+		$this->connID->close();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return boolean
+	 */
+	public function setDatabase(string $databaseName): bool
+	{
+		if ($databaseName === '')
+		{
+			$databaseName = $this->database;
+		}
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		if ($this->connID->select_db($databaseName))
+		{
+			$this->database = $databaseName;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		if (isset($this->dataCache['version']))
+		{
+			return $this->dataCache['version'];
+		}
+
+		if (empty($this->mysqli))
+		{
+			$this->initialize();
+		}
+
+		return $this->dataCache['version'] = $this->mysqli->server_info;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Executes the query against the database.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	public function execute(string $sql)
+	{
+		while ($this->connID->more_results())
+		{
+			$this->connID->next_result();
+			if ($res = $this->connID->store_result())
+			{
+				$res->free();
+			}
+		}
+		try
+		{
+			return $this->connID->query($this->prepQuery($sql));
+		}
+		catch (mysqli_sql_exception $e)
+		{
+			log_message('error', $e->getMessage());
+
+			if ($this->DBDebug)
+			{
+				throw $e;
+			}
+		}
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep the query
+	 *
+	 * If needed, each database adapter can prep the query string
+	 *
+	 * @param string $sql an SQL query
+	 *
+	 * @return string
+	 */
+	protected function prepQuery(string $sql): string
+	{
+		// mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
+		// modifies the query so that it a proper number of affected rows is returned.
+		if ($this->deleteHack === true && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql))
+		{
+			return trim($sql) . ' WHERE 1=1';
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	public function affectedRows(): int
+	{
+		return $this->connID->affected_rows ?? 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-dependant string escape
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	protected function _escapeString(string $str): string
+	{
+		if (! $this->connID)
+		{
+			$this->initialize();
+		}
+
+		return $this->connID->real_escape_string($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Escape Like String Direct
+	 * There are a few instances where MySQLi queries cannot take the
+	 * additional "ESCAPE x" parameter for specifying the escape character
+	 * in "LIKE" strings, and this handles those directly with a backslash.
+	 *
+	 * @param  string|string[] $str Input string
+	 * @return string|string[]
+	 */
+	public function escapeLikeStringDirect($str)
+	{
+		if (is_array($str))
+		{
+			foreach ($str as $key => $val)
+			{
+				$str[$key] = $this->escapeLikeStringDirect($val);
+			}
+
+			return $str;
+		}
+
+		$str = $this->_escapeString($str);
+
+		// Escape LIKE condition wildcards
+		return str_replace([
+			$this->likeEscapeChar,
+			'%',
+			'_',
+		], [
+			'\\' . $this->likeEscapeChar,
+			'\\' . '%',
+			'\\' . '_',
+		], $str
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 * Uses escapeLikeStringDirect().
+	 *
+	 * @param boolean $prefixLimit
+	 *
+	 * @return string
+	 */
+	protected function _listTables(bool $prefixLimit = false): string
+	{
+		$sql = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->database);
+
+		if ($prefixLimit !== false && $this->DBPrefix !== '')
+		{
+			return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function _listColumns(string $table = ''): string
+	{
+		return 'SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with field data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _fieldData(string $table): array
+	{
+		$table = $this->protectIdentifiers($table, true, null, false);
+
+		if (($query = $this->query('SHOW COLUMNS FROM ' . $table)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetFieldData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		for ($i = 0, $c = count($query); $i < $c; $i++)
+		{
+			$retVal[$i]       = new stdClass();
+			$retVal[$i]->name = $query[$i]->Field;
+
+			sscanf($query[$i]->Type, '%[a-z](%d)', $retVal[$i]->type, $retVal[$i]->max_length);
+
+			$retVal[$i]->nullable    = $query[$i]->Null === 'YES';
+			$retVal[$i]->default     = $query[$i]->Default;
+			$retVal[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with index data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 * @throws LogicException
+	 */
+	public function _indexData(string $table): array
+	{
+		$table = $this->protectIdentifiers($table, true, null, false);
+
+		if (($query = $this->query('SHOW INDEX FROM ' . $table)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetIndexData'));
+		}
+
+		if (! $indexes = $query->getResultArray())
+		{
+			return [];
+		}
+
+		$keys = [];
+
+		foreach ($indexes as $index)
+		{
+			if (empty($keys[$index['Key_name']]))
+			{
+				$keys[$index['Key_name']]       = new stdClass();
+				$keys[$index['Key_name']]->name = $index['Key_name'];
+
+				if ($index['Key_name'] === 'PRIMARY')
+				{
+					$type = 'PRIMARY';
+				}
+				elseif ($index['Index_type'] === 'FULLTEXT')
+				{
+					$type = 'FULLTEXT';
+				}
+				elseif ($index['Non_unique'])
+				{
+					$type = $index['Index_type'] === 'SPATIAL' ? 'SPATIAL' : 'INDEX';
+				}
+				else
+				{
+					$type = 'UNIQUE';
+				}
+
+				$keys[$index['Key_name']]->type = $type;
+			}
+
+			$keys[$index['Key_name']]->fields[] = $index['Column_name'];
+		}
+
+		return $keys;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with Foreign key data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _foreignKeyData(string $table): array
+	{
+		$sql = '
+                    SELECT
+                        tc.CONSTRAINT_NAME,
+                        tc.TABLE_NAME,
+                        kcu.COLUMN_NAME,
+                        rc.REFERENCED_TABLE_NAME,
+                        kcu.REFERENCED_COLUMN_NAME
+                    FROM information_schema.TABLE_CONSTRAINTS AS tc
+                    INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS rc
+                        ON tc.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
+                    INNER JOIN information_schema.KEY_COLUMN_USAGE AS kcu
+                        ON tc.CONSTRAINT_NAME = kcu.CONSTRAINT_NAME
+                    WHERE
+                        tc.CONSTRAINT_TYPE = ' . $this->escape('FOREIGN KEY') . ' AND
+                        tc.TABLE_SCHEMA = ' . $this->escape($this->database) . ' AND
+                        tc.TABLE_NAME = ' . $this->escape($table);
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj                      = new stdClass();
+			$obj->constraint_name     = $row->CONSTRAINT_NAME;
+			$obj->table_name          = $row->TABLE_NAME;
+			$obj->column_name         = $row->COLUMN_NAME;
+			$obj->foreign_table_name  = $row->REFERENCED_TABLE_NAME;
+			$obj->foreign_column_name = $row->REFERENCED_COLUMN_NAME;
+
+			$retVal[] = $obj;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to disable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _disableForeignKeyChecks()
+	{
+		return 'SET FOREIGN_KEY_CHECKS=0';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to enable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _enableForeignKeyChecks()
+	{
+		return 'SET FOREIGN_KEY_CHECKS=1';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error code and message.
+	 * Must return this format: ['code' => string|int, 'message' => string]
+	 * intval(code) === 0 means "no error".
+	 *
+	 * @return array<string,string|int>
+	 */
+	public function error(): array
+	{
+		if (! empty($this->mysqli->connect_errno))
+		{
+			return [
+				'code'    => $this->mysqli->connect_errno,
+				'message' => $this->mysqli->connect_error,
+			];
+		}
+
+		return [
+			'code'    => $this->connID->errno,
+			'message' => $this->connID->error,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer
+	 */
+	public function insertID(): int
+	{
+		return $this->connID->insert_id;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transBegin(): bool
+	{
+		$this->connID->autocommit(false);
+
+		return $this->connID->begin_transaction();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transCommit(): bool
+	{
+		if ($this->connID->commit())
+		{
+			$this->connID->autocommit(true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transRollback(): bool
+	{
+		if ($this->connID->rollback())
+		{
+			$this->connID->autocommit(true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
new file mode 100644
index 0000000..4bb6e22
--- /dev/null
+++ b/system/Database/MySQLi/Forge.php
@@ -0,0 +1,255 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\Forge as BaseForge;
+
+/**
+ * Forge for MySQLi
+ */
+class Forge extends BaseForge
+{
+	/**
+	 * CREATE DATABASE statement
+	 *
+	 * @var string
+	 */
+	protected $createDatabaseStr = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+
+	/**
+	 * CREATE DATABASE IF statement
+	 *
+	 * @var string
+	 */
+	protected $createDatabaseIfStr = 'CREATE DATABASE IF NOT EXISTS %s CHARACTER SET %s COLLATE %s';
+
+	/**
+	 * DROP CONSTRAINT statement
+	 *
+	 * @var string
+	 */
+	protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
+
+	/**
+	 * CREATE TABLE keys flag
+	 *
+	 * Whether table keys are created from within the
+	 * CREATE TABLE statement.
+	 *
+	 * @var boolean
+	 */
+	protected $createTableKeys = true;
+
+	/**
+	 * UNSIGNED support
+	 *
+	 * @var array
+	 */
+	protected $_unsigned = [
+		'TINYINT',
+		'SMALLINT',
+		'MEDIUMINT',
+		'INT',
+		'INTEGER',
+		'BIGINT',
+		'REAL',
+		'DOUBLE',
+		'DOUBLE PRECISION',
+		'FLOAT',
+		'DECIMAL',
+		'NUMERIC',
+	];
+
+	/**
+	 * Table Options list which required to be quoted
+	 *
+	 * @var array
+	 */
+	protected $_quoted_table_options = [
+		'COMMENT',
+		'COMPRESSION',
+		'CONNECTION',
+		'DATA DIRECTORY',
+		'INDEX DIRECTORY',
+		'ENCRYPTION',
+		'PASSWORD',
+	];
+
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var string
+	 *
+	 * @internal
+	 */
+	protected $null = 'NULL';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CREATE TABLE attributes
+	 *
+	 * @param  array $attributes Associative array of table attributes
+	 * @return string
+	 */
+	protected function _createTableAttributes(array $attributes): string
+	{
+		$sql = '';
+
+		foreach (array_keys($attributes) as $key)
+		{
+			if (is_string($key))
+			{
+				$sql .= ' ' . strtoupper($key) . ' = ';
+
+				if (in_array(strtoupper($key), $this->_quoted_table_options, true))
+				{
+					$sql .= $this->db->escape($attributes[$key]);
+				}
+				else
+				{
+					$sql .= $this->db->escapeString($attributes[$key]);
+				}
+			}
+		}
+
+		if (! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET'))
+		{
+			$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escapeString($this->db->charset);
+		}
+
+		if (! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE'))
+		{
+			$sql .= ' COLLATE = ' . $this->db->escapeString($this->db->DBCollat);
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ALTER TABLE
+	 *
+	 * @param  string $alterType ALTER type
+	 * @param  string $table     Table name
+	 * @param  mixed  $field     Column definition
+	 * @return string|string[]
+	 */
+	protected function _alterTable(string $alterType, string $table, $field)
+	{
+		if ($alterType === 'DROP')
+		{
+			return parent::_alterTable($alterType, $table, $field);
+		}
+
+		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+		foreach ($field as $i => $data)
+		{
+			if ($data['_literal'] !== false)
+			{
+				$field[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+			}
+			else
+			{
+				if ($alterType === 'ADD')
+				{
+					$field[$i]['_literal'] = "\n\tADD ";
+				}
+				else
+				{
+					$field[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
+				}
+
+				$field[$i] = $field[$i]['_literal'] . $this->_processColumn($field[$i]);
+			}
+		}
+
+		return [$sql . implode(',', $field)];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process column
+	 *
+	 * @param  array $field
+	 * @return string
+	 */
+	protected function _processColumn(array $field): string
+	{
+		$extraClause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
+
+		if (empty($extraClause) && isset($field['first']) && $field['first'] === true)
+		{
+			$extraClause = ' FIRST';
+		}
+
+		return $this->db->escapeIdentifiers($field['name'])
+				. (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
+				. ' ' . $field['type'] . $field['length']
+				. $field['unsigned']
+				. $field['null']
+				. $field['default']
+				. $field['auto_increment']
+				. $field['unique']
+				. (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
+				. $extraClause;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process indexes
+	 *
+	 * @param  string $table (ignored)
+	 * @return string
+	 */
+	protected function _processIndexes(string $table): string
+	{
+		$sql = '';
+
+		for ($i = 0, $c = count($this->keys); $i < $c; $i ++)
+		{
+			if (is_array($this->keys[$i]))
+			{
+				for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2 ++)
+				{
+					if (! isset($this->fields[$this->keys[$i][$i2]]))
+					{
+						unset($this->keys[$i][$i2]);
+						continue;
+					}
+				}
+			}
+			elseif (! isset($this->fields[$this->keys[$i]]))
+			{
+				unset($this->keys[$i]);
+				continue;
+			}
+
+			if (! is_array($this->keys[$i]))
+			{
+				$this->keys[$i] = [$this->keys[$i]];
+			}
+
+			$unique = in_array($i, $this->uniqueKeys, true) ? 'UNIQUE ' : '';
+
+			$sql .= ",\n\t{$unique}KEY " . $this->db->escapeIdentifiers(implode('_', $this->keys[$i]))
+				. ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
+		}
+
+		$this->keys = [];
+
+		return $sql;
+	}
+}
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
new file mode 100644
index 0000000..efc9abe
--- /dev/null
+++ b/system/Database/MySQLi/PreparedQuery.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use BadMethodCallException;
+use CodeIgniter\Database\BasePreparedQuery;
+
+/**
+ * Prepared query for MySQLi
+ */
+class PreparedQuery extends BasePreparedQuery
+{
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options Passed to the connection's prepare statement.
+	 *                        Unused in the MySQLi driver.
+	 *
+	 * @return mixed
+	 */
+	public function _prepare(string $sql, array $options = [])
+	{
+		// Mysqli driver doesn't like statements
+		// with terminating semicolons.
+		$sql = rtrim($sql, ';');
+
+		if (! $this->statement = $this->db->mysqli->prepare($sql))
+		{
+			$this->errorCode   = $this->db->mysqli->errno;
+			$this->errorString = $this->db->mysqli->error;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @param array $data
+	 *
+	 * @return boolean
+	 */
+	public function _execute(array $data): bool
+	{
+		if (! isset($this->statement))
+		{
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+		}
+
+		// First off -bind the parameters
+		$bindTypes = '';
+
+		// Determine the type string
+		foreach ($data as $item)
+		{
+			if (is_integer($item))
+			{
+				$bindTypes .= 'i';
+			}
+			elseif (is_numeric($item))
+			{
+				$bindTypes .= 'd';
+			}
+			else
+			{
+				$bindTypes .= 's';
+			}
+		}
+
+		// Bind it
+		$this->statement->bind_param($bindTypes, ...$data);
+
+		return $this->statement->execute();
+	}
+
+	/**
+	 * Returns the result object for the prepared query.
+	 *
+	 * @return mixed
+	 */
+	public function _getResult()
+	{
+		return $this->statement->get_result();
+	}
+}
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
new file mode 100644
index 0000000..4be7fc9
--- /dev/null
+++ b/system/Database/MySQLi/Result.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Entity\Entity;
+use stdClass;
+
+/**
+ * Result for MySQLi
+ */
+class Result extends BaseResult
+{
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int
+	{
+		return $this->resultID->field_count;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		$fieldNames = [];
+		$this->resultID->field_seek(0);
+		while ($field = $this->resultID->fetch_field())
+		{
+			$fieldNames[] = $field->name;
+		}
+
+		return $fieldNames;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array
+	{
+		static $dataTypes = [
+			MYSQLI_TYPE_DECIMAL     => 'decimal',
+			MYSQLI_TYPE_NEWDECIMAL  => 'newdecimal',
+			MYSQLI_TYPE_FLOAT       => 'float',
+			MYSQLI_TYPE_DOUBLE      => 'double',
+
+			MYSQLI_TYPE_BIT         => 'bit',
+			MYSQLI_TYPE_SHORT       => 'short',
+			MYSQLI_TYPE_LONG        => 'long',
+			MYSQLI_TYPE_LONGLONG    => 'longlong',
+			MYSQLI_TYPE_INT24       => 'int24',
+
+			MYSQLI_TYPE_YEAR        => 'year',
+
+			MYSQLI_TYPE_TIMESTAMP   => 'timestamp',
+			MYSQLI_TYPE_DATE        => 'date',
+			MYSQLI_TYPE_TIME        => 'time',
+			MYSQLI_TYPE_DATETIME    => 'datetime',
+			MYSQLI_TYPE_NEWDATE     => 'newdate',
+
+			MYSQLI_TYPE_SET         => 'set',
+
+			MYSQLI_TYPE_VAR_STRING  => 'var_string',
+			MYSQLI_TYPE_STRING      => 'string',
+
+			MYSQLI_TYPE_GEOMETRY    => 'geometry',
+			MYSQLI_TYPE_TINY_BLOB   => 'tiny_blob',
+			MYSQLI_TYPE_MEDIUM_BLOB => 'medium_blob',
+			MYSQLI_TYPE_LONG_BLOB   => 'long_blob',
+			MYSQLI_TYPE_BLOB        => 'blob',
+		];
+
+		$retVal    = [];
+		$fieldData = $this->resultID->fetch_fields();
+
+		foreach ($fieldData as $i => $data)
+		{
+			$retVal[$i]              = new stdClass();
+			$retVal[$i]->name        = $data->name;
+			$retVal[$i]->type        = $data->type;
+			$retVal[$i]->type_name   = in_array($data->type, [1, 247], true) ? 'char' : ($dataTypes[$data->type] ?? null);
+			$retVal[$i]->max_length  = $data->max_length;
+			$retVal[$i]->primary_key = (int) ($data->flags & 2);
+			$retVal[$i]->length      = $data->length;
+			$retVal[$i]->default     = $data->def;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	public function freeResult()
+	{
+		if (is_object($this->resultID))
+		{
+			$this->resultID->free();
+			$this->resultID = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function dataSeek(int $n = 0)
+	{
+		return $this->resultID->data_seek($n);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	protected function fetchAssoc()
+	{
+		return $this->resultID->fetch_assoc();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object|boolean|Entity
+	 */
+	protected function fetchObject(string $className = 'stdClass')
+	{
+		if (is_subclass_of($className, Entity::class))
+		{
+			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+		}
+		return $this->resultID->fetch_object($className);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of rows in the resultID (i.e., mysqli_result object)
+	 *
+	 * @return integer number of rows in a query result
+	 */
+	public function getNumRows(): int
+	{
+		if (! is_int($this->numRows))
+		{
+			$this->numRows = $this->resultID->num_rows;
+		}
+
+		return $this->numRows;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
new file mode 100644
index 0000000..7736718
--- /dev/null
+++ b/system/Database/MySQLi/Utils.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Utils for MySQLi
+ */
+class Utils extends BaseUtils
+{
+	/**
+	 * List databases statement
+	 *
+	 * @var string
+	 */
+	protected $listDatabases = 'SHOW DATABASES';
+
+	/**
+	 * OPTIMIZE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $optimizeTable = 'OPTIMIZE TABLE %s';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent version of the backup function.
+	 *
+	 * @param array|null $prefs
+	 *
+	 * @return mixed
+	 */
+	public function _backup(array $prefs = null)
+	{
+		throw new DatabaseException('Unsupported feature of the database platform you are using.');
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
new file mode 100644
index 0000000..f23d6dc
--- /dev/null
+++ b/system/Database/Postgre/Builder.php
@@ -0,0 +1,430 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Postgre;
+
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Builder for Postgre
+ */
+class Builder extends BaseBuilder
+{
+	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'RANDOM()',
+	];
+
+	/**
+	 * Specifies which sql statements
+	 * support the ignore option.
+	 *
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [
+		'insert' => 'ON CONFLICT DO NOTHING',
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile Ignore Statement
+	 *
+	 * Checks if the ignore option is supported by
+	 * the Database Driver for the specific statement.
+	 *
+	 * @param string $statement
+	 *
+	 * @return string
+	 */
+	protected function compileIgnore(string $statement)
+	{
+		$sql = parent::compileIgnore($statement);
+
+		if (! empty($sql))
+		{
+			$sql = ' ' . trim($sql);
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ORDER BY
+	 *
+	 * @param string  $orderBy
+	 * @param string  $direction ASC, DESC or RANDOM
+	 * @param boolean $escape
+	 *
+	 * @return BaseBuilder
+	 */
+	public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
+	{
+		$direction = strtoupper(trim($direction));
+		if ($direction === 'RANDOM')
+		{
+			if (ctype_digit($orderBy))
+			{
+				$orderBy = (float) ($orderBy > 1 ? "0.{$orderBy}" : $orderBy);
+			}
+
+			if (is_float($orderBy))
+			{
+				$this->db->simpleQuery("SET SEED {$orderBy}");
+			}
+
+			$orderBy   = $this->randomKeyword[0];
+			$direction = '';
+			$escape    = false;
+		}
+
+		return parent::orderBy($orderBy, $direction, $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Increments a numeric column by the specified value.
+	 *
+	 * @param string  $column
+	 * @param integer $value
+	 *
+	 * @throws DatabaseException
+	 *
+	 * @return mixed
+	 */
+	public function increment(string $column, int $value = 1)
+	{
+		$column = $this->db->protectIdentifiers($column);
+
+		$sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') + {$value}"]);
+
+		return $this->db->query($sql, $this->binds, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Decrements a numeric column by the specified value.
+	 *
+	 * @param string  $column
+	 * @param integer $value
+	 *
+	 * @throws DatabaseException
+	 *
+	 * @return mixed
+	 */
+	public function decrement(string $column, int $value = 1)
+	{
+		$column = $this->db->protectIdentifiers($column);
+
+		$sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') - {$value}"]);
+
+		return $this->db->query($sql, $this->binds, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replace
+	 *
+	 * Compiles an replace into string and runs the query.
+	 * Because PostgreSQL doesn't support the replace into command,
+	 * we simply do a DELETE and an INSERT on the first key/value
+	 * combo, assuming that it's either the primary key or a unique key.
+	 *
+	 * @param array $set An associative array of insert values
+	 *
+	 * @return   mixed
+	 * @throws   DatabaseException
+	 * @internal param true $bool returns the generated SQL, false executes the query.
+	 */
+	public function replace(array $set = null)
+	{
+		if ($set !== null)
+		{
+			$this->set($set);
+		}
+
+		if (! $this->QBSet)
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('You must use the "set" method to update an entry.');
+			}
+			// @codeCoverageIgnoreStart
+			return false;
+			// @codeCoverageIgnoreEnd
+		}
+
+		$table = $this->QBFrom[0];
+
+		$key   = array_key_first($set);
+		$value = $set[$key];
+
+		$builder = $this->db->table($table);
+		$exists  = $builder->where("$key = $value", null, false)->get()->getFirstRow();
+
+		if (empty($exists))
+		{
+			$result = $builder->insert($set);
+		}
+		else
+		{
+			array_pop($set);
+			$result = $builder->update($set, "$key = $value");
+		}
+
+		unset($builder);
+		$this->resetWrite();
+
+		return $result;
+	}
+
+	/**
+	 * Insert statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 *
+	 * @param string $table         The table name
+	 * @param array  $keys          The insert keys
+	 * @param array  $unescapedKeys The insert values
+	 *
+	 * @return string
+	 */
+	protected function _insert(string $table, array $keys, array $unescapedKeys): string
+	{
+		return trim(sprintf('INSERT INTO %s (%s) VALUES (%s) %s', $table, implode(', ', $keys), implode(', ', $unescapedKeys), $this->compileIgnore('insert')));
+	}
+
+	/**
+	 * Insert batch statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data.
+	 *
+	 * @param string $table  Table name
+	 * @param array  $keys   INSERT keys
+	 * @param array  $values INSERT values
+	 *
+	 * @return string
+	 */
+	protected function _insertBatch(string $table, array $keys, array $values): string
+	{
+		return trim(sprintf('INSERT INTO %s (%s) VALUES %s %s', $table, implode(', ', $keys), implode(', ', $values), $this->compileIgnore('insert')));
+	}
+
+	/**
+	 * Delete
+	 *
+	 * Compiles a delete string and runs the query
+	 *
+	 * @param mixed   $where
+	 * @param integer $limit
+	 * @param boolean $resetData
+	 *
+	 * @return   mixed
+	 * @throws   DatabaseException
+	 * @internal param the $mixed where clause
+	 * @internal param the $mixed limit clause
+	 * @internal param $bool
+	 */
+	public function delete($where = '', int $limit = null, bool $resetData = true)
+	{
+		if (! empty($limit) || ! empty($this->QBLimit))
+		{
+			throw new DatabaseException('PostgreSQL does not allow LIMITs on DELETE queries.');
+		}
+
+		return parent::delete($where, $limit, $resetData);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * LIMIT string
+	 *
+	 * Generates a platform-specific LIMIT clause.
+	 *
+	 * @param string $sql SQL Query
+	 *
+	 * @return string
+	 */
+	protected function _limit(string $sql, bool $offsetIgnore = false): string
+	{
+		return $sql . ' LIMIT ' . $this->QBLimit . ($this->QBOffset ? " OFFSET {$this->QBOffset}" : '');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Update statement
+	 *
+	 * Generates a platform-specific update string from the supplied data
+	 *
+	 * @param string $table
+	 * @param array  $values
+	 *
+	 * @return   string
+	 * @throws   DatabaseException
+	 * @internal param the $string table name
+	 * @internal param the $array update data
+	 */
+	protected function _update(string $table, array $values): string
+	{
+		if (! empty($this->QBLimit))
+		{
+			throw new DatabaseException('Postgres does not support LIMITs with UPDATE queries.');
+		}
+
+		$this->QBOrderBy = [];
+		return parent::_update($table, $values);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Update_Batch statement
+	 *
+	 * Generates a platform-specific batch update string from the supplied data
+	 *
+	 * @param string $table  Table name
+	 * @param array  $values Update data
+	 * @param string $index  WHERE key
+	 *
+	 * @return string
+	 */
+	protected function _updateBatch(string $table, array $values, string $index): string
+	{
+		$ids   = [];
+		$final = [];
+		foreach ($values as $val)
+		{
+			$ids[] = $val[$index];
+
+			foreach (array_keys($val) as $field)
+			{
+				if ($field !== $index)
+				{
+					$final[$field] = $final[$field] ?? [];
+
+					$final[$field][] = "WHEN {$val[$index]} THEN {$val[$field]}";
+				}
+			}
+		}
+
+		$cases = '';
+		foreach ($final as $k => $v)
+		{
+			$cases .= "{$k} = (CASE {$index}\n"
+					. implode("\n", $v)
+					. "\nELSE {$k} END), ";
+		}
+
+		$this->where("{$index} IN(" . implode(',', $ids) . ')', null, false);
+
+		return "UPDATE {$table} SET " . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Delete statement
+	 *
+	 * Generates a platform-specific delete string from the supplied data
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _delete(string $table): string
+	{
+		$this->QBLimit = false;
+		return parent::_delete($table);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Truncate statement
+	 *
+	 * Generates a platform-specific truncate string from the supplied data
+	 *
+	 * If the database does not support the truncate() command,
+	 * then this method maps to 'DELETE FROM table'
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _truncate(string $table): string
+	{
+		return 'TRUNCATE ' . $table . ' RESTART IDENTITY';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform independent LIKE statement builder.
+	 *
+	 * In PostgreSQL, the ILIKE operator will perform case insensitive
+	 * searches according to the current locale.
+	 *
+	 * @see https://www.postgresql.org/docs/9.2/static/functions-matching.html
+	 *
+	 * @param string|null $prefix
+	 * @param string      $column
+	 * @param string|null $not
+	 * @param string      $bind
+	 * @param boolean     $insensitiveSearch
+	 *
+	 * @return string     $like_statement
+	 */
+	public function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
+	{
+		$op = $insensitiveSearch === true ? 'ILIKE' : 'LIKE';
+
+		return "{$prefix} {$column} {$not} {$op} :{$bind}:";
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * JOIN
+	 *
+	 * Generates the JOIN portion of the query
+	 *
+	 * @param string  $table
+	 * @param string  $cond   The join condition
+	 * @param string  $type   The type of join
+	 * @param boolean $escape Whether not to try to escape identifiers
+	 *
+	 * @return BaseBuilder
+	 */
+	public function join(string $table, string $cond, string $type = '', bool $escape = null)
+	{
+		if (! in_array('FULL OUTER', $this->joinTypes, true))
+		{
+			$this->joinTypes = array_merge($this->joinTypes, ['FULL OUTER']);
+		}
+
+		return parent::join($table, $cond, $type, $escape);
+	}
+
+	//--------------------------------------------------------------------
+
+}
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
new file mode 100644
index 0000000..010bf48
--- /dev/null
+++ b/system/Database/Postgre/Connection.php
@@ -0,0 +1,632 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Postgre;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use ErrorException;
+use stdClass;
+
+/**
+ * Connection for Postgre
+ */
+class Connection extends BaseConnection
+{
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	public $DBDriver = 'Postgre';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Database schema
+	 *
+	 * @var string
+	 */
+	public $schema = 'public';
+
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	public $escapeChar = '"';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param  boolean $persistent
+	 * @return mixed
+	 */
+	public function connect(bool $persistent = false)
+	{
+		if (empty($this->DSN))
+		{
+			$this->buildDSN();
+		}
+
+		// Strip pgsql if exists
+		if (mb_strpos($this->DSN, 'pgsql:') === 0)
+		{
+			$this->DSN = mb_substr($this->DSN, 6);
+		}
+
+		// Convert semicolons to spaces.
+		$this->DSN = str_replace(';', ' ', $this->DSN);
+
+		$this->connID = $persistent === true ? pg_pconnect($this->DSN) : pg_connect($this->DSN);
+
+		if ($this->connID !== false)
+		{
+			if ($persistent === true && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD && pg_ping($this->connID) === false
+			)
+			{
+				return false;
+			}
+
+			empty($this->schema) || $this->simpleQuery("SET search_path TO {$this->schema},public");
+
+			if ($this->setClientEncoding($this->charset) === false)
+			{
+				return false;
+			}
+		}
+
+		return $this->connID;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return void
+	 */
+	public function reconnect()
+	{
+		if (pg_ping($this->connID) === false)
+		{
+			$this->connID = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	protected function _close()
+	{
+		pg_close($this->connID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return boolean
+	 */
+	public function setDatabase(string $databaseName): bool
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		if (isset($this->dataCache['version']))
+		{
+			return $this->dataCache['version'];
+		}
+
+		// @phpstan-ignore-next-line
+		if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false)
+		{
+			$this->initialize();
+		}
+
+		return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Executes the query against the database.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	public function execute(string $sql)
+	{
+		try
+		{
+			return pg_query($this->connID, $sql);
+		}
+		catch (ErrorException $e)
+		{
+			log_message('error', $e);
+			if ($this->DBDebug)
+			{
+				throw $e;
+			}
+		}
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	public function affectedRows(): int
+	{
+		return pg_affected_rows($this->resultID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * "Smart" Escape String
+	 *
+	 * Escapes data based on type
+	 *
+	 * @param  mixed $str
+	 * @return mixed
+	 */
+	public function escape($str)
+	{
+		if (! $this->connID)
+		{
+			$this->initialize();
+		}
+
+		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
+		{
+			return pg_escape_literal($this->connID, $str);
+		}
+
+		if (is_bool($str))
+		{
+			return $str ? 'TRUE' : 'FALSE';
+		}
+
+		return parent::escape($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-dependant string escape
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	protected function _escapeString(string $str): string
+	{
+		if (! $this->connID)
+		{
+			$this->initialize();
+		}
+
+		return pg_escape_string($this->connID, $str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 *
+	 * @param boolean $prefixLimit
+	 *
+	 * @return string
+	 */
+	protected function _listTables(bool $prefixLimit = false): string
+	{
+		$sql = 'SELECT "table_name" FROM "information_schema"."tables" WHERE "table_schema" = \'' . $this->schema . "'";
+
+		if ($prefixLimit !== false && $this->DBPrefix !== '')
+		{
+			return $sql . ' AND "table_name" LIKE \''
+					. $this->escapeLikeString($this->DBPrefix) . "%' "
+					. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function _listColumns(string $table = ''): string
+	{
+		return 'SELECT "column_name"
+			FROM "information_schema"."columns"
+			WHERE LOWER("table_name") = '
+				. $this->escape($this->DBPrefix . strtolower($table))
+				. ' ORDER BY "ordinal_position"';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with field data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _fieldData(string $table): array
+	{
+		$sql = 'SELECT "column_name", "data_type", "character_maximum_length", "numeric_precision", "column_default"
+			FROM "information_schema"."columns"
+			WHERE LOWER("table_name") = '
+				. $this->escape(strtolower($table))
+				. ' ORDER BY "ordinal_position"';
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetFieldData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		for ($i = 0, $c = count($query); $i < $c; $i ++)
+		{
+			$retVal[$i]             = new stdClass();
+			$retVal[$i]->name       = $query[$i]->column_name;
+			$retVal[$i]->type       = $query[$i]->data_type;
+			$retVal[$i]->default    = $query[$i]->column_default;
+			$retVal[$i]->max_length = $query[$i]->character_maximum_length > 0 ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with index data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _indexData(string $table): array
+	{
+		$sql = 'SELECT "indexname", "indexdef"
+			FROM "pg_indexes"
+			WHERE LOWER("tablename") = ' . $this->escape(strtolower($table)) . '
+			AND "schemaname" = ' . $this->escape('public');
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetIndexData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj         = new stdClass();
+			$obj->name   = $row->indexname;
+			$_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
+			$obj->fields = array_map(function ($v) {
+				return trim($v);
+			}, $_fields);
+
+			if (strpos($row->indexdef, 'CREATE UNIQUE INDEX pk') === 0)
+			{
+				$obj->type = 'PRIMARY';
+			}
+			else
+			{
+				$obj->type = (strpos($row->indexdef, 'CREATE UNIQUE') === 0) ? 'UNIQUE' : 'INDEX';
+			}
+
+			$retVal[$obj->name] = $obj;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with Foreign key data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _foreignKeyData(string $table): array
+	{
+		$sql = 'SELECT
+                            tc.constraint_name, tc.table_name, kcu.column_name,
+                            ccu.table_name AS foreign_table_name,
+                            ccu.column_name AS foreign_column_name
+                        FROM information_schema.table_constraints AS tc
+                        JOIN information_schema.key_column_usage AS kcu
+                            ON tc.constraint_name = kcu.constraint_name
+                        JOIN information_schema.constraint_column_usage AS ccu
+                            ON ccu.constraint_name = tc.constraint_name
+                        WHERE constraint_type = ' . $this->escape('FOREIGN KEY') . ' AND
+                            tc.table_name = ' . $this->escape($table);
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj                      = new stdClass();
+			$obj->constraint_name     = $row->constraint_name;
+			$obj->table_name          = $row->table_name;
+			$obj->column_name         = $row->column_name;
+			$obj->foreign_table_name  = $row->foreign_table_name;
+			$obj->foreign_column_name = $row->foreign_column_name;
+			$retVal[]                 = $obj;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to disable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _disableForeignKeyChecks()
+	{
+		return 'SET CONSTRAINTS ALL DEFERRED';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to enable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _enableForeignKeyChecks()
+	{
+		return 'SET CONSTRAINTS ALL IMMEDIATE;';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error code and message.
+	 * Must return this format: ['code' => string|int, 'message' => string]
+	 * intval(code) === 0 means "no error".
+	 *
+	 * @return array<string,string|int>
+	 */
+	public function error(): array
+	{
+		return [
+			'code'    => '',
+			'message' => pg_last_error($this->connID) ?: '',
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer|string
+	 */
+	public function insertID()
+	{
+		$v = pg_version($this->connID);
+		// 'server' key is only available since PostgreSQL 7.4
+		$v = explode(' ', $v['server'])[0] ?? 0;
+
+		$table  = func_num_args() > 0 ? func_get_arg(0) : null;
+		$column = func_num_args() > 1 ? func_get_arg(1) : null;
+
+		if ($table === null && $v >= '8.1')
+		{
+			$sql = 'SELECT LASTVAL() AS ins_id';
+		}
+		elseif ($table !== null)
+		{
+			if ($column !== null && $v >= '8.0')
+			{
+				$sql   = "SELECT pg_get_serial_sequence('{$table}', '{$column}') AS seq";
+				$query = $this->query($sql);
+				$query = $query->getRow();
+				$seq   = $query->seq;
+			}
+			else
+			{
+				// seq_name passed in table parameter
+				$seq = $table;
+			}
+
+			$sql = "SELECT CURRVAL('{$seq}') AS ins_id";
+		}
+		else
+		{
+			return pg_last_oid($this->resultID);
+		}
+
+		$query = $this->query($sql);
+		$query = $query->getRow();
+		return (int) $query->ins_id;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Build a DSN from the provided parameters
+	 *
+	 * @return void
+	 */
+	protected function buildDSN()
+	{
+		if ($this->DSN !== '')
+		{
+			$this->DSN = '';
+		}
+
+		// If UNIX sockets are used, we shouldn't set a port
+		if (strpos($this->hostname, '/') !== false)
+		{
+			$this->port = '';
+		}
+
+		if ($this->hostname !== '')
+		{
+			$this->DSN = "host={$this->hostname} ";
+		}
+
+		if (! empty($this->port) && ctype_digit($this->port))
+		{
+			$this->DSN .= "port={$this->port} ";
+		}
+
+		if ($this->username !== '')
+		{
+			$this->DSN .= "user={$this->username} ";
+
+			// An empty password is valid!
+			// password must be set to null to ignore it.
+			if ($this->password !== null)
+			{
+				$this->DSN .= "password='{$this->password}' ";
+			}
+		}
+
+		if ($this->database !== '')
+		{
+			$this->DSN .= "dbname={$this->database} ";
+		}
+
+		// We don't have these options as elements in our standard configuration
+		// array, but they might be set by parse_url() if the configuration was
+		// provided via string> Example:
+		//
+		// Postgre://username:password@localhost:5432/database?connect_timeout=5&sslmode=1
+		foreach (['connect_timeout', 'options', 'sslmode', 'service'] as $key)
+		{
+			if (isset($this->{$key}) && is_string($this->{$key}) && $this->{$key} !== '')
+			{
+				$this->DSN .= "{$key}='{$this->{$key}}' ";
+			}
+		}
+
+		$this->DSN = rtrim($this->DSN);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set client encoding
+	 *
+	 * @param  string $charset The client encoding to which the data will be converted.
+	 * @return boolean
+	 */
+	protected function setClientEncoding(string $charset): bool
+	{
+		return pg_set_client_encoding($this->connID, $charset) === 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transBegin(): bool
+	{
+		return (bool) pg_query($this->connID, 'BEGIN');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transCommit(): bool
+	{
+		return (bool) pg_query($this->connID, 'COMMIT');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transRollback(): bool
+	{
+		return (bool) pg_query($this->connID, 'ROLLBACK');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Determines if a query is a "write" type.
+	 *
+	 * Overrides BaseConnection::isWriteType, adding additional read query types.
+	 *
+	 * @param  string $sql An SQL query string
+	 * @return boolean
+	 */
+	public function isWriteType($sql): bool
+	{
+		if (preg_match('#^(INSERT|UPDATE).*RETURNING\s.+(\,\s?.+)*$#is', $sql))
+		{
+			return false;
+		}
+
+		return parent::isWriteType($sql);
+	}
+
+	// --------------------------------------------------------------------
+}
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
new file mode 100644
index 0000000..ec163f4
--- /dev/null
+++ b/system/Database/Postgre/Forge.php
@@ -0,0 +1,233 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Postgre;
+
+use CodeIgniter\Database\Forge as BaseForge;
+
+/**
+ * Forge for Postgre
+ */
+class Forge extends BaseForge
+{
+	/**
+	 * CHECK DATABASE EXIST statement
+	 *
+	 * @var string
+	 */
+	protected $checkDatabaseExistStr = 'SELECT 1 FROM pg_database WHERE datname = ?';
+
+	/**
+	 * DROP CONSTRAINT statement
+	 *
+	 * @var string
+	 */
+	protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
+
+	/**
+	 * UNSIGNED support
+	 *
+	 * @var array
+	 */
+	protected $_unsigned = [
+		'INT2'     => 'INTEGER',
+		'SMALLINT' => 'INTEGER',
+		'INT'      => 'BIGINT',
+		'INT4'     => 'BIGINT',
+		'INTEGER'  => 'BIGINT',
+		'INT8'     => 'NUMERIC',
+		'BIGINT'   => 'NUMERIC',
+		'REAL'     => 'DOUBLE PRECISION',
+		'FLOAT'    => 'DOUBLE PRECISION',
+	];
+
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var string
+	 *
+	 * @internal
+	 */
+	protected $null = 'NULL';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CREATE TABLE attributes
+	 *
+	 * @param  array $attributes Associative array of table attributes
+	 * @return string
+	 */
+	protected function _createTableAttributes(array $attributes): string
+	{
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ALTER TABLE
+	 *
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $field     Column definition
+	 *
+	 * @return string|array|boolean
+	 */
+	protected function _alterTable(string $alterType, string $table, $field)
+	{
+		if (in_array($alterType, ['DROP', 'ADD'], true))
+		{
+			return parent::_alterTable($alterType, $table, $field);
+		}
+
+		$sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+		$sqls = [];
+		foreach ($field as $data)
+		{
+			if ($data['_literal'] !== false)
+			{
+				return false;
+			}
+
+			if (version_compare($this->db->getVersion(), '8', '>=') && isset($data['type']))
+			{
+				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+						. " TYPE {$data['type']}{$data['length']}";
+			}
+
+			if (! empty($data['default']))
+			{
+				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+						. " SET DEFAULT {$data['default']}";
+			}
+
+			if (isset($data['null']))
+			{
+				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+						. ($data['null'] === true ? ' DROP' : ' SET') . ' NOT NULL';
+			}
+
+			if (! empty($data['new_name']))
+			{
+				$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+						. ' TO ' . $this->db->escapeIdentifiers($data['new_name']);
+			}
+
+			if (! empty($data['comment']))
+			{
+				$sqls[] = 'COMMENT ON COLUMN' . $this->db->escapeIdentifiers($table)
+						. '.' . $this->db->escapeIdentifiers($data['name'])
+						. " IS {$data['comment']}";
+			}
+		}
+
+		return $sqls;
+	}
+
+		//--------------------------------------------------------------------
+
+	/**
+	 * Process column
+	 *
+	 * @param  array $field
+	 * @return string
+	 */
+	protected function _processColumn(array $field): string
+	{
+		return $this->db->escapeIdentifiers($field['name'])
+				. ' ' . $field['type'] . $field['length']
+				. $field['default']
+				. $field['null']
+				. $field['auto_increment']
+				. $field['unique'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute TYPE
+	 *
+	 * Performs a data type mapping between different databases.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	protected function _attributeType(array &$attributes)
+	{
+		// Reset field lengths for data types that don't support it
+		if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false)
+		{
+			$attributes['CONSTRAINT'] = null;
+		}
+
+		switch (strtoupper($attributes['TYPE']))
+		{
+			case 'TINYINT':
+				$attributes['TYPE']     = 'SMALLINT';
+				$attributes['UNSIGNED'] = false;
+				break;
+			case 'MEDIUMINT':
+				$attributes['TYPE']     = 'INTEGER';
+				$attributes['UNSIGNED'] = false;
+				break;
+			case 'DATETIME':
+				$attributes['TYPE'] = 'TIMESTAMP';
+				break;
+			default:
+				break;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute AUTO_INCREMENT
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	protected function _attributeAutoIncrement(array &$attributes, array &$field)
+	{
+		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true)
+		{
+			$field['type'] = $field['type'] === 'NUMERIC' || $field['type'] === 'BIGINT' ? 'BIGSERIAL' : 'SERIAL';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Drop Table
+	 *
+	 * Generates a platform-specific DROP TABLE string
+	 *
+	 * @param string  $table    Table name
+	 * @param boolean $ifExists Whether to add an IF EXISTS condition
+	 * @param boolean $cascade
+	 *
+	 * @return string
+	 */
+	protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
+	{
+		$sql = parent::_dropTable($table, $ifExists, $cascade);
+
+		if ($cascade === true)
+		{
+			$sql .= ' CASCADE';
+		}
+
+		return $sql;
+	}
+}
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
new file mode 100644
index 0000000..bb12cb0
--- /dev/null
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Postgre;
+
+use BadMethodCallException;
+use CodeIgniter\Database\BasePreparedQuery;
+use Exception;
+
+/**
+ * Prepared query for Postgre
+ */
+class PreparedQuery extends BasePreparedQuery
+{
+	/**
+	 * Stores the name this query can be
+	 * used under by postgres. Only used internally.
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * The result resource from a successful
+	 * pg_exec. Or false.
+	 *
+	 * @var Result|boolean
+	 */
+	protected $result;
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options Passed to the connection's prepare statement.
+	 *                        Unused in the MySQLi driver.
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function _prepare(string $sql, array $options = [])
+	{
+		$this->name = (string) random_int(1, 10000000000000000);
+
+		$sql = $this->parameterize($sql);
+
+		// Update the query object since the parameters are slightly different
+		// than what was put in.
+		$this->query->setQuery($sql);
+
+		if (! $this->statement = pg_prepare($this->db->connID, $this->name, $sql))
+		{
+			$this->errorCode   = 0;
+			$this->errorString = pg_last_error($this->db->connID);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @param array $data
+	 *
+	 * @return boolean
+	 */
+	public function _execute(array $data): bool
+	{
+		if (! isset($this->statement))
+		{
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+		}
+
+		$this->result = pg_execute($this->db->connID, $this->name, $data);
+
+		return (bool) $this->result;
+	}
+
+	/**
+	 * Returns the result object for the prepared query.
+	 *
+	 * @return mixed
+	 */
+	public function _getResult()
+	{
+		return $this->result;
+	}
+
+	/**
+	 * Replaces the ? placeholders with $1, $2, etc parameters for use
+	 * within the prepared query.
+	 *
+	 * @param string $sql
+	 *
+	 * @return string
+	 */
+	public function parameterize(string $sql): string
+	{
+		// Track our current value
+		$count = 0;
+
+		return preg_replace_callback('/\?/', function ($matches) use (&$count) {
+			$count ++;
+			return "\${$count}";
+		}, $sql);
+	}
+}
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
new file mode 100644
index 0000000..6964d7a
--- /dev/null
+++ b/system/Database/Postgre/Result.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Postgre;
+
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Entity\Entity;
+use stdClass;
+
+/**
+ * Result for Postgre
+ */
+class Result extends BaseResult
+{
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int
+	{
+		return pg_num_fields($this->resultID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		$fieldNames = [];
+		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
+		{
+			$fieldNames[] = pg_field_name($this->resultID, $i);
+		}
+
+		return $fieldNames;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array
+	{
+		$retVal = [];
+
+		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
+		{
+			$retVal[$i]             = new stdClass();
+			$retVal[$i]->name       = pg_field_name($this->resultID, $i);
+			$retVal[$i]->type       = pg_field_type_oid($this->resultID, $i);
+			$retVal[$i]->type_name  = pg_field_type($this->resultID, $i);
+			$retVal[$i]->max_length = pg_field_size($this->resultID, $i);
+			$retVal[$i]->length     = $retVal[$i]->max_length;
+			// $retVal[$i]->primary_key = (int)($fieldData[$i]->flags & 2);
+			// $retVal[$i]->default     = $fieldData[$i]->def;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	public function freeResult()
+	{
+		if (is_resource($this->resultID))
+		{
+			pg_free_result($this->resultID);
+			$this->resultID = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function dataSeek(int $n = 0)
+	{
+		return pg_result_seek($this->resultID, $n);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	protected function fetchAssoc()
+	{
+		return pg_fetch_assoc($this->resultID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object|boolean|Entity
+	 */
+	protected function fetchObject(string $className = 'stdClass')
+	{
+		if (is_subclass_of($className, Entity::class))
+		{
+			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+		}
+		return pg_fetch_object($this->resultID, null, $className);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns the number of rows in the resultID (i.e., PostgreSQL query result resource)
+	 *
+	 * @return integer The number of rows in the query result
+	 */
+	public function getNumRows(): int
+	{
+		if (! is_int($this->numRows))
+		{
+			$this->numRows = pg_num_rows($this->resultID);
+		}
+
+		return $this->numRows;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
new file mode 100644
index 0000000..7e4fcfb
--- /dev/null
+++ b/system/Database/Postgre/Utils.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Postgre;
+
+use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Utils for Postgre
+ */
+class Utils extends BaseUtils
+{
+	/**
+	 * List databases statement
+	 *
+	 * @var string
+	 */
+	protected $listDatabases = 'SELECT datname FROM pg_database';
+
+	/**
+	 * OPTIMIZE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $optimizeTable = 'REINDEX TABLE %s';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent version of the backup function.
+	 *
+	 * @param array|null $prefs
+	 *
+	 * @return mixed
+	 */
+	public function _backup(array $prefs = null)
+	{
+		throw new DatabaseException('Unsupported feature of the database platform you are using.');
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
new file mode 100644
index 0000000..e7d7e54
--- /dev/null
+++ b/system/Database/PreparedQueryInterface.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+/**
+ * Prepared query interface
+ */
+interface PreparedQueryInterface
+{
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @param array $data
+	 *
+	 * @return ResultInterface
+	 */
+	public function execute(...$data);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * @param string $sql
+	 * @param array  $options Passed to the connection's prepare statement.
+	 *
+	 * @return mixed
+	 */
+	public function prepare(string $sql, array $options = []);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Explicity closes the statement.
+	 */
+	public function close();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the SQL that has been prepared.
+	 *
+	 * @return string
+	 */
+	public function getQueryString(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error code created while executing this statement.
+	 *
+	 * @return integer
+	 */
+	public function getErrorCode(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error message created while executing this statement.
+	 *
+	 * @return string
+	 */
+	public function getErrorMessage(): string;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/Query.php b/system/Database/Query.php
new file mode 100644
index 0000000..ba84ac4
--- /dev/null
+++ b/system/Database/Query.php
@@ -0,0 +1,499 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+/**
+ * Query builder
+ */
+class Query implements QueryInterface
+{
+	/**
+	 * The query string, as provided by the user.
+	 *
+	 * @var string
+	 */
+	protected $originalQueryString;
+
+	/**
+	 * The final query string after binding, etc.
+	 *
+	 * @var string
+	 */
+	protected $finalQueryString;
+
+	/**
+	 * The binds and their values used for binding.
+	 *
+	 * @var array
+	 */
+	protected $binds = [];
+
+	/**
+	 * Bind marker
+	 *
+	 * Character used to identify values in a prepared statement.
+	 *
+	 * @var string
+	 */
+	protected $bindMarker = '?';
+
+	/**
+	 * The start time in seconds with microseconds
+	 * for when this query was executed.
+	 *
+	 * @var string|float
+	 */
+	protected $startTime;
+
+	/**
+	 * The end time in seconds with microseconds
+	 * for when this query was executed.
+	 *
+	 * @var float
+	 */
+	protected $endTime;
+
+	/**
+	 * The error code, if any.
+	 *
+	 * @var integer
+	 */
+	protected $errorCode;
+
+	/**
+	 * The error message, if any.
+	 *
+	 * @var string
+	 */
+	protected $errorString;
+
+	/**
+	 * Pointer to database connection.
+	 * Mainly for escaping features.
+	 *
+	 * @var ConnectionInterface
+	 */
+	public $db;
+
+	/**
+	 * BaseQuery constructor.
+	 *
+	 * @param ConnectionInterface $db
+	 */
+	public function __construct(ConnectionInterface &$db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Sets the raw query string to use for this statement.
+	 *
+	 * @param string  $sql
+	 * @param mixed   $binds
+	 * @param boolean $setEscape
+	 *
+	 * @return $this
+	 */
+	public function setQuery(string $sql, $binds = null, bool $setEscape = true)
+	{
+		$this->originalQueryString = $sql;
+
+		if (! is_null($binds))
+		{
+			if (! is_array($binds))
+			{
+				$binds = [$binds];
+			}
+
+			if ($setEscape)
+			{
+				array_walk($binds, function (&$item) {
+					$item = [
+						$item,
+						true,
+					];
+				});
+			}
+			$this->binds = $binds;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Will store the variables to bind into the query later.
+	 *
+	 * @param array   $binds
+	 * @param boolean $setEscape
+	 *
+	 * @return $this
+	 */
+	public function setBinds(array $binds, bool $setEscape = true)
+	{
+		if ($setEscape)
+		{
+			array_walk($binds, function (&$item) {
+				$item = [
+					$item,
+					true,
+				];
+			});
+		}
+
+		$this->binds = $binds;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the final, processed query string after binding, etal
+	 * has been performed.
+	 *
+	 * @return string
+	 */
+	public function getQuery(): string
+	{
+		if (empty($this->finalQueryString))
+		{
+			$this->finalQueryString = $this->originalQueryString;
+		}
+
+		$this->compileBinds();
+
+		return $this->finalQueryString;
+	}
+
+	/**
+	 * Records the execution time of the statement using microtime(true)
+	 * for it's start and end values. If no end value is present, will
+	 * use the current time to determine total duration.
+	 *
+	 * @param float $start
+	 * @param float $end
+	 *
+	 * @return $this
+	 */
+	public function setDuration(float $start, float $end = null)
+	{
+		$this->startTime = $start;
+
+		if (is_null($end))
+		{
+			$end = microtime(true);
+		}
+
+		$this->endTime = $end;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the start time in seconds with microseconds.
+	 *
+	 * @param boolean $returnRaw
+	 * @param integer $decimals
+	 *
+	 * @return string|float
+	 */
+	public function getStartTime(bool $returnRaw = false, int $decimals = 6)
+	{
+		if ($returnRaw)
+		{
+			return $this->startTime;
+		}
+
+		return number_format($this->startTime, $decimals);
+	}
+
+	/**
+	 * Returns the duration of this query during execution, or null if
+	 * the query has not been executed yet.
+	 *
+	 * @param integer $decimals The accuracy of the returned time.
+	 *
+	 * @return string
+	 */
+	public function getDuration(int $decimals = 6): string
+	{
+		return number_format(($this->endTime - $this->startTime), $decimals);
+	}
+
+	/**
+	 * Stores the error description that happened for this query.
+	 *
+	 * @param integer $code
+	 * @param string  $error
+	 *
+	 * @return $this
+	 */
+	public function setError(int $code, string $error)
+	{
+		$this->errorCode   = $code;
+		$this->errorString = $error;
+
+		return $this;
+	}
+
+	/**
+	 * Reports whether this statement created an error not.
+	 *
+	 * @return boolean
+	 */
+	public function hasError(): bool
+	{
+		return ! empty($this->errorString);
+	}
+
+	/**
+	 * Returns the error code created while executing this statement.
+	 *
+	 * @return integer
+	 */
+	public function getErrorCode(): int
+	{
+		return $this->errorCode;
+	}
+
+	/**
+	 * Returns the error message created while executing this statement.
+	 *
+	 * @return string
+	 */
+	public function getErrorMessage(): string
+	{
+		return $this->errorString;
+	}
+
+	/**
+	 * Determines if the statement is a write-type query or not.
+	 *
+	 * @return boolean
+	 */
+	public function isWriteType(): bool
+	{
+		return $this->db->isWriteType($this->originalQueryString);
+	}
+
+	/**
+	 * Swaps out one table prefix for a new one.
+	 *
+	 * @param string $orig
+	 * @param string $swap
+	 *
+	 * @return $this
+	 */
+	public function swapPrefix(string $orig, string $swap)
+	{
+		$sql = empty($this->finalQueryString) ? $this->originalQueryString : $this->finalQueryString;
+
+		$this->finalQueryString = preg_replace('/(\W)' . $orig . '(\S+?)/', '\\1' . $swap . '\\2', $sql);
+
+		return $this;
+	}
+
+	/**
+	 * Returns the original SQL that was passed into the system.
+	 *
+	 * @return string
+	 */
+	public function getOriginalQuery(): string
+	{
+		return $this->originalQueryString;
+	}
+
+	/**
+	 * Escapes and inserts any binds into the finalQueryString object.
+	 *
+	 * @return void
+	 *
+	 * @see https://regex101.com/r/EUEhay/4
+	 */
+	protected function compileBinds()
+	{
+		$sql = $this->finalQueryString;
+
+		$hasNamedBinds = preg_match('/:((?!=).+):/', $sql) === 1;
+
+		if (empty($this->binds)
+			|| empty($this->bindMarker)
+			|| (! $hasNamedBinds && strpos($sql, $this->bindMarker) === false)
+		)
+		{
+			return;
+		}
+
+		if (! is_array($this->binds))
+		{
+			$binds     = [$this->binds];
+			$bindCount = 1;
+		}
+		else
+		{
+			$binds     = $this->binds;
+			$bindCount = count($binds);
+		}
+
+		// Reverse the binds so that duplicate named binds
+		// will be processed prior to the original binds.
+		if (! is_numeric(key(array_slice($binds, 0, 1))))
+		{
+			$binds = array_reverse($binds);
+		}
+
+		// We'll need marker length later
+		$ml = strlen($this->bindMarker);
+
+		$sql = $hasNamedBinds ? $this->matchNamedBinds($sql, $binds) : $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
+
+		$this->finalQueryString = $sql;
+	}
+
+	/**
+	 * Match bindings
+	 *
+	 * @param  string $sql
+	 * @param  array  $binds
+	 * @return string
+	 */
+	protected function matchNamedBinds(string $sql, array $binds): string
+	{
+		$replacers = [];
+
+		foreach ($binds as $placeholder => $value)
+		{
+			// $value[1] contains the boolean whether should be escaped or not
+			$escapedValue = $value[1] ? $this->db->escape($value[0]) : $value[0];
+
+			// In order to correctly handle backlashes in saved strings
+			// we will need to preg_quote, so remove the wrapping escape characters
+			// otherwise it will get escaped.
+			if (is_array($value[0]))
+			{
+				$escapedValue = '(' . implode(',', $escapedValue) . ')';
+			}
+
+			$replacers[":{$placeholder}:"] = $escapedValue;
+		}
+
+		return strtr($sql, $replacers);
+	}
+
+	/**
+	 * Match bindings
+	 *
+	 * @param  string  $sql
+	 * @param  array   $binds
+	 * @param  integer $bindCount
+	 * @param  integer $ml
+	 * @return string
+	 */
+	protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, int $ml): string
+	{
+		// Make sure not to replace a chunk inside a string that happens to match the bind marker
+		if ($c = preg_match_all("/'[^']*'/", $sql, $matches))
+		{
+			$c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', str_replace($matches[0], str_replace($this->bindMarker, str_repeat(' ', $ml), $matches[0]), $sql, $c), $matches, PREG_OFFSET_CAPTURE);
+
+			// Bind values' count must match the count of markers in the query
+			if ($bindCount !== $c)
+			{
+				return $sql;
+			}
+		}
+		// Number of binds must match bindMarkers in the string.
+		elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount)
+		{
+			return $sql;
+		}
+
+		do
+		{
+			$c--;
+			$escapedValue = $binds[$c][1] ? $this->db->escape($binds[$c][0]) : $binds[$c][0];
+			if (is_array($escapedValue))
+			{
+				$escapedValue = '(' . implode(',', $escapedValue) . ')';
+			}
+			$sql = substr_replace($sql, $escapedValue, $matches[0][$c][1], $ml);
+		}
+		while ($c !== 0);
+
+		return $sql;
+	}
+
+	/**
+	 * Returns string to display in debug toolbar
+	 *
+	 * @return string
+	 */
+	public function debugToolbarDisplay(): string
+	{
+		// Key words we want bolded
+		static $highlight = [
+			'SELECT',
+			'DISTINCT',
+			'FROM',
+			'WHERE',
+			'AND',
+			'LEFT&nbsp;JOIN',
+			'RIGHT&nbsp;JOIN',
+			'JOIN',
+			'ORDER&nbsp;BY',
+			'GROUP&nbsp;BY',
+			'LIMIT',
+			'INSERT',
+			'INTO',
+			'VALUES',
+			'UPDATE',
+			'OR&nbsp;',
+			'HAVING',
+			'OFFSET',
+			'NOT&nbsp;IN',
+			'IN',
+			'LIKE',
+			'NOT&nbsp;LIKE',
+			'COUNT',
+			'MAX',
+			'MIN',
+			'ON',
+			'AS',
+			'AVG',
+			'SUM',
+			'(',
+			')',
+		];
+
+		if (empty($this->finalQueryString))
+		{
+			$this->compileBinds(); // @codeCoverageIgnore
+		}
+
+		$sql = $this->finalQueryString;
+
+		foreach ($highlight as $term)
+		{
+			$sql = str_replace($term, '<strong>' . $term . '</strong>', $sql);
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * Return text representation of the query
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->getQuery();
+	}
+}
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
new file mode 100644
index 0000000..af52d40
--- /dev/null
+++ b/system/Database/QueryInterface.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+/**
+ * Interface QueryInterface
+ *
+ * Represents a single statement that can be executed against the database.
+ * Statements are platform-specific and can handle binding of binds.
+ */
+interface QueryInterface
+{
+	/**
+	 * Sets the raw query string to use for this statement.
+	 *
+	 * @param string  $sql
+	 * @param mixed   $binds
+	 * @param boolean $setEscape
+	 *
+	 * @return mixed
+	 */
+	public function setQuery(string $sql, $binds = null, bool $setEscape = true);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the final, processed query string after binding, etal
+	 * has been performed.
+	 *
+	 * @return mixed
+	 */
+	public function getQuery();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Records the execution time of the statement using microtime(true)
+	 * for it's start and end values. If no end value is present, will
+	 * use the current time to determine total duration.
+	 *
+	 * @param float $start
+	 * @param float $end
+	 *
+	 * @return mixed
+	 */
+	public function setDuration(float $start, float $end = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the duration of this query during execution, or null if
+	 * the query has not been executed yet.
+	 *
+	 * @param integer $decimals The accuracy of the returned time.
+	 *
+	 * @return string
+	 */
+	public function getDuration(int $decimals = 6): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores the error description that happened for this query.
+	 *
+	 * @param integer $code
+	 * @param string  $error
+	 */
+	public function setError(int $code, string $error);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reports whether this statement created an error not.
+	 *
+	 * @return boolean
+	 */
+	public function hasError(): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error code created while executing this statement.
+	 *
+	 * @return integer
+	 */
+	public function getErrorCode(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error message created while executing this statement.
+	 *
+	 * @return string
+	 */
+	public function getErrorMessage(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the statement is a write-type query or not.
+	 *
+	 * @return boolean
+	 */
+	public function isWriteType(): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Swaps out one table prefix for a new one.
+	 *
+	 * @param string $orig
+	 * @param string $swap
+	 *
+	 * @return mixed
+	 */
+	public function swapPrefix(string $orig, string $swap);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
new file mode 100644
index 0000000..f28c412
--- /dev/null
+++ b/system/Database/ResultInterface.php
@@ -0,0 +1,235 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+/**
+ * Interface ResultInterface
+ */
+interface ResultInterface
+{
+	/**
+	 * Retrieve the results of the query. Typically an array of
+	 * individual data rows, which can be either an 'array', an
+	 * 'object', or a custom class name.
+	 *
+	 * @param string $type The row type. Either 'array', 'object', or a class name to use
+	 *
+	 * @return array
+	 */
+	public function getResult(string $type = 'object'): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the results as an array of custom objects.
+	 *
+	 * @param string $className The name of the class to use.
+	 *
+	 * @return mixed
+	 */
+	public function getCustomResultObject(string $className);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the results as an array of arrays.
+	 *
+	 * If no results, an empty array is returned.
+	 *
+	 * @return array
+	 */
+	public function getResultArray(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the results as an array of objects.
+	 *
+	 * If no results, an empty array is returned.
+	 *
+	 * @return array
+	 */
+	public function getResultObject(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrapper object to return a row as either an array, an object, or
+	 * a custom class.
+	 *
+	 * If row doesn't exist, returns null.
+	 *
+	 * @param mixed  $n    The index of the results to return
+	 * @param string $type The type of result object. 'array', 'object' or class name.
+	 *
+	 * @return mixed
+	 */
+	public function getRow($n = 0, string $type = 'object');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a row as a custom class instance.
+	 *
+	 * If row doesn't exists, returns null.
+	 *
+	 * @param integer $n
+	 * @param string  $className
+	 *
+	 * @return mixed
+	 */
+	public function getCustomRowObject(int $n, string $className);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single row from the results as an array.
+	 *
+	 * If row doesn't exist, returns null.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function getRowArray(int $n = 0);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single row from the results as an object.
+	 *
+	 * If row doesn't exist, returns null.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function getRowObject(int $n = 0);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Assigns an item into a particular column slot.
+	 *
+	 * @param string $key
+	 * @param null   $value
+	 *
+	 * @return mixed
+	 */
+	public function setRow($key, $value = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "first" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getFirstRow(string $type = 'object');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "last" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getLastRow(string $type = 'object');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "next" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getNextRow(string $type = 'object');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the "previous" row of the current results.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getPreviousRow(string $type = 'object');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an unbuffered row and move the pointer to the next row.
+	 *
+	 * @param string $type
+	 *
+	 * @return mixed
+	 */
+	public function getUnbufferedRow(string $type = 'object');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	public function freeResult();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function dataSeek(int $n = 0);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
new file mode 100644
index 0000000..07142bb
--- /dev/null
+++ b/system/Database/SQLSRV/Builder.php
@@ -0,0 +1,775 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use Closure;
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Database\ResultInterface;
+
+/**
+ * Builder for SQLSRV
+ *
+ * @todo auto check for TextCastToInt
+ * @todo auto check for InsertIndexValue
+ * @todo replace: delete index entries before insert
+ */
+class Builder extends BaseBuilder
+{
+	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'NEWID()',
+		'RAND(%d)',
+	];
+
+	/**
+	 * Quoted identifier flag
+	 *
+	 * Whether to use SQL-92 standard quoted identifier
+	 * (double quotes) or brackets for identifier escaping.
+	 *
+	 * @var boolean
+	 */
+	protected $_quoted_identifier = true;
+
+	/**
+	 * Handle increment/decrement on text
+	 *
+	 * @var boolean
+	 */
+	public $castTextToInt = true;
+
+	/**
+	 * Handle IDENTITY_INSERT property/
+	 *
+	 * @var boolean
+	 */
+	public $keyPermission = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * FROM tables
+	 *
+	 * Groups tables in FROM clauses if needed, so there is no confusion
+	 * about operator precedence.
+	 *
+	 * @return string
+	 */
+	protected function _fromTables(): string
+	{
+		$from = [];
+		foreach ($this->QBFrom as $value)
+		{
+			$from[] = $this->getFullName($value);
+		}
+
+		return implode(', ', $from);
+	}
+
+	/**
+	 * Truncate statement
+	 *
+	 * Generates a platform-specific truncate string from the supplied data
+	 *
+	 * If the database does not support the truncate() command,
+	 * then this method maps to 'DELETE FROM table'
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _truncate(string $table): string
+	{
+		return 'TRUNCATE TABLE ' . $this->getFullName($table);
+	}
+
+	/**
+	 * JOIN
+	 *
+	 * Generates the JOIN portion of the query
+	 *
+	 * @param string  $table
+	 * @param string  $cond   The join condition
+	 * @param string  $type   The type of join
+	 * @param boolean $escape Whether not to try to escape identifiers
+	 *
+	 * @return $this
+	 */
+	public function join(string $table, string $cond, string $type = '', bool $escape = null)
+	{
+		if ($type !== '')
+		{
+			$type = strtoupper(trim($type));
+
+			if (! in_array($type, $this->joinTypes, true))
+			{
+				$type = '';
+			}
+			else
+			{
+				$type .= ' ';
+			}
+		}
+
+		// Extract any aliases that might exist. We use this information
+		// in the protectIdentifiers to know whether to add a table prefix
+		$this->trackAliases($table);
+
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		if (! $this->hasOperator($cond))
+		{
+			$cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
+		}
+		elseif ($escape === false)
+		{
+			$cond = ' ON ' . $cond;
+		}
+		else
+		{
+			// Split multiple conditions
+			if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE))
+			{
+				$conditions = [];
+				$joints     = $joints[0];
+				array_unshift($joints, ['', 0]);
+
+				for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i --)
+				{
+					$joints[$i][1] += strlen($joints[$i][0]); // offset
+					$conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
+					$pos            = $joints[$i][1] - strlen($joints[$i][0]);
+					$joints[$i]     = $joints[$i][0];
+				}
+				ksort($conditions);
+			}
+			else
+			{
+				$conditions = [$cond];
+				$joints     = [''];
+			}
+
+			$cond = ' ON ';
+			foreach ($conditions as $i => $condition)
+			{
+				$operator = $this->getOperator($condition);
+
+				$cond .= $joints[$i];
+				$cond .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+			}
+		}
+
+		// Do we want to escape the table name?
+		if ($escape === true)
+		{
+			$table = $this->db->protectIdentifiers($table, true, null, false);
+		}
+
+		// Assemble the JOIN statement
+		$this->QBJoin[] = $join = $type . 'JOIN ' . $this->getFullName($table) . $cond;
+
+		return $this;
+	}
+
+	/**
+	 * Insert statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 * auto-enable
+	 *
+	 * @todo implement check for this instad static $insertKeyPermission
+	 *
+	 * @param string $table         The table name
+	 * @param array  $keys          The insert keys
+	 * @param array  $unescapedKeys The insert values
+	 *
+	 * @return string
+	 */
+	protected function _insert(string $table, array $keys, array $unescapedKeys): string
+	{
+		$fullTableName = $this->getFullName($table);
+
+		// insert statement
+		$statement = 'INSERT INTO ' . $fullTableName . ' (' . implode(',', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
+
+		return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
+	}
+
+	/**
+	 * Update statement
+	 *
+	 * Generates a platform-specific update string from the supplied data
+	 *
+	 * @param string $table  the Table name
+	 * @param array  $values the Update data
+	 *
+	 * @return string
+	 */
+	protected function _update(string $table, array $values): string
+	{
+		$valstr = [];
+
+		foreach ($values as $key => $val)
+		{
+			$valstr[] = $key . ' = ' . $val;
+		}
+
+		$fullTableName = $this->getFullName($table);
+
+		$statement = 'UPDATE ' . (empty($this->QBLimit) ? '' : 'TOP(' . $this->QBLimit . ') ') . $fullTableName . ' SET '
+				. implode(', ', $valstr) . $this->compileWhereHaving('QBWhere') . $this->compileOrderBy();
+
+		return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
+	}
+
+	/**
+	 * Increments a numeric column by the specified value.
+	 *
+	 * @param string  $column
+	 * @param integer $value
+	 *
+	 * @return boolean
+	 */
+	public function increment(string $column, int $value = 1)
+	{
+		$column = $this->db->protectIdentifiers($column);
+
+		if ($this->castTextToInt)
+		{
+			$values = [$column => "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) + {$value})"];
+		}
+		else
+		{
+			$values = [$column => "{$column} + {$value}"];
+		}
+		$sql = $this->_update($this->QBFrom[0], $values);
+
+		return $this->db->query($sql, $this->binds, false);
+	}
+
+	/**
+	 * Decrements a numeric column by the specified value.
+	 *
+	 * @param string  $column
+	 * @param integer $value
+	 *
+	 * @return boolean
+	 */
+	public function decrement(string $column, int $value = 1)
+	{
+		$column = $this->db->protectIdentifiers($column);
+
+		if ($this->castTextToInt)
+		{
+			$values = [$column => "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) - {$value})"];
+		}
+		else
+		{
+			$values = [$column => "{$column} + {$value}"];
+		}
+		$sql = $this->_update($this->QBFrom[0], $values);
+
+		return $this->db->query($sql, $this->binds, false);
+	}
+
+	/**
+	 * Get full name of the table
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	private function getFullName(string $table): string
+	{
+		$alias = '';
+
+		if (strpos($table, ' ') !== false)
+		{
+			$alias = explode(' ', $table);
+			$table = array_shift($alias);
+			$alias = ' ' . implode(' ', $alias);
+		}
+
+		if ($this->db->escapeChar === '"')
+		{
+			return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias;
+		}
+
+		return '[' . $this->db->getDatabase() . '].[' . $this->db->schema . '].[' . str_replace('"', '', $table) . ']' . str_replace('"', '', $alias);
+	}
+
+	/**
+	 * Add permision statements for index value inserts
+	 *
+	 * @param string $fullTable full table name
+	 * @param string $insert    statement
+	 *
+	 * @return string
+	 */
+	private function addIdentity(string $fullTable, string $insert): string
+	{
+		return 'SET IDENTITY_INSERT ' . $fullTable . " ON\n" . $insert . "\nSET IDENTITY_INSERT " . $fullTable . ' OFF';
+	}
+
+	/**
+	 * Local implementation of limit
+	 *
+	 * @param string  $sql
+	 * @param boolean $offsetIgnore
+	 *
+	 * @return string
+	 */
+	protected function _limit(string $sql, bool $offsetIgnore = false): string
+	{
+		if (empty($this->QBOrderBy))
+		{
+			$sql .= ' ORDER BY (SELECT NULL) ';
+		}
+
+		if ($offsetIgnore)
+		{
+			$sql .= ' OFFSET 0 ';
+		}
+		else
+		{
+			$sql .= is_int($this->QBOffset) ? ' OFFSET ' . $this->QBOffset : ' OFFSET 0 ';
+		}
+
+		return $sql .= ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY ';
+	}
+
+	/**
+	 * Replace
+	 *
+	 * Compiles a replace into string and runs the query
+	 *
+	 * @param array|null $set An associative array of insert values
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function replace(array $set = null)
+	{
+		if ($set !== null)
+		{
+			$this->set($set);
+		}
+
+		if (empty($this->QBSet))
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('You must use the "set" method to update an entry.');
+			}
+
+			return false; // @codeCoverageIgnore
+		}
+
+		$table = $this->QBFrom[0];
+
+		$sql = $this->_replace($table, array_keys($this->QBSet), array_values($this->QBSet));
+
+		$this->resetWrite();
+
+		if ($this->testMode)
+		{
+			return $sql;
+		}
+
+		$this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' ON');
+		$result = $this->db->query($sql, $this->binds, false);
+		$this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' OFF');
+
+		return $result;
+	}
+
+	/**
+	 * Replace statement
+	 *
+	 * Generates a platform-specific replace string from the supplied data
+	 *
+	 * on match delete and insert
+	 *
+	 * @param string $table  The table name
+	 * @param array  $keys   The insert keys
+	 * @param array  $values The insert values
+	 *
+	 * @return string
+	 */
+	protected function _replace(string $table, array $keys, array $values): string
+	{
+		// check whether the existing keys are part of the primary key.
+		// if so then use them for the "ON" part and exclude them from the $values and $keys
+		$pKeys     = $this->db->getIndexData($table);
+		$keyFields = [];
+
+		foreach ($pKeys as $key)
+		{
+			if ($key->type === 'PRIMARY')
+			{
+				$keyFields = array_merge($keyFields, $key->fields);
+			}
+
+			if ($key->type === 'UNIQUE')
+			{
+				$keyFields = array_merge($keyFields, $key->fields);
+			}
+		}
+
+		// Get the unique field names
+		$escKeyFields = array_map(function (string $field): string {
+			return $this->db->protectIdentifiers($field);
+		}, array_values(array_unique($keyFields)));
+
+		// Get the binds
+		$binds = $this->binds;
+		array_walk($binds, function (&$item) {
+			$item = $item[0];
+		});
+
+		// Get the common field and values from the keys data and index fields
+		$common = array_intersect($keys, $escKeyFields);
+		$bingo  = [];
+
+		foreach ($common as $v)
+		{
+			$k = array_search($v, $escKeyFields, true);
+
+			$bingo[$keyFields[$k]] = $binds[trim($values[$k], ':')];
+		}
+
+		// Querying existing data
+		$builder = $this->db->table($table);
+
+		foreach ($bingo as $k => $v)
+		{
+			$builder->where($k, $v);
+		}
+
+		$q = $builder->get()->getResult();
+
+		// Delete entries if we find them
+		if ($q !== [])
+		{
+			$delete = $this->db->table($table);
+
+			foreach ($bingo as $k => $v)
+			{
+				$delete->where($k, $v);
+			}
+
+			$delete->delete();
+		}
+
+		return sprintf('INSERT INTO %s (%s) VALUES (%s);', $this->getFullName($table), implode(',', $keys), implode(',', $values));
+	}
+
+	/**
+	 * SELECT [MAX|MIN|AVG|SUM|COUNT]()
+	 *
+	 * Handle float return value
+	 *
+	 * @param string $select Field name
+	 * @param string $alias
+	 * @param string $type
+	 *
+	 * @return BaseBuilder
+	 */
+	protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
+	{
+		// int functions can be handled by parent
+		if ($type !== 'AVG')
+		{
+			return parent::maxMinAvgSum($select, $alias, $type);
+		}
+
+		if ($select === '')
+		{
+			throw DataException::forEmptyInputGiven('Select');
+		}
+
+		if (strpos($select, ',') !== false)
+		{
+			throw DataException::forInvalidArgument('Column name not separated by comma');
+		}
+
+		if ($alias === '')
+		{
+			$alias = $this->createAliasFromTable(trim($select));
+		}
+
+		$sql = $type . '( CAST( ' . $this->db->protectIdentifiers(trim($select)) . ' AS FLOAT ) ) AS ' . $this->db->escapeIdentifiers(trim($alias));
+
+		$this->QBSelect[]   = $sql;
+		$this->QBNoEscape[] = null;
+
+		return $this;
+	}
+
+	/**
+	 * Delete statement
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _delete(string $table): string
+	{
+		return 'DELETE' . (empty($this->QBLimit) ? '' : ' TOP (' . $this->QBLimit . ') ') . ' FROM ' . $this->getFullName($table) . $this->compileWhereHaving('QBWhere');
+	}
+
+	/**
+	 * Delete
+	 *
+	 * Compiles a delete string and runs the query
+	 *
+	 * @param mixed   $where     The where clause
+	 * @param integer $limit     The limit clause
+	 * @param boolean $resetData
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function delete($where = '', int $limit = null, bool $resetData = true)
+	{
+		$table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
+
+		if ($where !== '')
+		{
+			$this->where($where);
+		}
+
+		if (empty($this->QBWhere))
+		{
+			if (CI_DEBUG)
+			{
+				throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
+			}
+
+			return false; // @codeCoverageIgnore
+		}
+
+		if (! empty($limit))
+		{
+			$this->QBLimit = $limit;
+		}
+
+		$sql = $this->_delete($table);
+
+		if ($resetData)
+		{
+			$this->resetWrite();
+		}
+
+		return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
+	}
+
+	/**
+	 * Compile the SELECT statement
+	 *
+	 * Generates a query string based on which functions were used.
+	 *
+	 * @param mixed $selectOverride
+	 *
+	 * @return string
+	 */
+	protected function compileSelect($selectOverride = false): string
+	{
+		// Write the "select" portion of the query
+		if ($selectOverride !== false)
+		{
+			$sql = $selectOverride;
+		}
+		else
+		{
+			$sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+
+			// SQL Server can't work with select * if group by is specified
+			if (empty($this->QBSelect) && ! empty($this->QBGroupBy) && is_array($this->QBGroupBy))
+			{
+				foreach ($this->QBGroupBy as $field)
+				{
+					$this->QBSelect[] = is_array($field) ? $field['field'] : $field;
+				}
+			}
+
+			if (empty($this->QBSelect))
+			{
+				$sql .= '*';
+			}
+			else
+			{
+				// Cycle through the "select" portion of the query and prep each column name.
+				// The reason we protect identifiers here rather than in the select() function
+				// is because until the user calls the from() function we don't know if there are aliases
+				foreach ($this->QBSelect as $key => $val)
+				{
+					$noEscape             = $this->QBNoEscape[$key] ?? null;
+					$this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
+				}
+
+				$sql .= implode(', ', $this->QBSelect);
+			}
+		}
+
+		// Write the "FROM" portion of the query
+		if (! empty($this->QBFrom))
+		{
+			$sql .= "\nFROM " . $this->_fromTables();
+		}
+
+		// Write the "JOIN" portion of the query
+		if (! empty($this->QBJoin))
+		{
+			$sql .= "\n" . implode("\n", $this->QBJoin);
+		}
+
+		$sql .= $this->compileWhereHaving('QBWhere')
+				. $this->compileGroupBy()
+				. $this->compileWhereHaving('QBHaving')
+				. $this->compileOrderBy(); // ORDER BY
+		// LIMIT
+		if ($this->QBLimit)
+		{
+			return $sql = $this->_limit($sql . "\n");
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * WHERE, HAVING
+	 *
+	 * @param string  $qbKey  'QBWhere' or 'QBHaving'
+	 * @param mixed   $key
+	 * @param mixed   $value
+	 * @param string  $type
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
+	{
+		if (! is_array($key))
+		{
+			$key = [$key => $value];
+		}
+
+		// If the escape value was not set will base it on the global setting
+		if (! is_bool($escape))
+		{
+			$escape = $this->db->protectIdentifiers;
+		}
+
+		foreach ($key as $k => $v)
+		{
+			$prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
+
+			if ($v !== null)
+			{
+				$op = $this->getOperator($k, true);
+
+				if (! empty($op))
+				{
+					$k = trim($k);
+
+					end($op);
+
+					$op = trim(current($op));
+
+					if (substr($k, -1 * strlen($op)) === $op)
+					{
+						$k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
+					}
+				}
+
+				$bind = $this->setBind($k, $v, $escape);
+
+				if (empty($op))
+				{
+					$k .= ' =';
+				}
+				else
+				{
+					$k .= " $op";
+				}
+
+				if ($v instanceof Closure)
+				{
+					$builder = $this->cleanClone();
+					$v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
+				}
+				else
+				{
+					$v = " :$bind:";
+				}
+			}
+			elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving')
+			{
+				// value appears not to have been set, assign the test to IS NULL
+				$k .= ' IS NULL';
+			}
+			elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
+			{
+				$k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
+			}
+
+			$this->{$qbKey}[] = [
+				'condition' => $prefix . $k . $v,
+				'escape'    => $escape,
+			];
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get
+	 *
+	 * Compiles the select statement based on the other functions called
+	 * and runs the query
+	 *
+	 * @param integer $limit  The limit clause
+	 * @param integer $offset The offset clause
+	 * @param boolean $reset  Are we want to clear query builder values?
+	 *
+	 * @return ResultInterface
+	 */
+	public function get(int $limit = null, int $offset = 0, bool $reset = true)
+	{
+		if (! is_null($limit))
+		{
+			$this->limit($limit, $offset);
+		}
+
+		$result = $this->testMode ? $this->getCompiledSelect($reset) : $this->db->query($this->compileSelect(), $this->binds, false);
+
+		if ($reset)
+		{
+			$this->resetSelect();
+
+			// Clear our binds so we don't eat up memory
+			$this->binds = [];
+		}
+
+		return $result;
+	}
+}
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
new file mode 100644
index 0000000..0e039a0
--- /dev/null
+++ b/system/Database/SQLSRV/Connection.php
@@ -0,0 +1,605 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use Exception;
+use stdClass;
+
+/**
+ * Connection for SQLSRV
+ */
+class Connection extends BaseConnection
+{
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	public $DBDriver = 'SQLSRV';
+
+	/**
+	 * Database name
+	 *
+	 * @var string
+	 */
+	public $database;
+
+	/**
+	 * Scrollable flag
+	 *
+	 * Determines what cursor type to use when executing queries.
+	 *
+	 * FALSE or SQLSRV_CURSOR_FORWARD would increase performance,
+	 * but would disable num_rows() (and possibly insert_id())
+	 *
+	 * @var mixed
+	 */
+	public $scrollable;
+
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	public $escapeChar = '"';
+
+	/**
+	 * Database schema
+	 *
+	 * @var string
+	 */
+	public $schema = 'dbo';
+
+	/**
+	 * Quoted identifier flag
+	 *
+	 * Whether to use SQL-92 standard quoted identifier
+	 * (double quotes) or brackets for identifier escaping.
+	 *
+	 * @var boolean
+	 */
+	protected $_quoted_identifier = true;
+
+	/**
+	 * List of reserved identifiers
+	 *
+	 * Identifiers that must NOT be escaped.
+	 *
+	 * @var string[]
+	 */
+	protected $_reserved_identifiers = ['*'];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Class constructor
+	 *
+	 * @param  array $params
+	 * @return void
+	 */
+	public function __construct($params)
+	{
+		parent::__construct($params);
+
+		// This is only supported as of SQLSRV 3.0
+		if ($this->scrollable === null)
+		{
+			$this->scrollable = defined('SQLSRV_CURSOR_CLIENT_BUFFERED') ? SQLSRV_CURSOR_CLIENT_BUFFERED : false;
+		}
+	}
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param boolean $persistent
+	 *
+	 * @throws DatabaseException
+	 *
+	 * @return mixed
+	 */
+	public function connect(bool $persistent = false)
+	{
+		$charset = in_array(strtolower($this->charset), ['utf-8', 'utf8'], true) ? 'UTF-8' : SQLSRV_ENC_CHAR;
+
+		$connection = [
+			'UID'                  => empty($this->username) ? '' : $this->username,
+			'PWD'                  => empty($this->password) ? '' : $this->password,
+			'Database'             => $this->database,
+			'ConnectionPooling'    => $persistent ? 1 : 0,
+			'CharacterSet'         => $charset,
+			'Encrypt'              => $this->encrypt === true ? 1 : 0,
+			'ReturnDatesAsStrings' => 1,
+		];
+
+		// If the username and password are both empty, assume this is a
+		// 'Windows Authentication Mode' connection.
+		if (empty($connection['UID']) && empty($connection['PWD']))
+		{
+			unset($connection['UID'], $connection['PWD']);
+		}
+
+		sqlsrv_configure('WarningsReturnAsErrors', 0);
+		$this->connID = sqlsrv_connect($this->hostname, $connection);
+
+		if ($this->connID !== false)
+		{
+			// Determine how identifiers are escaped
+			$query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi');
+			$query = $query->getResultObject();
+
+			$this->_quoted_identifier = empty($query) ? false : (bool) $query[0]->qi;
+			$this->escapeChar         = ($this->_quoted_identifier) ? '"' : ['[', ']'];
+
+			return $this->connID;
+		}
+
+		$errors = [];
+
+		foreach (sqlsrv_errors(SQLSRV_ERR_ERRORS) as $error)
+		{
+			$errors[] = preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
+		}
+
+		throw new DatabaseException(implode("\n", $errors));
+	}
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return void
+	 */
+	public function reconnect()
+	{
+		$this->close();
+		$this->initialize();
+	}
+
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	protected function _close()
+	{
+		sqlsrv_close($this->connID);
+	}
+
+	/**
+	 * Platform-dependant string escape
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	protected function _escapeString(string $str): string
+	{
+		return str_replace("'", "''", remove_invisible_characters($str, false));
+	}
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer
+	 */
+	public function insertID(): int
+	{
+		return $this->query('SELECT SCOPE_IDENTITY() AS insert_id')->getRow()->insert_id ?? 0;
+	}
+
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 *
+	 * @param boolean $prefixLimit
+	 *
+	 * @return string
+	 */
+	protected function _listTables(bool $prefixLimit = false): string
+	{
+		$sql = 'SELECT [TABLE_NAME] AS "name"'
+				. ' FROM [INFORMATION_SCHEMA].[TABLES] '
+				. ' WHERE '
+				. " [TABLE_SCHEMA] = '" . $this->schema . "'    ";
+
+		if ($prefixLimit === true && $this->DBPrefix !== '')
+		{
+			$sql .= " AND [TABLE_NAME] LIKE '" . $this->escapeLikeString($this->DBPrefix) . "%' "
+					. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function _listColumns(string $table = ''): string
+	{
+		return 'SELECT [COLUMN_NAME] '
+				. ' FROM [INFORMATION_SCHEMA].[COLUMNS]'
+				. ' WHERE  [TABLE_NAME] = ' . $this->escape($this->DBPrefix . $table)
+				. ' AND [TABLE_SCHEMA] = ' . $this->escape($this->schema);
+	}
+
+	/**
+	 * Returns an array of objects with index data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _indexData(string $table): array
+	{
+		$sql = 'EXEC sp_helpindex ' . $this->escape($table);
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetIndexData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj       = new stdClass();
+			$obj->name = $row->index_name;
+
+			$_fields     = explode(',', trim($row->index_keys));
+			$obj->fields = array_map(function ($v) {
+				return trim($v);
+			}, $_fields);
+
+			if (strpos($row->index_description, 'primary key located on') !== false)
+			{
+				$obj->type = 'PRIMARY';
+			}
+			else
+			{
+				$obj->type = (strpos($row->index_description, 'nonclustered, unique') !== false) ? 'UNIQUE' : 'INDEX';
+			}
+
+			$retVal[$obj->name] = $obj;
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Returns an array of objects with Foreign key data
+	 * referenced_object_id  parent_object_id
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _foreignKeyData(string $table): array
+	{
+		$sql = 'SELECT '
+				. 'f.name as constraint_name, '
+				. 'OBJECT_NAME (f.parent_object_id) as table_name, '
+				. 'COL_NAME(fc.parent_object_id,fc.parent_column_id) column_name, '
+				. 'OBJECT_NAME(f.referenced_object_id) foreign_table_name, '
+				. 'COL_NAME(fc.referenced_object_id,fc.referenced_column_id) foreign_column_name '
+				. 'FROM  '
+				. 'sys.foreign_keys AS f '
+				. 'INNER JOIN  '
+				. 'sys.foreign_key_columns AS fc  '
+				. 'ON f.OBJECT_ID = fc.constraint_object_id '
+				. 'INNER JOIN  '
+				. 'sys.tables t  '
+				. 'ON t.OBJECT_ID = fc.referenced_object_id '
+				. 'WHERE  '
+				. 'OBJECT_NAME (f.parent_object_id) = ' . $this->escape($table);
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj                      = new stdClass();
+			$obj->constraint_name     = $row->constraint_name;
+			$obj->table_name          = $row->table_name;
+			$obj->column_name         = $row->column_name;
+			$obj->foreign_table_name  = $row->foreign_table_name;
+			$obj->foreign_column_name = $row->foreign_column_name;
+			$retVal[]                 = $obj;
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Disables foreign key checks temporarily.
+	 *
+	 * @return string
+	 */
+	protected function _disableForeignKeyChecks()
+	{
+		return 'EXEC sp_MSforeachtable "ALTER TABLE ? NOCHECK CONSTRAINT ALL"';
+	}
+
+	/**
+	 * Enables foreign key checks temporarily.
+	 *
+	 * @return string
+	 */
+	protected function _enableForeignKeyChecks()
+	{
+		return 'EXEC sp_MSforeachtable "ALTER TABLE ? WITH CHECK CHECK CONSTRAINT ALL"';
+	}
+
+	/**
+	 * Returns an array of objects with field data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _fieldData(string $table): array
+	{
+		$sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, COLUMN_DEFAULT
+			FROM INFORMATION_SCHEMA.COLUMNS
+			WHERE TABLE_NAME= ' . $this->escape(($table));
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetFieldData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		for ($i = 0, $c = count($query); $i < $c; $i++)
+		{
+			$retVal[$i]             = new stdClass();
+			$retVal[$i]->name       = $query[$i]->COLUMN_NAME;
+			$retVal[$i]->type       = $query[$i]->DATA_TYPE;
+			$retVal[$i]->default    = $query[$i]->COLUMN_DEFAULT;
+			$retVal[$i]->max_length = $query[$i]->CHARACTER_MAXIMUM_LENGTH > 0 ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION;
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transBegin(): bool
+	{
+		return (bool) sqlsrv_begin_transaction($this->connID);
+	}
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transCommit(): bool
+	{
+		return (bool) sqlsrv_commit($this->connID);
+	}
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transRollback(): bool
+	{
+		return (bool) sqlsrv_rollback($this->connID);
+	}
+
+	/**
+	 * Returns the last error code and message.
+	 * Must return this format: ['code' => string|int, 'message' => string]
+	 * intval(code) === 0 means "no error".
+	 *
+	 * @return array<string,string|int>
+	 */
+	public function error(): array
+	{
+		$error = [
+			'code'    => '00000',
+			'message' => '',
+		];
+
+		$sqlsrvErrors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
+
+		if (! is_array($sqlsrvErrors))
+		{
+			return $error;
+		}
+
+		$sqlsrvError = array_shift($sqlsrvErrors);
+		if (isset($sqlsrvError['SQLSTATE']))
+		{
+			$error['code'] = isset($sqlsrvError['code']) ? $sqlsrvError['SQLSTATE'] . '/' . $sqlsrvError['code'] : $sqlsrvError['SQLSTATE'];
+		}
+		elseif (isset($sqlsrvError['code']))
+		{
+			$error['code'] = $sqlsrvError['code'];
+		}
+
+		if (isset($sqlsrvError['message']))
+		{
+			$error['message'] = $sqlsrvError['message'];
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	public function affectedRows(): int
+	{
+		return sqlsrv_rows_affected($this->resultID);
+	}
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string|null $databaseName
+	 *
+	 * @return mixed
+	 */
+	public function setDatabase(string $databaseName = null)
+	{
+		if (empty($databaseName))
+		{
+			$databaseName = $this->database;
+		}
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		if ($this->execute('USE ' . $this->_escapeString($databaseName)))
+		{
+			$this->database  = $databaseName;
+			$this->dataCache = [];
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Executes the query against the database.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	public function execute(string $sql)
+	{
+		$stmt = ($this->scrollable === false || $this->isWriteType($sql)) ?
+			sqlsrv_query($this->connID, $sql) :
+			sqlsrv_query($this->connID, $sql, [], ['Scrollable' => $this->scrollable]);
+
+		if ($stmt === false)
+		{
+			$error = $this->error();
+
+			log_message('error', $error['message']);
+			if ($this->DBDebug)
+			{
+				throw new Exception($error['message']);
+			}
+		}
+
+		return $stmt;
+	}
+
+	/**
+	 * Returns the last error encountered by this connection.
+	 *
+	 * @return mixed
+	 */
+	public function getError()
+	{
+		$error = [
+			'code'    => '00000',
+			'message' => '',
+		];
+
+		$sqlsrvErrors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
+
+		if (! is_array($sqlsrvErrors))
+		{
+			return $error;
+		}
+
+		$sqlsrvError = array_shift($sqlsrvErrors);
+		if (isset($sqlsrvError['SQLSTATE']))
+		{
+			$error['code'] = isset($sqlsrvError['code']) ? $sqlsrvError['SQLSTATE'] . '/' . $sqlsrvError['code'] : $sqlsrvError['SQLSTATE'];
+		}
+		elseif (isset($sqlsrvError['code']))
+		{
+			$error['code'] = $sqlsrvError['code'];
+		}
+
+		if (isset($sqlsrvError['message']))
+		{
+			$error['message'] = $sqlsrvError['message'];
+		}
+
+		return $error;
+	}
+
+	/**
+	 * The name of the platform in use (MySQLi, mssql, etc)
+	 *
+	 * @return string
+	 */
+	public function getPlatform(): string
+	{
+		return $this->DBDriver;
+	}
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		if (isset($this->dataCache['version']))
+		{
+			return $this->dataCache['version'];
+		}
+
+		if (! $this->connID || empty($info = sqlsrv_server_info($this->connID)))
+		{
+			$this->initialize();
+		}
+
+		return isset($info['SQLServerVersion']) ? $this->dataCache['version'] = $info['SQLServerVersion'] : false;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Determines if a query is a "write" type.
+	 *
+	 * Overrides BaseConnection::isWriteType, adding additional read query types.
+	 *
+	 * @param  string $sql An SQL query string
+	 * @return boolean
+	 */
+	public function isWriteType($sql): bool
+	{
+		if (preg_match('/^\s*"?(EXEC\s*sp_rename)\s/i', $sql))
+		{
+			return true;
+		}
+
+		return parent::isWriteType($sql);
+	}
+
+	// --------------------------------------------------------------------
+
+}
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
new file mode 100644
index 0000000..09f9a14
--- /dev/null
+++ b/system/Database/SQLSRV/Forge.php
@@ -0,0 +1,410 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\Forge as BaseForge;
+
+/**
+ * Forge for SQLSRV
+ */
+class Forge extends BaseForge
+{
+	/**
+	 * DROP CONSTRAINT statement
+	 *
+	 * @var string
+	 */
+	protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
+
+	/**
+	 * CREATE DATABASE IF statement
+	 *
+	 * @todo missing charset, collat & check for existent
+	 *
+	 * @var string
+	 */
+	protected $createDatabaseIfStr = "DECLARE @DBName VARCHAR(255) = '%s'\nDECLARE @SQL VARCHAR(max) = 'IF DB_ID( ''' + @DBName + ''' ) IS NULL CREATE DATABASE ' + @DBName\nEXEC( @SQL )";
+
+	/**
+	 * CREATE DATABASE IF statement
+	 *
+	 * @todo missing charset & collat
+	 *
+	 * @var string
+	 */
+	protected $createDatabaseStr = 'CREATE DATABASE %s ';
+
+	/**
+	 * CHECK DATABASE EXIST statement
+	 *
+	 * @var string
+	 */
+	protected $checkDatabaseExistStr = 'IF DB_ID( %s ) IS NOT NULL SELECT 1';
+
+	/**
+	 * RENAME TABLE statement
+	 *
+	 * While the below statement would work, it returns an error.
+	 * Also MS recommends dropping and dropping and re-creating the table.
+	 *
+	 * @see https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-rename-transact-sql?view=sql-server-2017
+	 * 'EXEC sp_rename %s , %s ;'
+	 *
+	 * @var string
+	 */
+	protected $renameTableStr = 'EXEC sp_rename %s , %s ;';
+
+	/**
+	 * UNSIGNED support
+	 *
+	 * @var array
+	 */
+	protected $unsigned = [
+		'TINYINT'  => 'SMALLINT',
+		'SMALLINT' => 'INT',
+		'INT'      => 'BIGINT',
+		'REAL'     => 'FLOAT',
+	];
+
+	/**
+	 * CREATE TABLE IF statement
+	 *
+	 * @var string
+	 */
+	protected $createTableIfStr = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE";
+
+	/**
+	 * CREATE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $createTableStr = "%s %s (%s\n) ";
+
+	/**
+	 * DROP TABLE IF statement
+	 *
+	 * @var string
+	 */
+	protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CREATE TABLE attributes
+	 *
+	 * @param  array $attributes Associative array of table attributes
+	 * @return string
+	 */
+	protected function _createTableAttributes(array $attributes): string
+	{
+		return '';
+	}
+
+	/**
+	 * ALTER TABLE
+	 *
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $field     Column definition
+	 *
+	 * @return string|string[]|false
+	 */
+	protected function _alterTable(string $alterType, string $table, $field)
+	{
+		if ($alterType === 'ADD')
+		{
+			return parent::_alterTable($alterType, $table, $field);
+		}
+
+		// Handle DROP here
+		if ($alterType === 'DROP')
+		{
+			// check if fields are part of any indexes
+			$indexData = $this->db->getIndexData($table);
+
+			foreach ($indexData as $index)
+			{
+				if (is_string($field))
+				{
+					$field = explode(',', $field);
+				}
+
+				$fld = array_intersect($field, $index->fields);
+
+				// Drop index if field is part of an index
+				if (! empty($fld))
+				{
+					$this->_dropIndex($table, $index);
+				}
+			}
+
+			$sql = 'ALTER TABLE [' . $table . '] DROP ';
+
+			$fields = array_map(function ($item) {
+				return 'COLUMN [' . trim($item) . ']';
+			}, (array) $field);
+
+			return $sql .= implode(',', $fields);
+		}
+
+		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+
+		$sqls = [];
+		foreach ($field as $data)
+		{
+			if ($data['_literal'] !== false)
+			{
+				return false;
+			}
+
+			if (isset($data['type']))
+			{
+				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+						. " {$data['type']}{$data['length']}";
+			}
+
+			if (! empty($data['default']))
+			{
+				$sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($data['name']) . '_def'
+						. " DEFAULT {$data['default']} FOR " . $this->db->escapeIdentifiers($data['name']);
+			}
+
+			if (isset($data['null']))
+			{
+				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+						. ($data['null'] === true ? ' DROP' : '') . " {$data['type']}{$data['length']} NOT NULL";
+			}
+
+			if (! empty($data['comment']))
+			{
+				$sqls[] = 'EXEC sys.sp_addextendedproperty '
+						. "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
+						. "@level0type=N'SCHEMA',@level0name=N'" . $this->db->schema . "', "
+						. "@level1type=N'TABLE',@level1name=N'" . $this->db->escapeIdentifiers($table) . "', "
+						. "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($data['name']) . "'";
+			}
+
+			if (! empty($data['new_name']))
+			{
+				// EXEC sp_rename '[dbo].[db_misc].[value]', 'valueasdasd', 'COLUMN';
+				$sqls[] = "EXEC sp_rename  '[" . $this->db->schema . '].[' . $table . '].[' . $data['name'] . "]' , '" . $data['new_name'] . "', 'COLUMN';";
+			}
+		}
+
+		return $sqls;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Drop index for table
+	 *
+	 * @param string $table
+	 * @param object $indexData
+	 *
+	 * @return mixed
+	 */
+	protected function _dropIndex(string $table, object $indexData)
+	{
+		if ($indexData->type === 'PRIMARY')
+		{
+			$sql = 'ALTER TABLE [' . $this->db->schema . '].[' . $table . '] DROP [' . $indexData->name . ']';
+		}
+		else
+		{
+			$sql = 'DROP INDEX [' . $indexData->name . '] ON [' . $this->db->schema . '].[' . $table . ']';
+		}
+
+		return $this->db->simpleQuery($sql);
+	}
+
+	/**
+	 * Process column
+	 *
+	 * @param  array $field
+	 * @return string
+	 */
+	protected function _processColumn(array $field): string
+	{
+		return $this->db->escapeIdentifiers($field['name'])
+				. (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
+				. ' ' . $field['type'] . $field['length']
+				. $field['default']
+				. $field['null']
+				. $field['auto_increment']
+				. '' // (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
+				. $field['unique'];
+	}
+
+	/**
+	 * Process foreign keys
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return string
+	 */
+	protected function _processForeignKeys(string $table): string
+	{
+		$sql = '';
+
+		$allowActions = [
+			'CASCADE',
+			'SET NULL',
+			'NO ACTION',
+			'RESTRICT',
+			'SET DEFAULT',
+		];
+
+		if ($this->foreignKeys !== [])
+		{
+			foreach ($this->foreignKeys as $field => $fkey)
+			{
+				$nameIndex = $table . '_' . $field . '_foreign';
+
+				$sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
+						. ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
+						. ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+
+				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true))
+				{
+					$sql .= ' ON DELETE ' . $fkey['onDelete'];
+				}
+
+				if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true))
+				{
+					$sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+				}
+			}
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * Process primary keys
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return string
+	 */
+	protected function _processPrimaryKeys(string $table): string
+	{
+		for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++)
+		{
+			if (! isset($this->fields[$this->primaryKeys[$i]]))
+			{
+				unset($this->primaryKeys[$i]);
+			}
+		}
+
+		if ($this->primaryKeys !== [])
+		{
+			$sql = ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
+					. ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
+		}
+
+		return $sql ?? '';
+	}
+
+	/**
+	 * Field attribute TYPE
+	 *
+	 * Performs a data type mapping between different databases.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	protected function _attributeType(array &$attributes)
+	{
+		// Reset field lengths for data types that don't support it
+		if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false)
+		{
+			$attributes['CONSTRAINT'] = null;
+		}
+
+		switch (strtoupper($attributes['TYPE']))
+		{
+			case 'MEDIUMINT':
+				$attributes['TYPE']     = 'INTEGER';
+				$attributes['UNSIGNED'] = false;
+				break;
+			case 'INTEGER':
+				$attributes['TYPE'] = 'INT';
+
+				break;
+			case 'ENUM':
+				$attributes['TYPE']       = 'TEXT';
+				$attributes['CONSTRAINT'] = null;
+
+				break;
+			/* case 'DATETIME':
+			  $attributes['TYPE'] = 'TIMESTAMP';
+			  break; */
+			case 'TIMESTAMP':
+				$attributes['TYPE'] = 'DATETIME';
+				break;
+			default:
+				break;
+		}
+	}
+
+	/**
+	 * Field attribute AUTO_INCREMENT
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	protected function _attributeAutoIncrement(array &$attributes, array &$field)
+	{
+		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false)
+		{
+			$field['auto_increment'] = ' IDENTITY(1,1)';
+		}
+	}
+
+	/**
+	 * Drop Table
+	 *
+	 * Generates a platform-specific DROP TABLE string
+	 *
+	 * @todo Support for cascade
+	 *
+	 * @param string  $table    Table name
+	 * @param boolean $ifExists Whether to add an IF EXISTS condition
+	 * @param boolean $cascade
+	 *
+	 * @return string
+	 */
+	protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
+	{
+		$sql = 'DROP TABLE';
+
+		if ($ifExists)
+		{
+			$sql .= ' IF EXISTS ';
+		}
+
+		$table = ' [' . $this->db->database . '].[' . $this->db->schema . '].[' . $table . '] ';
+
+		$sql .= $table;
+
+		if ($cascade)
+		{
+			$sql .= '';
+		}
+
+		return $sql;
+	}
+}
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
new file mode 100644
index 0000000..4f3b586
--- /dev/null
+++ b/system/Database/SQLSRV/PreparedQuery.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use BadMethodCallException;
+use CodeIgniter\Database\BasePreparedQuery;
+use Exception;
+
+/**
+ * Prepared query for Postgre
+ */
+class PreparedQuery extends BasePreparedQuery
+{
+	/**
+	 * Parameters array used to store the dynamic variables.
+	 *
+	 * @var array
+	 */
+	protected $parameters = [];
+
+	/**
+	 * The result boolean from a sqlsrv_execute.
+	 *
+	 * @var boolean
+	 */
+	protected $result;
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options Options takes an associative array;
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function _prepare(string $sql, array $options = [])
+	{
+		/* Prepare parameters for the query */
+		$queryString = $this->getQueryString();
+
+		$parameters = $this->parameterize($queryString);
+
+		/* Prepare  the query */
+		$this->statement = sqlsrv_prepare($this->db->connID, $sql, $parameters);
+
+		if (! $this->statement)
+		{
+			$info              = $this->db->error();
+			$this->errorCode   = $info['code'];
+			$this->errorString = $info['message'];
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @param array $data
+	 *
+	 * @return boolean
+	 */
+	public function _execute(array $data): bool
+	{
+		if (! isset($this->statement))
+		{
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+		}
+
+		foreach ($data as $key => $value)
+		{
+			$this->parameters[$key] = $value;
+		}
+
+		$this->result = sqlsrv_execute($this->statement);
+
+		return (bool) $this->result;
+	}
+
+	/**
+	 * Returns the result object for the prepared query.
+	 *
+	 * @return mixed
+	 */
+	public function _getResult()
+	{
+		return $this->result;
+	}
+
+	/**
+	 * Handle parameters
+	 *
+	 * @param string $queryString
+	 *
+	 * @return array
+	 */
+	protected function parameterize(string $queryString): array
+	{
+		$numberOfVariables = substr_count($queryString, '?');
+
+		$params = [];
+
+		for ($c = 0; $c < $numberOfVariables; $c++)
+		{
+			$this->parameters[$c] = null;
+			$params[]             = &$this->parameters[$c];
+		}
+
+		return $params;
+	}
+}
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
new file mode 100644
index 0000000..f5e771e
--- /dev/null
+++ b/system/Database/SQLSRV/Result.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Entity\Entity;
+use stdClass;
+
+/**
+ * Result for SQLSRV
+ */
+class Result extends BaseResult
+{
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int
+	{
+		return @sqlsrv_num_fields($this->resultID);
+	}
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		$fieldNames = [];
+		foreach (sqlsrv_field_metadata($this->resultID) as $field)
+		{
+			$fieldNames[] = $field['Name'];
+		}
+
+		return $fieldNames;
+	}
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array
+	{
+		static $dataTypes = [
+			SQLSRV_SQLTYPE_BIGINT           => 'bigint',
+			SQLSRV_SQLTYPE_BIT              => 'bit',
+			SQLSRV_SQLTYPE_CHAR             => 'char',
+
+			SQLSRV_SQLTYPE_DATE             => 'date',
+			SQLSRV_SQLTYPE_DATETIME         => 'datetime',
+			SQLSRV_SQLTYPE_DATETIME2        => 'datetime2',
+			SQLSRV_SQLTYPE_DATETIMEOFFSET   => 'datetimeoffset',
+
+			SQLSRV_SQLTYPE_DECIMAL          => 'decimal',
+			SQLSRV_SQLTYPE_FLOAT            => 'float',
+
+			SQLSRV_SQLTYPE_IMAGE            => 'image',
+			SQLSRV_SQLTYPE_INT              => 'int',
+			SQLSRV_SQLTYPE_MONEY            => 'money',
+			SQLSRV_SQLTYPE_NCHAR            => 'nchar',
+			SQLSRV_SQLTYPE_NUMERIC          => 'numeric',
+
+			SQLSRV_SQLTYPE_NVARCHAR         => 'nvarchar',
+			SQLSRV_SQLTYPE_NTEXT            => 'ntext',
+
+			SQLSRV_SQLTYPE_REAL             => 'real',
+			SQLSRV_SQLTYPE_SMALLDATETIME    => 'smalldatetime',
+			SQLSRV_SQLTYPE_SMALLINT         => 'smallint',
+			SQLSRV_SQLTYPE_SMALLMONEY       => 'smallmoney',
+			SQLSRV_SQLTYPE_TEXT             => 'text',
+
+			SQLSRV_SQLTYPE_TIME             => 'time',
+			SQLSRV_SQLTYPE_TIMESTAMP        => 'timestamp',
+			SQLSRV_SQLTYPE_TINYINT          => 'tinyint',
+			SQLSRV_SQLTYPE_UNIQUEIDENTIFIER => 'uniqueidentifier',
+			SQLSRV_SQLTYPE_UDT              => 'udt',
+			SQLSRV_SQLTYPE_VARBINARY        => 'varbinary',
+			SQLSRV_SQLTYPE_VARCHAR          => 'varchar',
+			SQLSRV_SQLTYPE_XML              => 'xml',
+		];
+
+		$retVal = [];
+		foreach (sqlsrv_field_metadata($this->resultID) as $i => $field)
+		{
+			$retVal[$i]             = new stdClass();
+			$retVal[$i]->name       = $field['Name'];
+			$retVal[$i]->type       = $field['Type'];
+			$retVal[$i]->type_name  = $dataTypes[$field['Type']] ?? null;
+			$retVal[$i]->max_length = $field['Size'];
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	public function freeResult()
+	{
+		if (is_resource($this->resultID))
+		{
+			sqlsrv_free_stmt($this->resultID);
+			$this->resultID = false;
+		}
+	}
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function dataSeek(int $n = 0)
+	{
+		if ($n > 0)
+		{
+			for ($i = 0; $i < $n; $i++)
+			{
+				if (sqlsrv_fetch($this->resultID) === false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	protected function fetchAssoc()
+	{
+		return sqlsrv_fetch_array($this->resultID, SQLSRV_FETCH_ASSOC);
+	}
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object|boolean|Entity
+	 */
+	protected function fetchObject(string $className = 'stdClass')
+	{
+		if (is_subclass_of($className, Entity::class))
+		{
+			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+		}
+		return sqlsrv_fetch_object($this->resultID, $className);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns the number of rows in the resultID (i.e., SQLSRV query result resource)
+	 *
+	 * @return integer Returns the number of rows retrieved on success
+	 */
+	public function getNumRows(): int
+	{
+		if (! is_int($this->numRows))
+		{
+			$this->numRows = sqlsrv_num_rows($this->resultID);
+		}
+
+		return $this->numRows;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
new file mode 100644
index 0000000..9bc853e
--- /dev/null
+++ b/system/Database/SQLSRV/Utils.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Utils for SQLSRV
+ */
+class Utils extends BaseUtils
+{
+	/**
+	 * List databases statement
+	 *
+	 * @var string
+	 */
+	protected $listDatabases = 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
+
+	/**
+	 * OPTIMIZE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $optimizeTable = 'ALTER INDEX all ON %s REORGANIZE';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent version of the backup function.
+	 *
+	 * @param array|null $prefs
+	 *
+	 * @return mixed
+	 */
+	public function _backup(array $prefs = null)
+	{
+		throw new DatabaseException('Unsupported feature of the database platform you are using.');
+	}
+}
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
new file mode 100644
index 0000000..4ec74d1
--- /dev/null
+++ b/system/Database/SQLite3/Builder.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use CodeIgniter\Database\BaseBuilder;
+
+/**
+ * Builder for SQLite3
+ */
+class Builder extends BaseBuilder
+{
+	/**
+	 * Default installs of SQLite typically do not
+	 * support limiting delete clauses.
+	 *
+	 * @var boolean
+	 */
+	protected $canLimitDeletes = false;
+
+	/**
+	 * Default installs of SQLite do no support
+	 * limiting update queries in combo with WHERE.
+	 *
+	 * @var boolean
+	 */
+	protected $canLimitWhereUpdates = false;
+
+	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'RANDOM()',
+	];
+
+	/**
+	 * @var array
+	 */
+	protected $supportedIgnoreStatements = [
+		'insert' => 'OR IGNORE',
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replace statement
+	 *
+	 * Generates a platform-specific replace string from the supplied data
+	 *
+	 * @param string $table  the table name
+	 * @param array  $keys   the insert keys
+	 * @param array  $values the insert values
+	 *
+	 * @return string
+	 */
+	protected function _replace(string $table, array $keys, array $values): string
+	{
+		return 'INSERT OR ' . parent::_replace($table, $keys, $values);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Truncate statement
+	 *
+	 * Generates a platform-specific truncate string from the supplied data
+	 *
+	 * If the database does not support the TRUNCATE statement,
+	 * then this method maps to 'DELETE FROM table'
+	 *
+	 * @param  string $table
+	 * @return string
+	 */
+	protected function _truncate(string $table): string
+	{
+		return 'DELETE FROM ' . $table;
+	}
+}
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
new file mode 100644
index 0000000..4547ad7
--- /dev/null
+++ b/system/Database/SQLite3/Connection.php
@@ -0,0 +1,505 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use ErrorException;
+use Exception;
+use SQLite3;
+use stdClass;
+
+/**
+ * Connection for SQLite3
+ */
+class Connection extends BaseConnection
+{
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	public $DBDriver = 'SQLite3';
+
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	public $escapeChar = '`';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param boolean $persistent
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function connect(bool $persistent = false)
+	{
+		if ($persistent && $this->DBDebug)
+		{
+			throw new DatabaseException('SQLite3 doesn\'t support persistent connections.');
+		}
+		try
+		{
+			if ($this->database !== ':memory:' && strpos($this->database, DIRECTORY_SEPARATOR) === false)
+			{
+				$this->database = WRITEPATH . $this->database;
+			}
+
+			return (! $this->password)
+				? new SQLite3($this->database)
+				: new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
+		}
+		catch (Exception $e)
+		{
+			throw new DatabaseException('SQLite3 error: ' . $e->getMessage());
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return void
+	 */
+	public function reconnect()
+	{
+		$this->close();
+		$this->initialize();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	protected function _close()
+	{
+		$this->connID->close();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return boolean
+	 */
+	public function setDatabase(string $databaseName): bool
+	{
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		if (isset($this->dataCache['version']))
+		{
+			return $this->dataCache['version'];
+		}
+
+		$version = SQLite3::version();
+
+		return $this->dataCache['version'] = $version['versionString'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Execute the query
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed    \SQLite3Result object or bool
+	 */
+	public function execute(string $sql)
+	{
+		try
+		{
+			return $this->isWriteType($sql)
+				? $this->connID->exec($sql)
+				: $this->connID->query($sql);
+		}
+		catch (ErrorException $e)
+		{
+			log_message('error', $e);
+			if ($this->DBDebug)
+			{
+				throw $e;
+			}
+		}
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	public function affectedRows(): int
+	{
+		return $this->connID->changes();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-dependant string escape
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function _escapeString(string $str): string
+	{
+		return $this->connID->escapeString($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 *
+	 * @param boolean $prefixLimit
+	 *
+	 * @return string
+	 */
+	protected function _listTables(bool $prefixLimit = false): string
+	{
+		return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''
+			   . ' AND "NAME" NOT LIKE \'sqlite!_%\' ESCAPE \'!\''
+			   . (($prefixLimit !== false && $this->DBPrefix !== '')
+				? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr,
+					$this->likeEscapeChar)
+				: '');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function _listColumns(string $table = ''): string
+	{
+		return 'PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null, false) . ')';
+	}
+
+	/**
+	 * Fetch Field Names
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return array|false
+	 * @throws DatabaseException
+	 */
+	public function getFieldNames(string $table)
+	{
+		// Is there a cached result?
+		if (isset($this->dataCache['field_names'][$table]))
+		{
+			return $this->dataCache['field_names'][$table];
+		}
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		$sql = $this->_listColumns($table);
+
+		$query                                  = $this->query($sql);
+		$this->dataCache['field_names'][$table] = [];
+
+		foreach ($query->getResultArray() as $row)
+		{
+			// Do we know from where to get the column's name?
+			if (! isset($key))
+			{
+				if (isset($row['column_name']))
+				{
+					$key = 'column_name';
+				}
+				elseif (isset($row['COLUMN_NAME']))
+				{
+					$key = 'COLUMN_NAME';
+				}
+				elseif (isset($row['name']))
+				{
+					$key = 'name';
+				}
+				else
+				{
+					// We have no other choice but to just get the first element's key.
+					$key = key($row);
+				}
+			}
+
+			$this->dataCache['field_names'][$table][] = $row[$key];
+		}
+
+		return $this->dataCache['field_names'][$table];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with field data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _fieldData(string $table): array
+	{
+		if (($query = $this->query('PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null,
+					false) . ')')) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetFieldData'));
+		}
+		$query = $query->getResultObject();
+
+		if (empty($query))
+		{
+			return [];
+		}
+		$retVal = [];
+		for ($i = 0, $c = count($query); $i < $c; $i++)
+		{
+			$retVal[$i]              = new stdClass();
+			$retVal[$i]->name        = $query[$i]->name;
+			$retVal[$i]->type        = $query[$i]->type;
+			$retVal[$i]->max_length  = null;
+			$retVal[$i]->default     = $query[$i]->dflt_value;
+			$retVal[$i]->primary_key = isset($query[$i]->pk) && (bool) $query[$i]->pk;
+			$retVal[$i]->nullable    = isset($query[$i]->notnull) && ! (bool) $query[$i]->notnull;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with index data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _indexData(string $table): array
+	{
+		// Get indexes
+		// Don't use PRAGMA index_list, so we can preserve index order
+		$sql = "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name=" . $this->escape(strtolower($table));
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetIndexData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj       = new stdClass();
+			$obj->name = $row->name;
+
+			// Get fields for index
+			$obj->fields = [];
+			if (($fields = $this->query('PRAGMA index_info(' . $this->escape(strtolower($row->name)) . ')')) === false)
+			{
+				throw new DatabaseException(lang('Database.failGetIndexData'));
+			}
+			$fields = $fields->getResultObject();
+
+			foreach ($fields as $field)
+			{
+				$obj->fields[] = $field->name;
+			}
+
+			$retVal[$obj->name] = $obj;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with Foreign key data
+	 *
+	 * @param  string $table
+	 * @return stdClass[]
+	 */
+	public function _foreignKeyData(string $table): array
+	{
+		if ($this->supportsForeignKeys() !== true)
+		{
+			return [];
+		}
+
+		$tables = $this->listTables();
+
+		if (empty($tables))
+		{
+			return [];
+		}
+
+		$retVal = [];
+
+		foreach ($tables as $table)
+		{
+			$query = $this->query("PRAGMA foreign_key_list({$table})")->getResult();
+
+			foreach ($query as $row)
+			{
+				$obj                     = new stdClass();
+				$obj->constraint_name    = $row->from . ' to ' . $row->table . '.' . $row->to;
+				$obj->table_name         = $table;
+				$obj->foreign_table_name = $row->table;
+				$obj->sequence           = $row->seq;
+
+				$retVal[] = $obj;
+			}
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to disable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _disableForeignKeyChecks()
+	{
+		return 'PRAGMA foreign_keys = OFF';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to enable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _enableForeignKeyChecks()
+	{
+		return 'PRAGMA foreign_keys = ON';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error code and message.
+	 * Must return this format: ['code' => string|int, 'message' => string]
+	 * intval(code) === 0 means "no error".
+	 *
+	 * @return array<string,string|int>
+	 */
+	public function error(): array
+	{
+		return [
+			'code'    => $this->connID->lastErrorCode(),
+			'message' => $this->connID->lastErrorMsg(),
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer
+	 */
+	public function insertID(): int
+	{
+		return $this->connID->lastInsertRowID();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transBegin(): bool
+	{
+		return $this->connID->exec('BEGIN TRANSACTION');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transCommit(): bool
+	{
+		return $this->connID->exec('END TRANSACTION');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transRollback(): bool
+	{
+		return $this->connID->exec('ROLLBACK');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if the current install supports Foreign Keys
+	 * and has them enabled.
+	 *
+	 * @return boolean
+	 */
+	public function supportsForeignKeys(): bool
+	{
+		$result = $this->simpleQuery('PRAGMA foreign_keys');
+
+		return (bool) $result;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
new file mode 100644
index 0000000..b699411
--- /dev/null
+++ b/system/Database/SQLite3/Forge.php
@@ -0,0 +1,303 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Forge as BaseForge;
+
+/**
+ * Forge for SQLite3
+ */
+class Forge extends BaseForge
+{
+	/**
+	 * UNSIGNED support
+	 *
+	 * @var boolean|array
+	 */
+	protected $_unsigned = false;
+
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var string
+	 *
+	 * @internal
+	 */
+	protected $null = 'NULL';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param BaseConnection $db
+	 */
+	public function __construct(BaseConnection $db)
+	{
+		parent::__construct($db);
+
+		if (version_compare($this->db->getVersion(), '3.3', '<'))
+		{
+			$this->createTableIfStr = false;
+			$this->dropTableIfStr   = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create database
+	 *
+	 * @param string  $dbName
+	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
+	 *
+	 * @return boolean
+	 */
+	public function createDatabase(string $dbName, bool $ifNotExists = false): bool
+	{
+		// In SQLite, a database is created when you connect to the database.
+		// We'll return TRUE so that an error isn't generated.
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Drop database
+	 *
+	 * @param string $dbName
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function dropDatabase(string $dbName): bool
+	{
+		// In SQLite, a database is dropped when we delete a file
+		if (! is_file($dbName))
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unable to drop the specified database.');
+			}
+
+			return false;
+		}
+
+		// We need to close the pseudo-connection first
+		$this->db->close();
+		if (! @unlink($dbName))
+		{
+			if ($this->db->DBDebug)
+			{
+				throw new DatabaseException('Unable to drop the specified database.');
+			}
+
+			return false;
+		}
+
+		if (! empty($this->db->dataCache['db_names']))
+		{
+			$key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
+			if ($key !== false)
+			{
+				unset($this->db->dataCache['db_names'][$key]);
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ALTER TABLE
+	 *
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $field     Column definition
+	 *
+	 * @return string|array|null
+	 */
+	protected function _alterTable(string $alterType, string $table, $field)
+	{
+		switch ($alterType)
+		{
+			case 'DROP':
+				$sqlTable = new Table($this->db, $this);
+
+				$sqlTable->fromTable($table)
+					->dropColumn($field)
+					->run();
+
+				return '';
+			case 'CHANGE':
+				$sqlTable = new Table($this->db, $this);
+
+				$sqlTable->fromTable($table)
+						 ->modifyColumn($field)
+						 ->run();
+
+				return null;
+			default:
+				return parent::_alterTable($alterType, $table, $field);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process column
+	 *
+	 * @param array $field
+	 *
+	 * @return string
+	 */
+	protected function _processColumn(array $field): string
+	{
+		if ($field['type'] === 'TEXT' && strpos($field['length'], "('") === 0)
+		{
+			$field['type'] .= ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
+				. ' IN ' . $field['length'] . ')';
+		}
+
+		return $this->db->escapeIdentifiers($field['name'])
+			   . ' ' . $field['type']
+			   . $field['auto_increment']
+			   . $field['null']
+			   . $field['unique']
+			   . $field['default'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process indexes
+	 *
+	 * @param string $table
+	 *
+	 * @return array
+	 */
+	protected function _processIndexes(string $table): array
+	{
+		$sqls = [];
+
+		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
+		{
+			$this->keys[$i] = (array) $this->keys[$i];
+
+			for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++)
+			{
+				if (! isset($this->fields[$this->keys[$i][$i2]]))
+				{
+					unset($this->keys[$i][$i2]);
+				}
+			}
+			if (count($this->keys[$i]) <= 0)
+			{
+				continue;
+			}
+
+			if (in_array($i, $this->uniqueKeys, true))
+			{
+				$sqls[] = 'CREATE UNIQUE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+						  . ' ON ' . $this->db->escapeIdentifiers($table)
+						  . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+				continue;
+			}
+
+			$sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+					  . ' ON ' . $this->db->escapeIdentifiers($table)
+					  . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+		}
+
+		return $sqls;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute TYPE
+	 *
+	 * Performs a data type mapping between different databases.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	protected function _attributeType(array &$attributes)
+	{
+		switch (strtoupper($attributes['TYPE']))
+		{
+			case 'ENUM':
+			case 'SET':
+				$attributes['TYPE'] = 'TEXT';
+				break;
+			default:
+				break;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Field attribute AUTO_INCREMENT
+	 *
+	 * @param array $attributes
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	protected function _attributeAutoIncrement(array &$attributes, array &$field)
+	{
+		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
+			&& stripos($field['type'], 'int') !== false)
+		{
+			$field['type']           = 'INTEGER PRIMARY KEY';
+			$field['default']        = '';
+			$field['null']           = '';
+			$field['unique']         = '';
+			$field['auto_increment'] = ' AUTOINCREMENT';
+
+			$this->primaryKeys = [];
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Foreign Key Drop
+	 *
+	 * @param string $table       Table name
+	 * @param string $foreignName Foreign name
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function dropForeignKey(string $table, string $foreignName): bool
+	{
+		// If this version of SQLite doesn't support it, we're done here
+		if ($this->db->supportsForeignKeys() !== true)
+		{
+			return true;
+		}
+
+		// Otherwise we have to copy the table and recreate
+		// without the foreign key being involved now
+		$sqlTable = new Table($this->db, $this);
+
+		return $sqlTable->fromTable($this->db->DBPrefix . $table)
+			->dropForeignKey($foreignName)
+			->run();
+	}
+}
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
new file mode 100644
index 0000000..333971d
--- /dev/null
+++ b/system/Database/SQLite3/PreparedQuery.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use BadMethodCallException;
+use CodeIgniter\Database\BasePreparedQuery;
+
+/**
+ * Prepared query for SQLite3
+ */
+class PreparedQuery extends BasePreparedQuery
+{
+	/**
+	 * The SQLite3Result resource, or false.
+	 *
+	 * @var Result|boolean
+	 */
+	protected $result;
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options Passed to the connection's prepare statement.
+	 *                        Unused in the MySQLi driver.
+	 *
+	 * @return mixed
+	 */
+	public function _prepare(string $sql, array $options = [])
+	{
+		if (! ($this->statement = $this->db->connID->prepare($sql)))
+		{
+			$this->errorCode   = $this->db->connID->lastErrorCode();
+			$this->errorString = $this->db->connID->lastErrorMsg();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @todo finalize()
+	 *
+	 * @param array $data
+	 *
+	 * @return boolean
+	 */
+	public function _execute(array $data): bool
+	{
+		if (! isset($this->statement))
+		{
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+		}
+
+		foreach ($data as $key => $item)
+		{
+			// Determine the type string
+			if (is_integer($item))
+			{
+				$bindType = SQLITE3_INTEGER;
+			}
+			elseif (is_float($item))
+			{
+				$bindType = SQLITE3_FLOAT;
+			}
+			else
+			{
+				$bindType = SQLITE3_TEXT;
+			}
+
+			// Bind it
+			$this->statement->bindValue($key + 1, $item, $bindType);
+		}
+
+		$this->result = $this->statement->execute();
+
+		return $this->result !== false;
+	}
+
+	/**
+	 * Returns the result object for the prepared query.
+	 *
+	 * @return mixed
+	 */
+	public function _getResult()
+	{
+		return $this->result;
+	}
+}
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
new file mode 100644
index 0000000..bd07eac
--- /dev/null
+++ b/system/Database/SQLite3/Result.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use Closure;
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Entity\Entity;
+use stdClass;
+
+/**
+ * Result for SQLite3
+ */
+class Result extends BaseResult
+{
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int
+	{
+		return $this->resultID->numColumns(); // @phpstan-ignore-line
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		$fieldNames = [];
+		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
+		{
+			$fieldNames[] = $this->resultID->columnName($i); // @phpstan-ignore-line
+		}
+
+		return $fieldNames;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array
+	{
+		static $dataTypes = [
+			SQLITE3_INTEGER => 'integer',
+			SQLITE3_FLOAT   => 'float',
+			SQLITE3_TEXT    => 'text',
+			SQLITE3_BLOB    => 'blob',
+			SQLITE3_NULL    => 'null',
+		];
+
+		$retVal = [];
+		$this->resultID->fetchArray(SQLITE3_NUM); // @phpstan-ignore-line
+
+		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
+		{
+			$retVal[$i]             = new stdClass();
+			$retVal[$i]->name       = $this->resultID->columnName($i); // @phpstan-ignore-line
+			$type                   = $this->resultID->columnType($i); // @phpstan-ignore-line
+			$retVal[$i]->type       = $type;
+			$retVal[$i]->type_name  = $dataTypes[$type] ?? null;
+			$retVal[$i]->max_length = null;
+			$retVal[$i]->length     = null;
+		}
+		$this->resultID->reset(); // @phpstan-ignore-line
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	public function freeResult()
+	{
+		if (is_object($this->resultID))
+		{
+			$this->resultID->finalize();
+			$this->resultID = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 * @throws DatabaseException
+	 */
+	public function dataSeek(int $n = 0)
+	{
+		if ($n !== 0)
+		{
+			throw new DatabaseException('SQLite3 doesn\'t support seeking to other offset.');
+		}
+
+		return $this->resultID->reset(); // @phpstan-ignore-line
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	protected function fetchAssoc()
+	{
+		return $this->resultID->fetchArray(SQLITE3_ASSOC); // @phpstan-ignore-line
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object|boolean
+	 */
+	protected function fetchObject(string $className = 'stdClass')
+	{
+		// No native support for fetching rows as objects
+		if (($row = $this->fetchAssoc()) === false)
+		{
+			return false;
+		}
+
+		if ($className === 'stdClass')
+		{
+			return (object) $row;
+		}
+
+		$classObj = new $className();
+
+		if (is_subclass_of($className, Entity::class))
+		{
+			return $classObj->setAttributes($row);
+		}
+
+		$classSet = Closure::bind(function ($key, $value) {
+			$this->$key = $value;
+		}, $classObj, $className
+		);
+		foreach (array_keys($row) as $key)
+		{
+			$classSet($key, $row[$key]);
+		}
+		return $classObj;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
new file mode 100644
index 0000000..1183f4a
--- /dev/null
+++ b/system/Database/SQLite3/Table.php
@@ -0,0 +1,403 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use CodeIgniter\Database\Exceptions\DataException;
+
+/**
+ * Class Table
+ *
+ * Provides missing features for altering tables that are common
+ * in other supported databases, but are missing from SQLite.
+ * These are needed in order to support migrations during testing
+ * when another database is used as the primary engine, but
+ * SQLite in memory databases are used for faster test execution.
+ */
+class Table
+{
+	/**
+	 * All of the fields this table represents.
+	 *
+	 * @var array
+	 */
+	protected $fields = [];
+
+	/**
+	 * All of the unique/primary keys in the table.
+	 *
+	 * @var array
+	 */
+	protected $keys = [];
+
+	/**
+	 * All of the foreign keys in the table.
+	 *
+	 * @var array
+	 */
+	protected $foreignKeys = [];
+
+	/**
+	 * The name of the table we're working with.
+	 *
+	 * @var string
+	 */
+	protected $tableName;
+
+	/**
+	 * The name of the table, with database prefix
+	 *
+	 * @var string
+	 */
+	protected $prefixedTableName;
+
+	/**
+	 * Database connection.
+	 *
+	 * @var Connection
+	 */
+	protected $db;
+
+	/**
+	 * Handle to our forge.
+	 *
+	 * @var Forge
+	 */
+	protected $forge;
+
+	/**
+	 * Table constructor.
+	 *
+	 * @param Connection $db
+	 * @param Forge      $forge
+	 */
+	public function __construct(Connection $db, Forge $forge)
+	{
+		$this->db    = $db;
+		$this->forge = $forge;
+	}
+
+	/**
+	 * Reads an existing database table and
+	 * collects all of the information needed to
+	 * recreate this table.
+	 *
+	 * @param string $table
+	 *
+	 * @return Table
+	 */
+	public function fromTable(string $table)
+	{
+		$this->prefixedTableName = $table;
+
+		// Remove the prefix, if any, since it's
+		// already been added by the time we get here...
+		$prefix = $this->db->DBPrefix; // @phpstan-ignore-line
+		if (! empty($prefix) && strpos($table, $prefix) === 0)
+		{
+			$table = substr($table, strlen($prefix));
+		}
+
+		if (! $this->db->tableExists($this->prefixedTableName))
+		{
+			throw DataException::forTableNotFound($this->prefixedTableName);
+		}
+
+		$this->tableName = $table;
+
+		$this->fields = $this->formatFields($this->db->getFieldData($table));
+
+		$this->keys = array_merge($this->keys, $this->formatKeys($this->db->getIndexData($table)));
+
+		$this->foreignKeys = $this->db->getForeignKeyData($table);
+
+		return $this;
+	}
+
+	/**
+	 * Called after `fromTable` and any actions, like `dropColumn`, etc,
+	 * to finalize the action. It creates a temp table, creates the new
+	 * table with modifications, and copies the data over to the new table.
+	 * Resets the connection dataCache to be sure changes are collected.
+	 *
+	 * @return boolean
+	 */
+	public function run(): bool
+	{
+		$this->db->query('PRAGMA foreign_keys = OFF');
+
+		$this->db->transStart();
+
+		$this->forge->renameTable($this->tableName, "temp_{$this->tableName}");
+
+		$this->forge->reset();
+
+		$this->createTable();
+
+		$this->copyData();
+
+		$this->forge->dropTable("temp_{$this->tableName}");
+
+		$success = $this->db->transComplete();
+
+		$this->db->query('PRAGMA foreign_keys = ON');
+
+		$this->db->resetDataCache();
+
+		return $success;
+	}
+
+	/**
+	 * Drops columns from the table.
+	 *
+	 * @param string|array $columns
+	 *
+	 * @return Table
+	 */
+	public function dropColumn($columns)
+	{
+		//unset($this->fields[$column]);
+
+		if (is_string($columns))
+		{
+			$columns = explode(',', $columns);
+		}
+
+		foreach ($columns as $column)
+		{
+			$column = trim($column);
+			if (isset($this->fields[$column]))
+			{
+				unset($this->fields[$column]);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Modifies a field, including changing data type,
+	 * renaming, etc.
+	 *
+	 * @param array $field
+	 *
+	 * @return Table
+	 */
+	public function modifyColumn(array $field)
+	{
+		$field = $field[0];
+
+		$oldName = $field['name'];
+		unset($field['name']);
+
+		$this->fields[$oldName] = $field;
+
+		return $this;
+	}
+
+	/**
+	 * Drops a foreign key from this table so that
+	 * it won't be recreated in the future.
+	 *
+	 * @param string $column
+	 *
+	 * @return Table
+	 */
+	public function dropForeignKey(string $column)
+	{
+		if (empty($this->foreignKeys))
+		{
+			return $this;
+		}
+
+		for ($i = 0; $i < count($this->foreignKeys); $i++)
+		{
+			if ($this->foreignKeys[$i]->table_name !== $this->tableName)
+			{
+				continue;
+			}
+
+			// The column name should be the first thing in the constraint name
+			if (strpos($this->foreignKeys[$i]->constraint_name, $column) !== 0)
+			{
+				continue;
+			}
+
+			unset($this->foreignKeys[$i]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Creates the new table based on our current fields.
+	 *
+	 * @return mixed
+	 */
+	protected function createTable()
+	{
+		$this->dropIndexes();
+		$this->db->resetDataCache();
+
+		// Handle any modified columns.
+		$fields = [];
+		foreach ($this->fields as $name => $field)
+		{
+			if (isset($field['new_name']))
+			{
+				$fields[$field['new_name']] = $field;
+				continue;
+			}
+
+			$fields[$name] = $field;
+		}
+
+		$this->forge->addField($fields);
+
+		// Unique/Index keys
+		if (is_array($this->keys))
+		{
+			foreach ($this->keys as $key)
+			{
+				switch ($key['type'])
+				{
+					case 'primary':
+						$this->forge->addPrimaryKey($key['fields']);
+						break;
+					case 'unique':
+						$this->forge->addUniqueKey($key['fields']);
+						break;
+					case 'index':
+						$this->forge->addKey($key['fields']);
+						break;
+				}
+			}
+		}
+
+		// Foreign Keys
+
+		return $this->forge->createTable($this->tableName);
+	}
+
+	/**
+	 * Copies data from our old table to the new one,
+	 * taking care map data correctly based on any columns
+	 * that have been renamed.
+	 *
+	 * @return void
+	 */
+	protected function copyData()
+	{
+		$exFields  = [];
+		$newFields = [];
+
+		foreach ($this->fields as $name => $details)
+		{
+			$newFields[] = $details['new_name'] ?? $name;
+			$exFields[]  = $name;
+		}
+
+		$exFields  = implode(', ', $exFields);
+		$newFields = implode(', ', $newFields);
+
+		// @phpstan-ignore-next-line
+		$this->db->query("INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}");
+	}
+
+	/**
+	 * Converts fields retrieved from the database to
+	 * the format needed for creating fields with Forge.
+	 *
+	 * @param array|boolean $fields
+	 *
+	 * @return mixed
+	 */
+	protected function formatFields($fields)
+	{
+		if (! is_array($fields))
+		{
+			return $fields;
+		}
+
+		$return = [];
+
+		foreach ($fields as $field)
+		{
+			$return[$field->name] = [
+				'type'    => $field->type,
+				'default' => $field->default,
+				'null'    => $field->nullable,
+			];
+
+			if ($field->primary_key)
+			{
+				$this->keys[$field->name] = [
+					'fields' => [$field->name],
+					'type'   => 'primary',
+				];
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Converts keys retrieved from the database to
+	 * the format needed to create later.
+	 *
+	 * @param mixed $keys
+	 *
+	 * @return mixed
+	 */
+	protected function formatKeys($keys)
+	{
+		if (! is_array($keys))
+		{
+			return $keys;
+		}
+
+		$return = [];
+
+		foreach ($keys as $name => $key)
+		{
+			$return[$name] = [
+				'fields' => $key->fields,
+				'type'   => 'index',
+			];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Attempts to drop all indexes and constraints
+	 * from the database for this table.
+	 *
+	 * @return null|void
+	 */
+	protected function dropIndexes()
+	{
+		if (! is_array($this->keys) || $this->keys === [])
+		{
+			return;
+		}
+
+		foreach ($this->keys as $name => $key)
+		{
+			if ($key['type'] === 'primary' || $key['type'] === 'unique')
+			{
+				continue;
+			}
+
+			$this->db->query("DROP INDEX IF EXISTS '{$name}'");
+		}
+	}
+}
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
new file mode 100644
index 0000000..95cf9ba
--- /dev/null
+++ b/system/Database/SQLite3/Utils.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLite3;
+
+use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Utils for SQLite3
+ */
+class Utils extends BaseUtils
+{
+	/**
+	 * OPTIMIZE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $optimizeTable = 'REINDEX %s';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent version of the backup function.
+	 *
+	 * @param array|null $prefs
+	 *
+	 * @return mixed
+	 */
+	public function _backup(array $prefs = null)
+	{
+		throw new DatabaseException('Unsupported feature of the database platform you are using.');
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
new file mode 100644
index 0000000..6d32702
--- /dev/null
+++ b/system/Database/Seeder.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\CLI\CLI;
+use Config\Database;
+use Faker\Factory;
+use Faker\Generator;
+use InvalidArgumentException;
+
+/**
+ * Class Seeder
+ */
+class Seeder
+{
+	/**
+	 * The name of the database group to use.
+	 *
+	 * @var string
+	 */
+	protected $DBGroup;
+
+	/**
+	 * Where we can find the Seed files.
+	 *
+	 * @var string
+	 */
+	protected $seedPath;
+
+	/**
+	 * An instance of the main Database configuration
+	 *
+	 * @var Database
+	 */
+	protected $config;
+
+	/**
+	 * Database Connection instance
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * Database Forge instance.
+	 *
+	 * @var Forge
+	 */
+	protected $forge;
+
+	/**
+	 * If true, will not display CLI messages.
+	 *
+	 * @var boolean
+	 */
+	protected $silent = false;
+
+	/**
+	 * Faker Generator instance.
+	 *
+	 * @var Generator|null
+	 */
+	private static $faker;
+
+	/**
+	 * Seeder constructor.
+	 *
+	 * @param Database            $config
+	 * @param BaseConnection|null $db
+	 */
+	public function __construct(Database $config, BaseConnection $db = null)
+	{
+		$this->seedPath = $config->filesPath ?? APPPATH . 'Database/';
+
+		if (empty($this->seedPath))
+		{
+			throw new InvalidArgumentException('Invalid filesPath set in the Config\Database.');
+		}
+
+		$this->seedPath = rtrim($this->seedPath, '\\/') . '/Seeds/';
+
+		if (! is_dir($this->seedPath))
+		{
+			throw new InvalidArgumentException('Unable to locate the seeds directory. Please check Config\Database::filesPath');
+		}
+
+		$this->config = &$config;
+
+		$db = $db ?? Database::connect($this->DBGroup);
+
+		$this->db    = &$db;
+		$this->forge = Database::forge($this->DBGroup);
+	}
+
+	/**
+	 * Gets the Faker Generator instance.
+	 *
+	 * @return Generator|null
+	 */
+	public static function faker(): ?Generator
+	{
+		if (self::$faker === null && class_exists(Factory::class))
+		{
+			self::$faker = Factory::create();
+		}
+
+		return self::$faker;
+	}
+
+	/**
+	 * Loads the specified seeder and runs it.
+	 *
+	 * @param string $class
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	public function call(string $class)
+	{
+		$class = trim($class);
+
+		if ($class === '')
+		{
+			throw new InvalidArgumentException('No seeder was specified.');
+		}
+
+		if (strpos($class, '\\') === false)
+		{
+			$path = $this->seedPath . str_replace('.php', '', $class) . '.php';
+
+			if (! is_file($path))
+			{
+				throw new InvalidArgumentException('The specified seeder is not a valid file: ' . $path);
+			}
+
+			// Assume the class has the correct namespace
+			// @codeCoverageIgnoreStart
+			$class = APP_NAMESPACE . '\Database\Seeds\\' . $class;
+
+			if (! class_exists($class, false))
+			{
+				require_once $path;
+			}
+			// @codeCoverageIgnoreEnd
+		}
+
+		/**
+		 * @var Seeder
+		 */
+		$seeder = new $class($this->config);
+		$seeder->setSilent($this->silent)->run();
+
+		unset($seeder);
+
+		if (is_cli() && ! $this->silent)
+		{
+			CLI::write("Seeded: {$class}", 'green');
+		}
+	}
+
+	/**
+	 * Sets the location of the directory that seed files can be located in.
+	 *
+	 * @param string $path
+	 *
+	 * @return $this
+	 */
+	public function setPath(string $path)
+	{
+		$this->seedPath = rtrim($path, '\\/') . '/';
+
+		return $this;
+	}
+
+	/**
+	 * Sets the silent treatment.
+	 *
+	 * @param boolean $silent
+	 *
+	 * @return $this
+	 */
+	public function setSilent(bool $silent)
+	{
+		$this->silent = $silent;
+
+		return $this;
+	}
+
+	/**
+	 * Run the database seeds. This is where the magic happens.
+	 *
+	 * Child classes must implement this method and take care
+	 * of inserting their data here.
+	 *
+	 * @return mixed
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function run()
+	{
+	}
+}
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
new file mode 100644
index 0000000..18e30b2
--- /dev/null
+++ b/system/Debug/Exceptions.php
@@ -0,0 +1,531 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug;
+
+use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Response;
+use Config\Exceptions as ExceptionsConfig;
+use Config\Paths;
+use function error_reporting;
+use ErrorException;
+use Throwable;
+
+/**
+ * Exceptions manager
+ */
+class Exceptions
+{
+	use ResponseTrait;
+
+	/**
+	 * Nesting level of the output buffering mechanism
+	 *
+	 * @var integer
+	 */
+	public $ob_level;
+
+	/**
+	 * The path to the directory containing the
+	 * cli and html error view directories.
+	 *
+	 * @var string
+	 */
+	protected $viewPath;
+
+	/**
+	 * Config for debug exceptions.
+	 *
+	 * @var ExceptionsConfig
+	 */
+	protected $config;
+
+	/**
+	 * The incoming request.
+	 *
+	 * @var IncomingRequest
+	 */
+	protected $request;
+
+	/**
+	 * The outgoing response.
+	 *
+	 * @var Response
+	 */
+	protected $response;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param ExceptionsConfig $config
+	 * @param IncomingRequest  $request
+	 * @param Response         $response
+	 */
+	public function __construct(ExceptionsConfig $config, IncomingRequest $request, Response $response)
+	{
+		$this->ob_level = ob_get_level();
+
+		$this->viewPath = rtrim($config->errorViewPath, '\\/ ') . DIRECTORY_SEPARATOR;
+
+		$this->config = $config;
+
+		$this->request  = $request;
+		$this->response = $response;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Responsible for registering the error, exception and shutdown
+	 * handling of our application.
+	 */
+	public function initialize()
+	{
+		//Set the Exception Handler
+		set_exception_handler([$this, 'exceptionHandler']);
+
+		// Set the Error Handler
+		set_error_handler([$this, 'errorHandler']);
+
+		// Set the handler for shutdown to catch Parse errors
+		// Do we need this in PHP7?
+		register_shutdown_function([$this, 'shutdownHandler']);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Catches any uncaught errors and exceptions, including most Fatal errors
+	 * (Yay PHP7!). Will log the error, display it if display_errors is on,
+	 * and fire an event that allows custom actions to be taken at this point.
+	 *
+	 * @param Throwable $exception
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function exceptionHandler(Throwable $exception)
+	{
+		[
+			$statusCode,
+			$exitCode,
+		] = $this->determineCodes($exception);
+
+		// Log it
+		if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true))
+		{
+			log_message('critical', $exception->getMessage() . "\n{trace}", [
+							'trace' => $exception->getTraceAsString(),
+						]);
+		}
+
+		if (! is_cli())
+		{
+			$this->response->setStatusCode($statusCode);
+			$header = "HTTP/{$this->request->getProtocolVersion()} {$this->response->getStatusCode()} {$this->response->getReason()}";
+			header($header, true, $statusCode);
+
+			if (strpos($this->request->getHeaderLine('accept'), 'text/html') === false)
+			{
+				$this->respond(ENVIRONMENT === 'development' ? $this->collectVars($exception, $statusCode) : '', $statusCode)->send();
+
+				exit($exitCode);
+			}
+		}
+
+		$this->render($exception, $statusCode);
+
+		exit($exitCode);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Even in PHP7, some errors make it through to the errorHandler, so
+	 * convert these to Exceptions and let the exception handler log it and
+	 * display it.
+	 *
+	 * This seems to be primarily when a user triggers it with trigger_error().
+	 *
+	 * @param integer      $severity
+	 * @param string       $message
+	 * @param string|null  $file
+	 * @param integer|null $line
+	 *
+	 * @throws ErrorException
+	 */
+	public function errorHandler(int $severity, string $message, string $file = null, int $line = null)
+	{
+		if (! (error_reporting() & $severity))
+		{
+			return;
+		}
+
+		// Convert it to an exception and pass it along.
+		throw new ErrorException($message, 0, $severity, $file, $line);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if any errors have happened during shutdown that
+	 * need to be caught and handle them.
+	 */
+	public function shutdownHandler()
+	{
+		$error = error_get_last();
+
+		// If we've got an error that hasn't been displayed, then convert
+		// it to an Exception and use the Exception handler to display it
+		// to the user.
+		// Fatal Error?
+		if (! is_null($error) && in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true))
+		{
+			$this->exceptionHandler(new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the view to display based on the exception thrown,
+	 * whether an HTTP or CLI request, etc.
+	 *
+	 * @param Throwable $exception
+	 * @param string    $templatePath
+	 *
+	 * @return string       The path and filename of the view file to use
+	 */
+	protected function determineView(Throwable $exception, string $templatePath): string
+	{
+		// Production environments should have a custom exception file.
+		$view         = 'production.php';
+		$templatePath = rtrim($templatePath, '\\/ ') . DIRECTORY_SEPARATOR;
+
+		if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')))
+		{
+			$view = 'error_exception.php';
+		}
+
+		// 404 Errors
+		if ($exception instanceof PageNotFoundException)
+		{
+			return 'error_404.php';
+		}
+
+		// Allow for custom views based upon the status code
+		if (is_file($templatePath . 'error_' . $exception->getCode() . '.php'))
+		{
+			return 'error_' . $exception->getCode() . '.php';
+		}
+
+		return $view;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given an exception and status code will display the error to the client.
+	 *
+	 * @param Throwable $exception
+	 * @param integer   $statusCode
+	 */
+	protected function render(Throwable $exception, int $statusCode)
+	{
+		// Determine possible directories of error views
+		$path    = $this->viewPath;
+		$altPath = rtrim((new Paths())->viewDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'errors' . DIRECTORY_SEPARATOR;
+
+		$path    .= (is_cli() ? 'cli' : 'html') . DIRECTORY_SEPARATOR;
+		$altPath .= (is_cli() ? 'cli' : 'html') . DIRECTORY_SEPARATOR;
+
+		// Determine the views
+		$view    = $this->determineView($exception, $path);
+		$altView = $this->determineView($exception, $altPath);
+
+		// Check if the view exists
+		if (is_file($path . $view))
+		{
+			$viewFile = $path . $view;
+		}
+		elseif (is_file($altPath . $altView))
+		{
+			$viewFile = $altPath . $altView;
+		}
+
+		// Prepare the vars
+		$vars = $this->collectVars($exception, $statusCode);
+		extract($vars);
+
+		// Render it
+		if (ob_get_level() > $this->ob_level + 1)
+		{
+			ob_end_clean();
+		}
+
+		ob_start();
+		include $viewFile; // @phpstan-ignore-line
+		$buffer = ob_get_contents();
+		ob_end_clean();
+		echo $buffer;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gathers the variables that will be made available to the view.
+	 *
+	 * @param Throwable $exception
+	 * @param integer   $statusCode
+	 *
+	 * @return array
+	 */
+	protected function collectVars(Throwable $exception, int $statusCode): array
+	{
+		$trace = $exception->getTrace();
+		if (! empty($this->config->sensitiveDataInTrace))
+		{
+			$this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace);
+		}
+
+		return [
+			'title'   => get_class($exception),
+			'type'    => get_class($exception),
+			'code'    => $statusCode,
+			'message' => $exception->getMessage() ?? '(null)',
+			'file'    => $exception->getFile(),
+			'line'    => $exception->getLine(),
+			'trace'   => $trace,
+		];
+	}
+
+	/**
+	 * Mask sensitive data in the trace.
+	 *
+	 * @param array|object $trace
+	 * @param array        $keysToMask
+	 * @param string       $path
+	 */
+	protected function maskSensitiveData(&$trace, array $keysToMask, string $path = '') 
+	{
+		foreach ($keysToMask as $keyToMask) 
+		{
+			$explode = explode('/', $keyToMask);
+			$index   = end($explode);
+
+			if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0)
+			{
+				if (is_array($trace) && array_key_exists($index, $trace)) 
+				{
+					$trace[$index] = '******************';
+				} 
+				elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->$index)) 
+				{
+					$trace->$index = '******************';
+				}
+			}
+		}
+
+		if (! is_iterable($trace) && is_object($trace)) 
+		{
+			$trace = get_object_vars($trace);
+		}
+
+		if (is_iterable($trace)) 
+		{
+			foreach ($trace as $pathKey => $subarray) 
+			{
+				$this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey);
+			}
+		}
+	}
+
+	/**
+	 * Determines the HTTP status code and the exit status code for this request.
+	 *
+	 * @param Throwable $exception
+	 *
+	 * @return array
+	 */
+	protected function determineCodes(Throwable $exception): array
+	{
+		$statusCode = abs($exception->getCode());
+
+		if ($statusCode < 100 || $statusCode > 599)
+		{
+			$exitStatus = $statusCode + EXIT__AUTO_MIN; // 9 is EXIT__AUTO_MIN
+			if ($exitStatus > EXIT__AUTO_MAX) // 125 is EXIT__AUTO_MAX
+			{
+				$exitStatus = EXIT_ERROR; // EXIT_ERROR
+			}
+			$statusCode = 500;
+		}
+		else
+		{
+			$exitStatus = 1; // EXIT_ERROR
+		}
+
+		return [
+			$statusCode ?: 500,
+			$exitStatus,
+		];
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Display Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clean Path
+	 *
+	 * This makes nicer looking paths for the error output.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	public static function cleanPath(string $file): string
+	{
+		switch (true)
+		{
+			case strpos($file, APPPATH) === 0:
+				$file = 'APPPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(APPPATH));
+				break;
+			case strpos($file, SYSTEMPATH) === 0:
+				$file = 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(SYSTEMPATH));
+				break;
+			case strpos($file, FCPATH) === 0:
+				$file = 'FCPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(FCPATH));
+				break;
+			case defined('VENDORPATH') && strpos($file, VENDORPATH) === 0:
+				$file = 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(VENDORPATH));
+				break;
+		}
+
+		return $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Describes memory usage in real-world units. Intended for use
+	 * with memory_get_usage, etc.
+	 *
+	 * @param integer $bytes
+	 *
+	 * @return string
+	 */
+	public static function describeMemory(int $bytes): string
+	{
+		if ($bytes < 1024)
+		{
+			return $bytes . 'B';
+		}
+		if ($bytes < 1048576)
+		{
+			return round($bytes / 1024, 2) . 'KB';
+		}
+
+		return round($bytes / 1048576, 2) . 'MB';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a syntax-highlighted version of a PHP file.
+	 *
+	 * @param string  $file
+	 * @param integer $lineNumber
+	 * @param integer $lines
+	 *
+	 * @return boolean|string
+	 */
+	public static function highlightFile(string $file, int $lineNumber, int $lines = 15)
+	{
+		if (empty($file) || ! is_readable($file))
+		{
+			return false;
+		}
+
+		// Set our highlight colors:
+		if (function_exists('ini_set'))
+		{
+			ini_set('highlight.comment', '#767a7e; font-style: italic');
+			ini_set('highlight.default', '#c7c7c7');
+			ini_set('highlight.html', '#06B');
+			ini_set('highlight.keyword', '#f1ce61;');
+			ini_set('highlight.string', '#869d6a');
+		}
+
+		try
+		{
+			$source = file_get_contents($file);
+		}
+		catch (Throwable $e)
+		{
+			return false;
+		}
+
+		$source = str_replace(["\r\n", "\r"], "\n", $source);
+		$source = explode("\n", highlight_string($source, true));
+		$source = str_replace('<br />', "\n", $source[1]);
+
+		$source = explode("\n", str_replace("\r\n", "\n", $source));
+
+		// Get just the part to show
+		$start = $lineNumber - (int) round($lines / 2);
+		$start = $start < 0 ? 0 : $start;
+
+		// Get just the lines we need to display, while keeping line numbers...
+		$source = array_splice($source, $start, $lines, true); // @phpstan-ignore-line
+
+		// Used to format the line number in the source
+		$format = '% ' . strlen(sprintf('%s', $start + $lines)) . 'd';
+
+		$out = '';
+		// Because the highlighting may have an uneven number
+		// of open and close span tags on one line, we need
+		// to ensure we can close them all to get the lines
+		// showing correctly.
+		$spans = 1;
+
+		foreach ($source as $n => $row)
+		{
+			$spans += substr_count($row, '<span') - substr_count($row, '</span');
+
+			$row = str_replace(["\r", "\n"], ['', ''], $row);
+
+			if (($n + $start + 1) === $lineNumber)
+			{
+				preg_match_all('#<[^>]+>#', $row, $tags);
+				$out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s", $n + $start + 1, strip_tags($row), implode('', $tags[0])
+				);
+			}
+			else
+			{
+				$out .= sprintf('<span class="line"><span class="number">' . $format . '</span> %s', $n + $start + 1, $row) . "\n";
+			}
+		}
+
+		if ($spans > 0)
+		{
+			$out .= str_repeat('</span>', $spans);
+		}
+
+		return '<pre><code>' . $out . '</code></pre>';
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
new file mode 100644
index 0000000..62dec4f
--- /dev/null
+++ b/system/Debug/Iterator.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug;
+
+use Closure;
+
+/**
+ * Iterator for debugging.
+ */
+class Iterator
+{
+	/**
+	 * Stores the tests that we are to run.
+	 *
+	 * @var array
+	 */
+	protected $tests = [];
+
+	/**
+	 * Stores the results of each of the tests.
+	 *
+	 * @var array
+	 */
+	protected $results = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a test to run.
+	 *
+	 * Tests are simply closures that the user can define any sequence of
+	 * things to happen during the test.
+	 *
+	 * @param string  $name
+	 * @param Closure $closure
+	 *
+	 * @return $this
+	 */
+	public function add(string $name, Closure $closure)
+	{
+		$name = strtolower($name);
+
+		$this->tests[$name] = $closure;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs through all of the tests that have been added, recording
+	 * time to execute the desired number of iterations, and the approximate
+	 * memory usage used during those iterations.
+	 *
+	 * @param integer $iterations
+	 * @param boolean $output
+	 *
+	 * @return string|null
+	 */
+	public function run(int $iterations = 1000, bool $output = true)
+	{
+		foreach ($this->tests as $name => $test)
+		{
+			// clear memory before start
+			gc_collect_cycles();
+
+			$start    = microtime(true);
+			$startMem = $maxMemory = memory_get_usage(true);
+
+			for ($i = 0; $i < $iterations; $i ++)
+			{
+				$result = $test();
+
+				$maxMemory = max($maxMemory, memory_get_usage(true));
+
+				unset($result);
+			}
+
+			$this->results[$name] = [
+				'time'   => microtime(true) - $start,
+				'memory' => $maxMemory - $startMem,
+				'n'      => $iterations,
+			];
+		}
+
+		if ($output)
+		{
+			return $this->getReport();
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get results.
+	 *
+	 * @return string
+	 */
+	public function getReport(): string
+	{
+		if (empty($this->results))
+		{
+			return 'No results to display.';
+		}
+
+		helper('number');
+
+		// Template
+		$tpl = '<table>
+			<thead>
+				<tr>
+					<td>Test</td>
+					<td>Time</td>
+					<td>Memory</td>
+				</tr>
+			</thead>
+			<tbody>
+				{rows}
+			</tbody>
+		</table>';
+
+		$rows = '';
+
+		foreach ($this->results as $name => $result)
+		{
+			$memory = number_to_size($result['memory'], 4);
+
+			$rows .= "<tr>
+				<td>{$name}</td>
+				<td>" . number_format($result['time'], 4) . "</td>
+				<td>{$memory}</td>
+			</tr>";
+		}
+
+		$tpl = str_replace('{rows}', $rows, $tpl);
+
+		return $tpl . '<br/>';
+	}
+
+	//--------------------------------------------------------------------
+
+}
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
new file mode 100644
index 0000000..3474109
--- /dev/null
+++ b/system/Debug/Timer.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug;
+
+use RuntimeException;
+
+/**
+ * Class Timer
+ *
+ * Provides a simple way to measure the amount of time
+ * that elapses between two points.
+ */
+class Timer
+{
+	/**
+	 * List of all timers.
+	 *
+	 * @var array
+	 */
+	protected $timers = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts a timer running.
+	 *
+	 * Multiple calls can be made to this method so that several
+	 * execution points can be measured.
+	 *
+	 * @param string $name The name of this timer.
+	 * @param float  $time Allows user to provide time.
+	 *
+	 * @return Timer
+	 */
+	public function start(string $name, float $time = null)
+	{
+		$this->timers[strtolower($name)] = [
+			'start' => ! empty($time) ? $time : microtime(true),
+			'end'   => null,
+		];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stops a running timer.
+	 *
+	 * If the timer is not stopped before the timers() method is called,
+	 * it will be automatically stopped at that point.
+	 *
+	 * @param string $name The name of this timer.
+	 *
+	 * @return Timer
+	 */
+	public function stop(string $name)
+	{
+		$name = strtolower($name);
+
+		if (empty($this->timers[$name]))
+		{
+			throw new RuntimeException('Cannot stop timer: invalid name given.');
+		}
+
+		$this->timers[$name]['end'] = microtime(true);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the duration of a recorded timer.
+	 *
+	 * @param string  $name     The name of the timer.
+	 * @param integer $decimals Number of decimal places.
+	 *
+	 * @return null|float       Returns null if timer exists by that name.
+	 *                          Returns a float representing the number of
+	 *                          seconds elapsed while that timer was running.
+	 */
+	public function getElapsedTime(string $name, int $decimals = 4)
+	{
+		$name = strtolower($name);
+
+		if (empty($this->timers[$name]))
+		{
+			return null;
+		}
+
+		$timer = $this->timers[$name];
+
+		if (empty($timer['end']))
+		{
+			$timer['end'] = microtime(true);
+		}
+
+		return (float) number_format($timer['end'] - $timer['start'], $decimals);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the array of timers, with the duration pre-calculated for you.
+	 *
+	 * @param integer $decimals Number of decimal places
+	 *
+	 * @return array
+	 */
+	public function getTimers(int $decimals = 4): array
+	{
+		$timers = $this->timers;
+
+		foreach ($timers as &$timer)
+		{
+			if (empty($timer['end']))
+			{
+				$timer['end'] = microtime(true);
+			}
+
+			$timer['duration'] = (float) number_format($timer['end'] - $timer['start'], $decimals);
+		}
+
+		return $timers;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks whether or not a timer with the specified name exists.
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean
+	 */
+	public function has(string $name): bool
+	{
+		return array_key_exists(strtolower($name), $this->timers);
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
new file mode 100644
index 0000000..54ace95
--- /dev/null
+++ b/system/Debug/Toolbar.php
@@ -0,0 +1,510 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug;
+
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Debug\Toolbar\Collectors\BaseCollector;
+use CodeIgniter\Debug\Toolbar\Collectors\Config;
+use CodeIgniter\Debug\Toolbar\Collectors\History;
+use CodeIgniter\Format\JSONFormatter;
+use CodeIgniter\Format\XMLFormatter;
+use CodeIgniter\HTTP\DownloadResponse;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+use Config\Toolbar as ToolbarConfig;
+use Kint\Kint;
+
+/**
+ * Debug Toolbar
+ *
+ * Displays a toolbar with bits of stats to aid a developer in debugging.
+ *
+ * Inspiration: http://prophiler.fabfuel.de
+ */
+class Toolbar
+{
+	/**
+	 * Toolbar configuration settings.
+	 *
+	 * @var ToolbarConfig
+	 */
+	protected $config;
+
+	/**
+	 * Collectors to be used and displayed.
+	 *
+	 * @var BaseCollector[]
+	 */
+	protected $collectors = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param ToolbarConfig $config
+	 */
+	public function __construct(ToolbarConfig $config)
+	{
+		$this->config = $config;
+
+		foreach ($config->collectors as $collector)
+		{
+			if (! class_exists($collector))
+			{
+				log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' .
+						'please check $collectors in the Config\Toolbar.php file.');
+				continue;
+			}
+
+			$this->collectors[] = new $collector();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns all the data required by Debug Bar
+	 *
+	 * @param float             $startTime App start time
+	 * @param float             $totalTime
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 *
+	 * @return string JSON encoded data
+	 */
+	public function run(float $startTime, float $totalTime, RequestInterface $request, ResponseInterface $response): string
+	{
+		/**
+		 * @var IncomingRequest $request
+		 * @var Response $response
+		 */
+
+		// Data items used within the view.
+		$data['url']             = current_url();
+		$data['method']          = $request->getMethod(true);
+		$data['isAJAX']          = $request->isAJAX();
+		$data['startTime']       = $startTime;
+		$data['totalTime']       = $totalTime * 1000;
+		$data['totalMemory']     = number_format((memory_get_peak_usage()) / 1024 / 1024, 3);
+		$data['segmentDuration'] = $this->roundTo($data['totalTime'] / 7);
+		$data['segmentCount']    = (int) ceil($data['totalTime'] / $data['segmentDuration']);
+		$data['CI_VERSION']      = CodeIgniter::CI_VERSION;
+		$data['collectors']      = [];
+
+		foreach ($this->collectors as $collector)
+		{
+			$data['collectors'][] = $collector->getAsArray();
+		}
+
+		foreach ($this->collectVarData() as $heading => $items)
+		{
+			$varData = [];
+
+			if (is_array($items))
+			{
+				foreach ($items as $key => $value)
+				{
+					if (is_string($value))
+					{
+						$varData[esc($key)] = esc($value);
+					}
+					else
+					{
+						$oldKintMode       = Kint::$mode_default;
+						$oldKintCalledFrom = Kint::$display_called_from;
+
+						Kint::$mode_default        = Kint::MODE_RICH;
+						Kint::$display_called_from = false;
+
+						$kint = @Kint::dump($value);
+						$kint = substr($kint, strpos($kint, '</style>') + 8 );
+
+						Kint::$mode_default        = $oldKintMode;
+						Kint::$display_called_from = $oldKintCalledFrom;
+
+						$varData[esc($key)] = $kint;
+					}
+				}
+			}
+
+			$data['vars']['varData'][esc($heading)] = $varData;
+		}
+
+		if (! empty($_SESSION))
+		{
+			foreach ($_SESSION as $key => $value)
+			{
+				// Replace the binary data with string to avoid json_encode failure.
+				if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value))
+				{
+					$value = 'binary data';
+				}
+
+				$data['vars']['session'][esc($key)] = is_string($value) ? esc($value) : '<pre>' . esc(print_r($value, true)) . '</pre>';
+			}
+		}
+
+		foreach ($request->getGet() as $name => $value)
+		{
+			$data['vars']['get'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
+		}
+
+		foreach ($request->getPost() as $name => $value)
+		{
+			$data['vars']['post'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
+		}
+
+		foreach ($request->headers() as $header)
+		{
+			$data['vars']['headers'][esc($header->getName())] = esc($header->getValueLine());
+		}
+
+		foreach ($request->getCookie() as $name => $value)
+		{
+			$data['vars']['cookies'][esc($name)] = esc($value);
+		}
+
+		$data['vars']['request'] = ($request->isSecure() ? 'HTTPS' : 'HTTP') . '/' . $request->getProtocolVersion();
+
+		$data['vars']['response'] = [
+			'statusCode'  => $response->getStatusCode(),
+			'reason'      => esc($response->getReason()),
+			'contentType' => esc($response->getHeaderLine('content-type')),
+		];
+
+		$data['config'] = Config::display();
+
+		if ($response->CSP !== null)
+		{
+			$response->CSP->addImageSrc('data:');
+		}
+
+		return json_encode($data);
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Called within the view to display the timeline itself.
+	 *
+	 * @param array   $collectors
+	 * @param float   $startTime
+	 * @param integer $segmentCount
+	 * @param integer $segmentDuration
+	 * @param array   $styles
+	 *
+	 * @return string
+	 */
+	protected function renderTimeline(array $collectors, float $startTime, int $segmentCount, int $segmentDuration, array &$styles): string
+	{
+		$displayTime = $segmentCount * $segmentDuration;
+		$rows        = $this->collectTimelineData($collectors);
+		$output      = '';
+		$styleCount  = 0;
+
+		foreach ($rows as $row)
+		{
+			$output .= '<tr>';
+			$output .= "<td>{$row['name']}</td>";
+			$output .= "<td>{$row['component']}</td>";
+			$output .= "<td class='debug-bar-alignRight'>" . number_format($row['duration'] * 1000, 2) . ' ms</td>';
+			$output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
+
+			$offset = ((((float) $row['start'] - $startTime) * 1000) / $displayTime) * 100;
+			$length = (((float) $row['duration'] * 1000) / $displayTime) * 100;
+
+			$styles['debug-bar-timeline-' . $styleCount] = "left: {$offset}%; width: {$length}%;";
+
+			$output .= "<span class='timer debug-bar-timeline-{$styleCount}' title='" . number_format($length, 2) . "%'></span>";
+			$output .= '</td>';
+			$output .= '</tr>';
+
+			$styleCount++;
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a sorted array of timeline data arrays from the collectors.
+	 *
+	 * @param array $collectors
+	 *
+	 * @return array
+	 */
+	protected function collectTimelineData($collectors): array
+	{
+		$data = [];
+
+		// Collect it
+		foreach ($collectors as $collector)
+		{
+			if (! $collector['hasTimelineData'])
+			{
+				continue;
+			}
+
+			$data = array_merge($data, $collector['timelineData']);
+		}
+
+		// Sort it
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of data from all of the modules
+	 * that should be displayed in the 'Vars' tab.
+	 *
+	 * @return array
+	 */
+	protected function collectVarData(): array
+	{
+		$data = [];
+
+		foreach ($this->collectors as $collector)
+		{
+			if (! $collector->hasVarData())
+			{
+				continue;
+			}
+
+			$data = array_merge($data, $collector->getVarData());
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rounds a number to the nearest incremental value.
+	 *
+	 * @param float   $number
+	 * @param integer $increments
+	 *
+	 * @return float
+	 */
+	protected function roundTo(float $number, int $increments = 5): float
+	{
+		$increments = 1 / $increments;
+
+		return (ceil($number * $increments) / $increments);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepare for debugging..
+	 *
+	 * @param  RequestInterface  $request
+	 * @param  ResponseInterface $response
+	 * @global \CodeIgniter\CodeIgniter $app
+	 * @return void
+	 */
+	public function prepare(RequestInterface $request = null, ResponseInterface $response = null)
+	{
+		/**
+		 * @var IncomingRequest $request
+		 * @var Response $response
+		 */
+
+		if (CI_DEBUG && ! is_cli())
+		{
+			global $app;
+
+			$request  = $request ?? Services::request();
+			$response = $response ?? Services::response();
+
+			// Disable the toolbar for downloads
+			if ($response instanceof DownloadResponse)
+			{
+				return;
+			}
+
+			$toolbar = Services::toolbar(config(Toolbar::class));
+			$stats   = $app->getPerformanceStats();
+			$data    = $toolbar->run(
+					$stats['startTime'],
+					$stats['totalTime'],
+					$request,
+					$response
+			);
+
+			helper('filesystem');
+
+			// Updated to time() so we can get history
+			$time = time();
+
+			if (! is_dir(WRITEPATH . 'debugbar'))
+			{
+				mkdir(WRITEPATH . 'debugbar', 0777);
+			}
+
+			write_file(WRITEPATH . 'debugbar/' . 'debugbar_' . $time . '.json', $data, 'w+');
+
+			$format = $response->getHeaderLine('content-type');
+
+			// Non-HTML formats should not include the debugbar
+			// then we send headers saying where to find the debug data
+			// for this response
+			if ($request->isAJAX() || strpos($format, 'html') === false)
+			{
+				$response->setHeader('Debugbar-Time', "$time")
+						->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"))
+						->getBody();
+
+				return;
+			}
+
+			$oldKintMode        = Kint::$mode_default;
+			Kint::$mode_default = Kint::MODE_RICH;
+			$kintScript         = @Kint::dump('');
+			Kint::$mode_default = $oldKintMode;
+			$kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8 );
+
+			$script = PHP_EOL
+					. '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
+					. 'data-time="' . $time . '" '
+					. 'src="' . site_url() . '?debugbar"></script>'
+					. '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
+					. '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
+					. $kintScript
+					. PHP_EOL;
+
+			if (strpos($response->getBody(), '<head>') !== false)
+			{
+				$response->setBody(preg_replace('/<head>/', '<head>' . $script, $response->getBody(), 1));
+				return;
+			}
+
+			$response->appendBody($script);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inject debug toolbar into the response.
+	 */
+	public function respond()
+	{
+		if (ENVIRONMENT === 'testing')
+		{
+			return;
+		}
+
+		// @codeCoverageIgnoreStart
+		$request = Services::request();
+
+		// If the request contains '?debugbar then we're
+		// simply returning the loading script
+		if ($request->getGet('debugbar') !== null)
+		{
+			// Let the browser know that we are sending javascript
+			header('Content-Type: application/javascript');
+
+			ob_start();
+			include($this->config->viewsPath . 'toolbarloader.js.php');
+			$output = ob_get_clean();
+
+			exit($output);
+		}
+
+		// Otherwise, if it includes ?debugbar_time, then
+		// we should return the entire debugbar.
+		if ($request->getGet('debugbar_time'))
+		{
+			helper('security');
+
+			// Negotiate the content-type to format the output
+			$format = $request->negotiate('media', [
+				'text/html',
+				'application/json',
+				'application/xml',
+			]);
+			$format = explode('/', $format)[1];
+
+			$file     = sanitize_filename('debugbar_' . $request->getGet('debugbar_time'));
+			$filename = WRITEPATH . 'debugbar/' . $file . '.json';
+
+			// Show the toolbar
+			if (is_file($filename))
+			{
+				$contents = $this->format(file_get_contents($filename), $format);
+				exit($contents);
+			}
+
+			// File was not written or do not exists
+			http_response_code(404);
+			exit; // Exit here is needed to avoid load the index page
+		}
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Format output
+	 *
+	 * @param string $data   JSON encoded Toolbar data
+	 * @param string $format html, json, xml
+	 *
+	 * @return string
+	 */
+	protected function format(string $data, string $format = 'html'): string
+	{
+		$data = json_decode($data, true);
+
+		if ($this->config->maxHistory !== 0)
+		{
+			$history = new History();
+			$history->setFiles(
+				(int) Services::request()->getGet('debugbar_time'),
+				$this->config->maxHistory
+			);
+
+			$data['collectors'][] = $history->getAsArray();
+		}
+
+		$output = '';
+
+		switch ($format)
+		{
+			case 'html':
+				$data['styles'] = [];
+				extract($data);
+				$parser = Services::parser($this->config->viewsPath, null, false);
+				ob_start();
+				include($this->config->viewsPath . 'toolbar.tpl.php');
+				$output = ob_get_clean();
+				break;
+			case 'json':
+				$formatter = new JSONFormatter();
+				$output    = $formatter->format($data);
+				break;
+			case 'xml':
+				$formatter = new XMLFormatter;
+				$output    = $formatter->format($data);
+				break;
+		}
+
+		return $output;
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
new file mode 100644
index 0000000..e5824a7
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -0,0 +1,285 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Debug\Exceptions;
+
+/**
+ * Base Toolbar collector
+ */
+class BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * a label or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasLabel = false;
+
+	/**
+	 * Whether this collector has data that
+	 * should be shown in the Vars tab.
+	 *
+	 * @var boolean
+	 */
+	protected $hasVarData = false;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = '';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the Collector's title.
+	 *
+	 * @param  boolean $safe
+	 * @return string
+	 */
+	public function getTitle(bool $safe = false): string
+	{
+		if ($safe)
+		{
+			return str_replace(' ', '-', strtolower($this->title));
+		}
+
+		return $this->title;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns any information that should be shown next to the title.
+	 *
+	 * @return string
+	 */
+	public function getTitleDetails(): string
+	{
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does this collector need it's own tab?
+	 *
+	 * @return boolean
+	 */
+	public function hasTabContent(): bool
+	{
+		return (bool) $this->hasTabContent;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does this collector have a label?
+	 *
+	 * @return boolean
+	 */
+	public function hasLabel(): bool
+	{
+		return (bool) $this->hasLabel;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does this collector have information for the timeline?
+	 *
+	 * @return boolean
+	 */
+	public function hasTimelineData(): bool
+	{
+		return (bool) $this->hasTimeline;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Grabs the data for the timeline, properly formatted,
+	 * or returns an empty array.
+	 *
+	 * @return array
+	 */
+	public function timelineData(): array
+	{
+		if (! $this->hasTimeline)
+		{
+			return [];
+		}
+
+		return $this->formatTimelineData();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does this Collector have data that should be shown in the
+	 * 'Vars' tab?
+	 *
+	 * @return boolean
+	 */
+	public function hasVarData(): bool
+	{
+		return (bool) $this->hasVarData;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets a collection of data that should be shown in the 'Vars' tab.
+	 * The format is an array of sections, each with their own array
+	 * of key/value pairs:
+	 *
+	 *  $data = [
+	 *      'section 1' => [
+	 *          'foo' => 'bar,
+	 *          'bar' => 'baz'
+	 *      ],
+	 *      'section 2' => [
+	 *          'foo' => 'bar,
+	 *          'bar' => 'baz'
+	 *      ],
+	 *  ];
+	 */
+	public function getVarData()
+	{
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Child classes should implement this to return the timeline data
+	 * formatted for correct usage.
+	 *
+	 * Timeline data should be formatted into arrays that look like:
+	 *
+	 *  [
+	 *      'name'      => 'Database::Query',
+	 *      'component' => 'Database',
+	 *      'start'     => 10       // milliseconds
+	 *      'duration'  => 15       // milliseconds
+	 *  ]
+	 *
+	 * @return array
+	 */
+	protected function formatTimelineData(): array
+	{
+		return [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array|string
+	 */
+	public function display()
+	{
+		return [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clean Path
+	 *
+	 * This makes nicer looking paths for the error output.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	public function cleanPath(string $file): string
+	{
+		return Exceptions::cleanPath($file);
+	}
+
+	/**
+	 * Gets the "badge" value for the button.
+	 */
+	public function getBadgeValue()
+	{
+		return null;
+	}
+
+	/**
+	 * Does this collector have any data collected?
+	 *
+	 * If not, then the toolbar button won't get shown.
+	 *
+	 * @return boolean
+	 */
+	public function isEmpty(): bool
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the HTML to display the icon. Should either
+	 * be SVG, or a base-64 encoded.
+	 *
+	 * Recommended dimensions are 24px x 24px
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return '';
+	}
+
+	/**
+	 * Return settings as an array.
+	 *
+	 * @return array
+	 */
+	public function getAsArray(): array
+	{
+		return [
+			'title'           => $this->getTitle(),
+			'titleSafe'       => $this->getTitle(true),
+			'titleDetails'    => $this->getTitleDetails(),
+			'display'         => $this->display(),
+			'badgeValue'      => $this->getBadgeValue(),
+			'isEmpty'         => $this->isEmpty(),
+			'hasTabContent'   => $this->hasTabContent(),
+			'hasLabel'        => $this->hasLabel(),
+			'icon'            => $this->icon(),
+			'hasTimelineData' => $this->hasTimelineData(),
+			'timelineData'    => $this->timelineData(),
+		];
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
new file mode 100644
index 0000000..b7aecb7
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Config.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\CodeIgniter;
+use Config\App;
+use Config\Services;
+
+/**
+ * Debug toolbar configuration
+ */
+class Config
+{
+	/**
+	 * Return toolbar config values as an array.
+	 *
+	 * @return array
+	 */
+	public static function display(): array
+	{
+		$config = config(App::class);
+
+		return [
+			'ciVersion'   => CodeIgniter::CI_VERSION,
+			'phpVersion'  => phpversion(),
+			'phpSAPI'     => php_sapi_name(),
+			'environment' => ENVIRONMENT,
+			'baseURL'     => $config->baseURL,
+			'timezone'    => app_timezone(),
+			'locale'      => Services::request()->getLocale(),
+			'cspEnabled'  => $config->CSPEnabled,
+		];
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
new file mode 100644
index 0000000..a6c4458
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Database\Query;
+
+/**
+ * Collector for the Database tab of the Debug Toolbar.
+ */
+class Database extends BaseCollector
+{
+	/**
+	 * Whether this collector has timeline data.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = true;
+
+	/**
+	 * Whether this collector should display its own tab.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = true;
+
+	/**
+	 * Whether this collector has data for the Vars tab.
+	 *
+	 * @var boolean
+	 */
+	protected $hasVarData = false;
+
+	/**
+	 * The name used to reference this collector in the toolbar.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Database';
+
+	/**
+	 * Array of database connections.
+	 *
+	 * @var array
+	 */
+	protected $connections;
+
+	/**
+	 * The query instances that have been collected
+	 * through the DBQuery Event.
+	 *
+	 * @var Query[]
+	 */
+	protected static $queries = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->connections = \Config\Database::getConnections();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The static method used during Events to collect
+	 * data.
+	 *
+	 * @param Query $query
+	 *
+	 * @internal param $ array \CodeIgniter\Database\Query
+	 */
+	public static function collect(Query $query)
+	{
+		$config = config('Toolbar');
+
+		// Provide default in case it's not set
+		$max = $config->maxQueries ?: 100;
+
+		if (count(static::$queries) < $max)
+		{
+			static::$queries[] = $query;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns timeline data formatted for the toolbar.
+	 *
+	 * @return array The formatted data or an empty array.
+	 */
+	protected function formatTimelineData(): array
+	{
+		$data = [];
+
+		foreach ($this->connections as $alias => $connection)
+		{
+			// Connection Time
+			$data[] = [
+				'name'      => 'Connecting to Database: "' . $alias . '"',
+				'component' => 'Database',
+				'start'     => $connection->getConnectStart(),
+				'duration'  => $connection->getConnectDuration(),
+			];
+		}
+
+		foreach (static::$queries as $query)
+		{
+			$data[] = [
+				'name'      => 'Query',
+				'component' => 'Database',
+				'start'     => $query->getStartTime(true),
+				'duration'  => $query->getDuration(),
+			];
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array
+	 */
+	public function display(): array
+	{
+		$data['queries'] = array_map(function (Query $query) {
+			return [
+				'duration' => ((float) $query->getDuration(5) * 1000) . ' ms',
+				'sql'      => $query->debugToolbarDisplay(),
+			];
+		}, static::$queries);
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the "badge" value for the button.
+	 *
+	 * @return integer
+	 */
+	public function getBadgeValue(): int
+	{
+		return count(static::$queries);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Information to be displayed next to the title.
+	 *
+	 * @return string The number of queries (in parentheses) or an empty string.
+	 */
+	public function getTitleDetails(): string
+	{
+		return '(' . count(static::$queries) . ' Queries across ' . ($countConnection = count($this->connections)) . ' Connection' .
+				($countConnection > 1 ? 's' : '') . ')';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does this collector have any data collected?
+	 *
+	 * @return boolean
+	 */
+	public function isEmpty(): bool
+	{
+		return empty(static::$queries);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVEhLY6A3YExLSwsA4nIycQDIDIhRWEBqamo/UNF/SjDQjF6ocZgAKPkRiFeEhoYyQ4WIBiA9QAuWAPEHqBAmgLqgHcolGQD1V4DMgHIxwbCxYD+QBqcKINseKo6eWrBioPrtQBq/BcgY5ht0cUIYbBg2AJKkRxCNWkDQgtFUNJwtABr+F6igE8olGQD114HMgHIxAVDyAhA/AlpSA8RYUwoeXAPVex5qHCbIyMgwBCkAuQJIY00huDBUz/mUlBQDqHGjgBjAwAAACexpph6oHSQAAAAASUVORK5CYII=';
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
new file mode 100644
index 0000000..03f7846
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\View\RendererInterface;
+use Config\Services;
+
+/**
+ * Views collector
+ */
+class Events extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = true;
+
+	/**
+	 * Whether this collector has data that
+	 * should be shown in the Vars tab.
+	 *
+	 * @var boolean
+	 */
+	protected $hasVarData = false;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Events';
+
+	/**
+	 * Instance of the Renderer service
+	 *
+	 * @var RendererInterface
+	 */
+	protected $viewer;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->viewer = Services::renderer();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Child classes should implement this to return the timeline data
+	 * formatted for correct usage.
+	 *
+	 * @return array
+	 */
+	protected function formatTimelineData(): array
+	{
+		$data = [];
+
+		$rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
+
+		foreach ($rows as $info)
+		{
+			$data[] = [
+				'name'      => 'View: ' . $info['view'],
+				'component' => 'Views',
+				'start'     => $info['start'],
+				'duration'  => $info['end'] - $info['start'],
+			];
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array
+	 */
+	public function display(): array
+	{
+		$data = [
+			'events' => [],
+		];
+
+		foreach (\CodeIgniter\Events\Events::getPerformanceLogs() as $row)
+		{
+			$key = $row['event'];
+
+			if (! array_key_exists($key, $data['events']))
+			{
+				$data['events'][$key] = [
+					'event'    => $key,
+					'duration' => ($row['end'] - $row['start']) * 1000,
+					'count'    => 1,
+				];
+
+				continue;
+			}
+
+			$data['events'][$key]['duration'] += ($row['end'] - $row['start']) * 1000;
+			$data['events'][$key]['count']++;
+		}
+
+		foreach ($data['events'] as &$row)
+		{
+			$row['duration'] = number_format($row['duration'], 2);
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the "badge" value for the button.
+	 *
+	 * @return integer
+	 */
+	public function getBadgeValue(): int
+	{
+		return count(\CodeIgniter\Events\Events::getPerformanceLogs());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEASURBVEhL7ZXNDcIwDIVTsRBH1uDQDdquUA6IM1xgCA6MwJUN2hk6AQzAz0vl0ETUxC5VT3zSU5w81/mRMGZysixbFEVR0jSKNt8geQU9aRpFmp/keX6AbjZ5oB74vsaN5lSzA4tLSjpBFxsjeSuRy4d2mDdQTWU7YLbXTNN05mKyovj5KL6B7q3hoy3KwdZxBlT+Ipz+jPHrBqOIynZgcZonoukb/0ckiTHqNvDXtXEAaygRbaB9FvUTjRUHsIYS0QaSp+Dw6wT4hiTmYHOcYZsdLQ2CbXa4ftuuYR4x9vYZgdb4vsFYUdmABMYeukK9/SUme3KMFQ77+Yfzh8eYF8+orDuDWU5LAAAAAElFTkSuQmCC';
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
new file mode 100644
index 0000000..1c4ed77
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+/**
+ * Files collector
+ */
+class Files extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = true;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Files';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns any information that should be shown next to the title.
+	 *
+	 * @return string
+	 */
+	public function getTitleDetails(): string
+	{
+		return '( ' . (int) count(get_included_files()) . ' )';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array
+	 */
+	public function display(): array
+	{
+		$rawFiles  = get_included_files();
+		$coreFiles = [];
+		$userFiles = [];
+
+		foreach ($rawFiles as $file)
+		{
+			$path = $this->cleanPath($file);
+
+			if (strpos($path, 'SYSTEMPATH') !== false)
+			{
+				$coreFiles[] = [
+					'name' => basename($file),
+					'path' => $path,
+				];
+			}
+			else
+			{
+				$userFiles[] = [
+					'name' => basename($file),
+					'path' => $path,
+				];
+			}
+		}
+
+		sort($userFiles);
+		sort($coreFiles);
+
+		return [
+			'coreFiles' => $coreFiles,
+			'userFiles' => $userFiles,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the number of included files as a badge in the tab button.
+	 *
+	 * @return integer
+	 */
+	public function getBadgeValue(): int
+	{
+		return count(get_included_files());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGBSURBVEhL7ZQ9S8NQGIVTBQUncfMfCO4uLgoKbuKQOWg+OkXERRE1IAXrIHbVDrqIDuLiJgj+gro7S3dnpfq88b1FMTE3VZx64HBzzvvZWxKnj15QCcPwCD5HUfSWR+JtzgmtsUcQBEva5IIm9SwSu+95CAWbUuy67qBa32ByZEDpIaZYZSZMjjQuPcQUq8yEyYEb8FSerYeQVGbAFzJkX1PyQWLhgCz0BxTCekC1Wp0hsa6yokzhed4oje6Iz6rlJEkyIKfUEFtITVtQdAibn5rMyaYsMS+a5wTv8qeXMhcU16QZbKgl3hbs+L4/pnpdc87MElZgq10p5DxGdq8I7xrvUWUKvG3NbSK7ubngYzdJwSsF7TiOh9VOgfcEz1UayNe3JUPM1RWC5GXYgTfc75B4NBmXJnAtTfpABX0iPvEd9ezALwkplCFXcr9styiNOKc1RRZpaPM9tcqBwlWzGY1qPL9wjqRBgF5BH6j8HWh2S7MHlX8PrmbK+k/8PzjOOzx1D3i1pKTTAAAAAElFTkSuQmCC';
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
new file mode 100644
index 0000000..818d2a8
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+/**
+ * History collector
+ */
+class History extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = true;
+
+	/**
+	 * Whether this collector needs to display
+	 * a label or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasLabel = true;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'History';
+
+	/**
+	 * @var array History files
+	 */
+	protected $files = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Specify time limit & file count for debug history.
+	 *
+	 * @param integer $current Current history time
+	 * @param integer $limit   Max history files
+	 */
+	public function setFiles(int $current, int $limit = 20)
+	{
+		$filenames = glob(WRITEPATH . 'debugbar/debugbar_*.json');
+
+		$files   = [];
+		$counter = 0;
+
+		foreach (array_reverse($filenames) as $filename)
+		{
+			$counter++;
+
+			// Oldest files will be deleted
+			if ($limit >= 0 && $counter > $limit)
+			{
+				unlink($filename);
+				continue;
+			}
+
+			// Get the contents of this specific history request
+			$contents = file_get_contents($filename);
+
+			$contents = @json_decode($contents);
+			if (json_last_error() === JSON_ERROR_NONE)
+			{
+				preg_match_all('/\d+/', $filename, $time);
+				$time = (int) end($time[0]);
+
+				// Debugbar files shown in History Collector
+				$files[] = [
+					'time'        => $time,
+					'datetime'    => date('Y-m-d H:i:s', $time),
+					'active'      => $time === $current,
+					'status'      => $contents->vars->response->statusCode,
+					'method'      => $contents->method,
+					'url'         => $contents->url,
+					'isAJAX'      => $contents->isAJAX ? 'Yes' : 'No',
+					'contentType' => $contents->vars->response->contentType,
+				];
+			}
+		}
+
+		$this->files = $files;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array
+	 */
+	public function display(): array
+	{
+		return ['files' => $this->files];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the number of included files as a badge in the tab button.
+	 *
+	 * @return integer
+	 */
+	public function getBadgeValue(): int
+	{
+		return count($this->files);
+	}
+
+	/**
+	 * Return true if there are no history files.
+	 *
+	 * @return boolean
+	 */
+	public function isEmpty(): bool
+	{
+		return empty($this->files);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJySURBVEhL3ZU7aJNhGIVTpV6i4qCIgkIHxcXLErS4FBwUFNwiCKGhuTYJGaIgnRoo4qRu6iCiiIuIXXTTIkIpuqoFwaGgonUQlC5KafU5ycmNP0lTdPLA4fu+8573/a4/f6hXpFKpwUwmc9fDfweKbk+n07fgEv33TLSbtt/hvwNFT1PsG/zdTE0Gp+GFfD6/2fbVIxqNrqPIRbjg4t/hY8aztcngfDabHXbKyiiXy2vcrcPH8oDCry2FKDrA+Ar6L01E/ypyXzXaARjDGGcoeNxSDZXE0dHRA5VRE5LJ5CFy5jzJuOX2wHRHRnjbklZ6isQ3tIctBaAd4vlK3jLtkOVWqABBXd47jGHLmjTmSScttQV5J+SjfcUweFQEbsjAas5aqoCLXutJl7vtQsAzpRowYqkBinyCC8Vicb2lOih8zoldd0F8RD7qTFiqAnGrAy8stUAvi/hbqDM+YzkAFrLPdR5ZqoLXsd+Bh5YCIH7JniVdquUWxOPxDfboHhrI5XJ7HHhiqQXox+APe/Qk64+gGYVCYZs8cMpSFQj9JOoFzVqqo7k4HIvFYpscCoAjOmLffUsNUGRaQUwDlmofUa34ecsdgXdcXo4wbakBgiUFafXJV8A4DJ/2UrxUKm3E95H8RbjLcgOJRGILhnmCP+FBy5XvwN2uIPcy1AJvWgqC4xm2aU4Xb3lF4I+Tpyf8hRe5w3J7YLymSeA8Z3nSclv4WLRyFdfOjzrUFX0klJUEtZtntCNc+F69cz/FiDzEPtjzmcUMOr83kDQEX6pAJxJfpL3OX22n01YN7SZCoQnaSdoZ+Jz+PZihH3wt/xlCoT9M6nEtmRSPCQAAAABJRU5ErkJggg==';
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
new file mode 100644
index 0000000..acae3b7
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Logs.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use Config\Services;
+
+/**
+ * Loags collector
+ */
+class Logs extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = true;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Logs';
+
+	/**
+	 * Our collected data.
+	 *
+	 * @var array
+	 */
+	protected $data;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array
+	 */
+	public function display(): array
+	{
+		return [
+			'logs' => $this->collectLogs(),
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does this collector actually have any data to display?
+	 *
+	 * @return boolean
+	 */
+	public function isEmpty(): bool
+	{
+		$this->collectLogs();
+
+		return empty($this->data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVEhLYxgFJIHU1FSjtLS0i0D8AYj7gEKMEBkqAaAFF4D4ERCvAFrwH4gDoFIMKSkpFkB+OTEYqgUTACXfA/GqjIwMQyD9H2hRHlQKJFcBEiMGQ7VgAqCBvUgK32dmZspCpagGGNPT0/1BLqeF4bQHQJePpiIwhmrBBEADR1MRfgB0+WgqAmOoFkwANHA0FY0CUgEDAwCQ0PUpNB3kqwAAAABJRU5ErkJggg==';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures the data has been collected.
+	 */
+	protected function collectLogs()
+	{
+		if (! empty($this->data))
+		{
+			return $this->data;
+		}
+
+		return $this->data = Services::logger(true)->logCache ?? [];
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
new file mode 100644
index 0000000..4651483
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use Config\Services;
+use ReflectionException;
+use ReflectionFunction;
+use ReflectionMethod;
+
+/**
+ * Routes collector
+ */
+class Routes extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = true;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Routes';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the data of this collector to be formatted in the toolbar
+	 *
+	 * @return array
+	 * @throws ReflectionException
+	 */
+	public function display(): array
+	{
+		$rawRoutes = Services::routes(true);
+		$router    = Services::router(null, null, true);
+
+		/*
+		 * Matched Route
+		 */
+		$route = $router->getMatchedRoute();
+
+		// Get our parameters
+		// Closure routes
+		if (is_callable($router->controllerName()))
+		{
+			$method = new ReflectionFunction($router->controllerName());
+		}
+		else
+		{
+			try
+			{
+				$method = new ReflectionMethod($router->controllerName(), $router->methodName());
+			}
+			catch (ReflectionException $e)
+			{
+				// If we're here, the method doesn't exist
+				// and is likely calculated in _remap.
+				$method = new ReflectionMethod($router->controllerName(), '_remap');
+			}
+		}
+
+		$rawParams = $method->getParameters();
+
+		$params = [];
+		foreach ($rawParams as $key => $param)
+		{
+			$params[] = [
+				'name'  => $param->getName(),
+				'value' => $router->params()[$key] ??
+					'&lt;empty&gt;&nbsp| default: ' . var_export($param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, true),
+			];
+		}
+
+		$matchedRoute = [
+			[
+				'directory'  => $router->directory(),
+				'controller' => $router->controllerName(),
+				'method'     => $router->methodName(),
+				'paramCount' => count($router->params()),
+				'truePCount' => count($params),
+				'params'     => $params,
+			],
+		];
+
+		/*
+		* Defined Routes
+		*/
+		$routes  = [];
+		$methods = [
+			'get',
+			'head',
+			'post',
+			'patch',
+			'put',
+			'delete',
+			'options',
+			'trace',
+			'connect',
+			'cli',
+		];
+
+		foreach ($methods as $method)
+		{
+			$raw = $rawRoutes->getRoutes($method);
+
+			foreach ($raw as $route => $handler)
+			{
+				// filter for strings, as callbacks aren't displayable
+				if (is_string($handler))
+				{
+					$routes[] = [
+						'method'  => strtoupper($method),
+						'route'   => $route,
+						'handler' => $handler,
+					];
+				}
+			}
+		}
+
+		return [
+			'matchedRoute' => $matchedRoute,
+			'routes'       => $routes,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a count of all the routes in the system.
+	 *
+	 * @return integer
+	 */
+	public function getBadgeValue(): int
+	{
+		$rawRoutes = Services::routes(true);
+
+		return count($rawRoutes->getRoutes());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFDSURBVEhL7ZRNSsNQFIUjVXSiOFEcuQIHDpzpxC0IGYeE/BEInbWlCHEDLsSiuANdhKDjgm6ggtSJ+l25ldrmmTwIgtgDh/t37r1J+16cX0dRFMtpmu5pWAkrvYjjOB7AETzStBFW+inxu3KUJMmhludQpoflS1zXban4LYqiO224h6VLTHr8Z+z8EpIHFF9gG78nDVmW7UgTHKjsCyY98QP+pcq+g8Ku2s8G8X3f3/I8b038WZTp+bO38zxfFd+I6YY6sNUvFlSDk9CRhiAI1jX1I9Cfw7GG1UB8LAuwbU0ZwQnbRDeEN5qqBxZMLtE1ti9LtbREnMIuOXnyIf5rGIb7Wq8HmlZgwYBH7ORTcKH5E4mpjeGt9fBZcHE2GCQ3Vt7oTNPNg+FXLHnSsHkw/FR+Gg2bB8Ptzrst/v6C/wrH+QB+duli6MYJdQAAAABJRU5ErkJggg==';
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
new file mode 100644
index 0000000..bb364f9
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Timers.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use Config\Services;
+
+/**
+ * Timers collector
+ */
+class Timers extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = true;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = false;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Timers';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Child classes should implement this to return the timeline data
+	 * formatted for correct usage.
+	 *
+	 * @return array
+	 */
+	protected function formatTimelineData(): array
+	{
+		$data = [];
+
+		$benchmark = Services::timer(true);
+		$rows      = $benchmark->getTimers(6);
+
+		foreach ($rows as $name => $info)
+		{
+			if ($name === 'total_execution')
+			{
+				continue;
+			}
+
+			$data[] = [
+				'name'      => ucwords(str_replace('_', ' ', $name)),
+				'component' => 'Timer',
+				'start'     => $info['start'],
+				'duration'  => $info['end'] - $info['start'],
+			];
+		}
+
+		return $data;
+	}
+}
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
new file mode 100644
index 0000000..c14c450
--- /dev/null
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\View\RendererInterface;
+use Config\Services;
+
+/**
+ * Views collector
+ */
+class Views extends BaseCollector
+{
+	/**
+	 * Whether this collector has data that can
+	 * be displayed in the Timeline.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTimeline = true;
+
+	/**
+	 * Whether this collector needs to display
+	 * content in a tab or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasTabContent = false;
+
+	/**
+	 * Whether this collector needs to display
+	 * a label or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasLabel = true;
+
+	/**
+	 * Whether this collector has data that
+	 * should be shown in the Vars tab.
+	 *
+	 * @var boolean
+	 */
+	protected $hasVarData = true;
+
+	/**
+	 * The 'title' of this Collector.
+	 * Used to name things in the toolbar HTML.
+	 *
+	 * @var string
+	 */
+	protected $title = 'Views';
+
+	/**
+	 * Instance of the Renderer service
+	 *
+	 * @var RendererInterface
+	 */
+	protected $viewer;
+
+	/**
+	 * Views counter
+	 *
+	 * @var array
+	 */
+	protected $views = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->viewer = Services::renderer();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Child classes should implement this to return the timeline data
+	 * formatted for correct usage.
+	 *
+	 * @return array
+	 */
+	protected function formatTimelineData(): array
+	{
+		$data = [];
+
+		$rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
+
+		foreach ($rows as $info)
+		{
+			$data[] = [
+				'name'      => 'View: ' . $info['view'],
+				'component' => 'Views',
+				'start'     => $info['start'],
+				'duration'  => $info['end'] - $info['start'],
+			];
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets a collection of data that should be shown in the 'Vars' tab.
+	 * The format is an array of sections, each with their own array
+	 * of key/value pairs:
+	 *
+	 *  $data = [
+	 *      'section 1' => [
+	 *          'foo' => 'bar,
+	 *          'bar' => 'baz'
+	 *      ],
+	 *      'section 2' => [
+	 *          'foo' => 'bar,
+	 *          'bar' => 'baz'
+	 *      ],
+	 *  ];
+	 *
+	 * @return array
+	 */
+	public function getVarData(): array
+	{
+		return [
+			// @phpstan-ignore-next-line
+			'View Data' => $this->viewer->getData(),
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a count of all views.
+	 *
+	 * @return integer
+	 */
+	public function getBadgeValue(): int
+	{
+		return count($this->viewer->getPerformanceData()); // @phpstan-ignore-line
+	}
+
+	/**
+	 * Display the icon.
+	 *
+	 * Icon from https://icons8.com - 1em package
+	 *
+	 * @return string
+	 */
+	public function icon(): string
+	{
+		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADeSURBVEhL7ZSxDcIwEEWNYA0YgGmgyAaJLTcUaaBzQQEVjMEabBQxAdw53zTHiThEovGTfnE/9rsoRUxhKLOmaa6Uh7X2+UvguLCzVxN1XW9x4EYHzik033Hp3X0LO+DaQG8MDQcuq6qao4qkHuMgQggLvkPLjqh00ZgFDBacMJYFkuwFlH1mshdkZ5JPJERA9JpI6xNCBESvibQ+IURA9JpI6xNCBESvibQ+IURA9DTsuHTOrVFFxixgB/eUFlU8uKJ0eDBFOu/9EvoeKnlJS2/08Tc8NOwQ8sIfMeYFjqKDjdU2sp4AAAAASUVORK5CYII=';
+	}
+}
diff --git a/system/Debug/Toolbar/Views/_config.tpl b/system/Debug/Toolbar/Views/_config.tpl
new file mode 100644
index 0000000..3934cf6
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_config.tpl
@@ -0,0 +1,48 @@
+<p class="debug-bar-alignRight">
+	<a href="https://codeigniter4.github.io/CodeIgniter4/index.html" target="_blank" >Read the CodeIgniter docs...</a>
+</p>
+
+<table>
+	<tbody>
+		<tr>
+			<td>CodeIgniter Version:</td>
+			<td>{ ciVersion }</td>
+		</tr>
+		<tr>
+			<td>PHP Version:</td>
+			<td>{ phpVersion }</td>
+		</tr>
+		<tr>
+			<td>PHP SAPI:</td>
+			<td>{ phpSAPI }</td>
+		</tr>
+		<tr>
+			<td>Environment:</td>
+			<td>{ environment }</td>
+		</tr>
+		<tr>
+			<td>Base URL:</td>
+			<td>
+				{ if $baseURL == '' }
+					<div class="warning">
+						The $baseURL should always be set manually to prevent possible URL personification from external parties.
+					</div>
+				{ else }
+					{ baseURL }
+				{ endif }
+			</td>
+		</tr>
+		<tr>
+			<td>Timezone:</td>
+			<td>{ timezone }</td>
+		</tr>
+		<tr>
+			<td>Locale:</td>
+			<td>{ locale }</td>
+		</tr>
+		<tr>
+			<td>Content Security Policy Enabled:</td>
+			<td>{ if $cspEnabled } Yes { else } No { endif }</td>
+		</tr>
+	</tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_database.tpl b/system/Debug/Toolbar/Views/_database.tpl
new file mode 100644
index 0000000..b5cf1a4
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_database.tpl
@@ -0,0 +1,16 @@
+<table>
+    <thead>
+        <tr>
+            <th class="debug-bar-width6r">Time</th>
+            <th>Query String</th>
+        </tr>
+    </thead>
+    <tbody>
+    {queries}
+        <tr>
+            <td class="narrow">{duration}</td>
+            <td>{! sql !}</td>
+        </tr>
+    {/queries}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_events.tpl b/system/Debug/Toolbar/Views/_events.tpl
new file mode 100644
index 0000000..88d732f
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_events.tpl
@@ -0,0 +1,18 @@
+<table>
+    <thead>
+        <tr>
+            <th class="debug-bar-width6r">Time</th>
+            <th>Event Name</th>
+            <th>Times Called</th>
+        </tr>
+    </thead>
+    <tbody>
+    {events}
+        <tr>
+            <td class="narrow">{ duration } ms</td>
+            <td>{event}</td>
+            <td>{count}</td>
+        </tr>
+    {/events}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_files.tpl b/system/Debug/Toolbar/Views/_files.tpl
new file mode 100644
index 0000000..9c992ab
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_files.tpl
@@ -0,0 +1,16 @@
+<table>
+    <tbody>
+    {userFiles}
+        <tr>
+            <td>{name}</td>
+            <td>{path}</td>
+        </tr>
+    {/userFiles}
+    {coreFiles}
+        <tr class="muted">
+            <td class="debug-bar-width20e">{name}</td>
+            <td>{path}</td>
+        </tr>
+    {/coreFiles}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_history.tpl b/system/Debug/Toolbar/Views/_history.tpl
new file mode 100644
index 0000000..9db00ec
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_history.tpl
@@ -0,0 +1,28 @@
+<table>
+    <thead>
+        <tr>
+            <th>Action</th>
+            <th>Datetime</th>
+            <th>Status</th>
+            <th>Method</th>
+            <th>URL</th>
+            <th>Content-Type</th>
+            <th>Is AJAX?</th>
+        </tr>
+    </thead>
+    <tbody>
+    {files}
+        <tr data-active="{active}">
+        	<td class="debug-bar-width70p">
+            	<button class="ci-history-load" data-time="{time}">Load</button>
+            </td>
+            <td class="debug-bar-width140p">{datetime}</td>
+            <td>{status}</td>
+            <td>{method}</td>
+            <td>{url}</td>
+            <td>{contentType}</td>
+            <td>{isAJAX}</td>
+        </tr>
+    {/files}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/_logs.tpl b/system/Debug/Toolbar/Views/_logs.tpl
new file mode 100644
index 0000000..7c80d84
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_logs.tpl
@@ -0,0 +1,20 @@
+{ if $logs == [] }
+<p>Nothing was logged. If you were expecting logged items, ensure that LoggerConfig file has the correct threshold set.</p>
+{ else }
+<table>
+    <thead>
+        <tr>
+            <th>Severity</th>
+            <th>Message</th>
+        </tr>
+    </thead>
+    <tbody>
+    {logs}
+        <tr>
+            <td>{level}</td>
+            <td>{msg}</td>
+        </tr>
+    {/logs}
+    </tbody>
+</table>
+{ endif }
diff --git a/system/Debug/Toolbar/Views/_routes.tpl b/system/Debug/Toolbar/Views/_routes.tpl
new file mode 100644
index 0000000..e277046
--- /dev/null
+++ b/system/Debug/Toolbar/Views/_routes.tpl
@@ -0,0 +1,52 @@
+<h3>Matched Route</h3>
+
+<table>
+    <tbody>
+    {matchedRoute}
+        <tr>
+            <td>Directory:</td>
+            <td>{directory}</td>
+        </tr>
+        <tr>
+            <td>Controller:</td>
+            <td>{controller}</td>
+        </tr>
+        <tr>
+            <td>Method:</td>
+            <td>{method}</td>
+        </tr>
+        <tr>
+            <td>Params:</td>
+            <td>{paramCount} / {truePCount}</td>
+        </tr>
+        {params}
+            <tr class="route-params-item">
+                <td>{name}</td>
+                <td>{value}</td>
+            </tr>
+        {/params}
+    {/matchedRoute}
+    </tbody>
+</table>
+
+
+<h3>Defined Routes</h3>
+
+<table>
+    <thead>
+        <tr>
+            <th>Method</th>
+            <th>Route</th>
+            <th>Handler</th>
+        </tr>
+    </thead>
+    <tbody>
+    {routes}
+        <tr>
+            <td>{method}</td>
+            <td data-debugbar-route="{method}">{route}</td>
+            <td>{handler}</td>
+        </tr>
+    {/routes}
+    </tbody>
+</table>
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
new file mode 100644
index 0000000..f881dd1
--- /dev/null
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -0,0 +1,616 @@
+/*! CodeIgniter 4 - Debug bar
+ * ============================================================================
+ * Forum: 	https://forum.codeigniter.com
+ * Github:	https://github.com/codeigniter4/codeigniter4
+ * Slack: 	https://codeigniterchat.slack.com
+ * Website: https://codeigniter.com
+ */
+#debug-icon {
+  bottom: 0;
+  position: fixed;
+  right: 0;
+  z-index: 10000;
+  height: 36px;
+  width: 36px;
+  margin: 0px;
+  padding: 0px;
+  clear: both;
+  text-align: center; }
+  #debug-icon a svg {
+    margin: 8px;
+    max-width: 20px;
+    max-height: 20px; }
+  #debug-icon.fixed-top {
+    bottom: auto;
+    top: 0; }
+  #debug-icon .debug-bar-ndisplay {
+    display: none; }
+
+#debug-bar {
+  bottom: 0;
+  left: 0;
+  position: fixed;
+  right: 0;
+  z-index: 10000;
+  height: 36px;
+  line-height: 36px;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+  font-size: 16px;
+  font-weight: 400; }
+  #debug-bar h1 {
+    bottom: 0;
+    display: inline-block;
+    font-size: 14px;
+    font-weight: normal;
+    margin: 0 16px 0 0;
+    padding: 0;
+    position: absolute;
+    right: 30px;
+    text-align: left;
+    top: 0; }
+    #debug-bar h1 svg {
+      width: 16px;
+      margin-right: 5px; }
+  #debug-bar h2 {
+    font-size: 16px;
+    margin: 0;
+    padding: 5px 0 10px 0; }
+    #debug-bar h2 span {
+      font-size: 13px; }
+  #debug-bar h3 {
+    font-size: 12px;
+    font-weight: 200;
+    margin: 0 0 0 10px;
+    padding: 0;
+    text-transform: uppercase; }
+  #debug-bar p {
+    font-size: 12px;
+    margin: 0 0 0 15px;
+    padding: 0; }
+  #debug-bar a {
+    text-decoration: none; }
+    #debug-bar a:hover {
+      text-decoration: underline; }
+  #debug-bar button {
+    border: 1px solid;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    cursor: pointer;
+    line-height: 15px; }
+    #debug-bar button:hover {
+      text-decoration: underline; }
+  #debug-bar table {
+    border-collapse: collapse;
+    font-size: 14px;
+    line-height: normal;
+    margin: 5px 10px 15px 10px;
+    width: calc(100% - 10px); }
+    #debug-bar table strong {
+      font-weight: 500; }
+    #debug-bar table th {
+      display: table-cell;
+      font-weight: 600;
+      padding-bottom: 0.7em;
+      text-align: left; }
+    #debug-bar table tr {
+      border: none; }
+    #debug-bar table td {
+      border: none;
+      display: table-cell;
+      margin: 0;
+      text-align: left; }
+      #debug-bar table td:first-child {
+        max-width: 20%; }
+        #debug-bar table td:first-child.narrow {
+          width: 7em; }
+  #debug-bar td[data-debugbar-route] form {
+    display: none; }
+  #debug-bar td[data-debugbar-route]:hover form {
+    display: block; }
+  #debug-bar td[data-debugbar-route]:hover > div {
+    display: none; }
+  #debug-bar td[data-debugbar-route] input[type=text] {
+    padding: 2px; }
+  #debug-bar .toolbar {
+    display: flex;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: 0 12px 0 12px;
+    /* give room for OS X scrollbar */
+    white-space: nowrap;
+    z-index: 10000; }
+  #debug-bar.fixed-top {
+    bottom: auto;
+    top: 0; }
+    #debug-bar.fixed-top .tab {
+      bottom: auto;
+      top: 36px; }
+  #debug-bar #toolbar-position a,
+  #debug-bar #toolbar-theme a {
+    padding: 0 6px;
+    display: inline-flex;
+    vertical-align: top; }
+    #debug-bar #toolbar-position a:hover,
+    #debug-bar #toolbar-theme a:hover {
+      text-decoration: none; }
+  #debug-bar #debug-bar-link {
+    bottom: 0;
+    display: inline-block;
+    font-size: 16px;
+    line-height: 36px;
+    padding: 6px;
+    position: absolute;
+    right: 10px;
+    top: 0;
+    width: 24px; }
+  #debug-bar .ci-label {
+    display: inline-flex;
+    font-size: 14px; }
+    #debug-bar .ci-label:hover {
+      cursor: pointer; }
+    #debug-bar .ci-label a {
+      color: inherit;
+      display: flex;
+      letter-spacing: normal;
+      padding: 0 10px;
+      text-decoration: none;
+      align-items: center; }
+    #debug-bar .ci-label img {
+      margin: 6px 3px 6px 0;
+      width: 16px !important; }
+    #debug-bar .ci-label .badge {
+      border-radius: 12px;
+      -moz-border-radius: 12px;
+      -webkit-border-radius: 12px;
+      display: inline-block;
+      font-size: 75%;
+      font-weight: bold;
+      line-height: 12px;
+      margin-left: 5px;
+      padding: 2px 5px;
+      text-align: center;
+      vertical-align: baseline;
+      white-space: nowrap; }
+  #debug-bar .tab {
+    bottom: 35px;
+    display: none;
+    left: 0;
+    max-height: 62%;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: 1em 2em;
+    position: fixed;
+    right: 0;
+    z-index: 9999; }
+  #debug-bar .timeline {
+    margin-left: 0;
+    width: 100%; }
+    #debug-bar .timeline th {
+      border-left: 1px solid;
+      font-size: 12px;
+      font-weight: 200;
+      padding: 5px 5px 10px 5px;
+      position: relative;
+      text-align: left; }
+      #debug-bar .timeline th:first-child {
+        border-left: 0; }
+    #debug-bar .timeline td {
+      border-left: 1px solid;
+      padding: 5px;
+      position: relative; }
+      #debug-bar .timeline td:first-child {
+        border-left: 0; }
+    #debug-bar .timeline .timer {
+      border-radius: 4px;
+      -moz-border-radius: 4px;
+      -webkit-border-radius: 4px;
+      display: inline-block;
+      padding: 5px;
+      position: absolute;
+      top: 30%; }
+  #debug-bar .route-params,
+  #debug-bar .route-params-item {
+    vertical-align: top; }
+    #debug-bar .route-params td:first-child,
+    #debug-bar .route-params-item td:first-child {
+      font-style: italic;
+      padding-left: 1em;
+      text-align: right; }
+
+.debug-view.show-view {
+  border: 1px solid;
+  margin: 4px; }
+
+.debug-view-path {
+  font-family: monospace;
+  font-size: 12px;
+  letter-spacing: normal;
+  min-height: 16px;
+  padding: 2px;
+  text-align: left; }
+
+.show-view .debug-view-path {
+  display: block !important; }
+
+@media screen and (max-width: 1024px) {
+  #debug-bar .ci-label img {
+    margin: unset; }
+  .hide-sm {
+    display: none !important; } }
+
+#debug-icon {
+  background-color: #FFFFFF;
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF; }
+  #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
+    color: #DD8615; }
+
+#debug-bar {
+  background-color: #FFFFFF;
+  color: #434343; }
+  #debug-bar h1,
+  #debug-bar h2,
+  #debug-bar h3,
+  #debug-bar p,
+  #debug-bar a,
+  #debug-bar button,
+  #debug-bar table,
+  #debug-bar thead,
+  #debug-bar tr,
+  #debug-bar td,
+  #debug-bar button,
+  #debug-bar .toolbar {
+    background-color: transparent;
+    color: #434343; }
+  #debug-bar button {
+    background-color: #FFFFFF; }
+  #debug-bar table strong {
+    color: #FDC894; }
+  #debug-bar table tbody tr:hover {
+    background-color: #DFDFDF; }
+  #debug-bar table tbody tr.current {
+    background-color: #FDC894; }
+    #debug-bar table tbody tr.current:hover td {
+      background-color: #DD4814;
+      color: #FFFFFF; }
+  #debug-bar .toolbar {
+    background-color: #FFFFFF;
+    box-shadow: 0 0 4px #DFDFDF;
+    -moz-box-shadow: 0 0 4px #DFDFDF;
+    -webkit-box-shadow: 0 0 4px #DFDFDF; }
+    #debug-bar .toolbar img {
+      filter: brightness(0) invert(0.4); }
+  #debug-bar.fixed-top .toolbar {
+    box-shadow: 0 0 4px #DFDFDF;
+    -moz-box-shadow: 0 0 4px #DFDFDF;
+    -webkit-box-shadow: 0 0 4px #DFDFDF; }
+  #debug-bar.fixed-top .tab {
+    box-shadow: 0 1px 4px #DFDFDF;
+    -moz-box-shadow: 0 1px 4px #DFDFDF;
+    -webkit-box-shadow: 0 1px 4px #DFDFDF; }
+  #debug-bar .muted {
+    color: #434343; }
+    #debug-bar .muted td {
+      color: #DFDFDF; }
+    #debug-bar .muted:hover td {
+      color: #434343; }
+  #debug-bar #toolbar-position,
+  #debug-bar #toolbar-theme {
+    filter: brightness(0) invert(0.6); }
+  #debug-bar .ci-label.active {
+    background-color: #DFDFDF; }
+  #debug-bar .ci-label:hover {
+    background-color: #DFDFDF; }
+  #debug-bar .ci-label .badge {
+    background-color: #5BC0DE;
+    color: #FFFFFF; }
+  #debug-bar .tab {
+    background-color: #FFFFFF;
+    box-shadow: 0 -1px 4px #DFDFDF;
+    -moz-box-shadow: 0 -1px 4px #DFDFDF;
+    -webkit-box-shadow: 0 -1px 4px #DFDFDF; }
+  #debug-bar .timeline th,
+  #debug-bar .timeline td {
+    border-color: #DFDFDF; }
+  #debug-bar .timeline .timer {
+    background-color: #DD8615; }
+
+.debug-view.show-view {
+  border-color: #DD8615; }
+
+.debug-view-path {
+  background-color: #FDC894;
+  color: #434343; }
+
+@media (prefers-color-scheme: dark) {
+  #debug-icon {
+    background-color: #252525;
+    box-shadow: 0 0 4px #DFDFDF;
+    -moz-box-shadow: 0 0 4px #DFDFDF;
+    -webkit-box-shadow: 0 0 4px #DFDFDF; }
+    #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
+      color: #DD8615; }
+  #debug-bar {
+    background-color: #252525;
+    color: #DFDFDF; }
+    #debug-bar h1,
+    #debug-bar h2,
+    #debug-bar h3,
+    #debug-bar p,
+    #debug-bar a,
+    #debug-bar button,
+    #debug-bar table,
+    #debug-bar thead,
+    #debug-bar tr,
+    #debug-bar td,
+    #debug-bar button,
+    #debug-bar .toolbar {
+      background-color: transparent;
+      color: #DFDFDF; }
+    #debug-bar button {
+      background-color: #252525; }
+    #debug-bar table strong {
+      color: #FDC894; }
+    #debug-bar table tbody tr:hover {
+      background-color: #434343; }
+    #debug-bar table tbody tr.current {
+      background-color: #FDC894; }
+      #debug-bar table tbody tr.current td {
+        color: #252525; }
+      #debug-bar table tbody tr.current:hover td {
+        background-color: #DD4814;
+        color: #FFFFFF; }
+    #debug-bar .toolbar {
+      background-color: #434343;
+      box-shadow: 0 0 4px #434343;
+      -moz-box-shadow: 0 0 4px #434343;
+      -webkit-box-shadow: 0 0 4px #434343; }
+      #debug-bar .toolbar img {
+        filter: brightness(0) invert(1); }
+    #debug-bar.fixed-top .toolbar {
+      box-shadow: 0 0 4px #434343;
+      -moz-box-shadow: 0 0 4px #434343;
+      -webkit-box-shadow: 0 0 4px #434343; }
+    #debug-bar.fixed-top .tab {
+      box-shadow: 0 1px 4px #434343;
+      -moz-box-shadow: 0 1px 4px #434343;
+      -webkit-box-shadow: 0 1px 4px #434343; }
+    #debug-bar .muted {
+      color: #DFDFDF; }
+      #debug-bar .muted td {
+        color: #434343; }
+      #debug-bar .muted:hover td {
+        color: #DFDFDF; }
+    #debug-bar #toolbar-position,
+    #debug-bar #toolbar-theme {
+      filter: brightness(0) invert(0.6); }
+    #debug-bar .ci-label.active {
+      background-color: #252525; }
+    #debug-bar .ci-label:hover {
+      background-color: #252525; }
+    #debug-bar .ci-label .badge {
+      background-color: #5BC0DE;
+      color: #DFDFDF; }
+    #debug-bar .tab {
+      background-color: #252525;
+      box-shadow: 0 -1px 4px #434343;
+      -moz-box-shadow: 0 -1px 4px #434343;
+      -webkit-box-shadow: 0 -1px 4px #434343; }
+    #debug-bar .timeline th,
+    #debug-bar .timeline td {
+      border-color: #434343; }
+    #debug-bar .timeline .timer {
+      background-color: #DD8615; }
+  .debug-view.show-view {
+    border-color: #DD8615; }
+  .debug-view-path {
+    background-color: #FDC894;
+    color: #434343; } }
+
+#toolbarContainer.dark #debug-icon {
+  background-color: #252525;
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF; }
+  #toolbarContainer.dark #debug-icon a:active, #toolbarContainer.dark #debug-icon a:link, #toolbarContainer.dark #debug-icon a:visited {
+    color: #DD8615; }
+
+#toolbarContainer.dark #debug-bar {
+  background-color: #252525;
+  color: #DFDFDF; }
+  #toolbarContainer.dark #debug-bar h1,
+  #toolbarContainer.dark #debug-bar h2,
+  #toolbarContainer.dark #debug-bar h3,
+  #toolbarContainer.dark #debug-bar p,
+  #toolbarContainer.dark #debug-bar a,
+  #toolbarContainer.dark #debug-bar button,
+  #toolbarContainer.dark #debug-bar table,
+  #toolbarContainer.dark #debug-bar thead,
+  #toolbarContainer.dark #debug-bar tr,
+  #toolbarContainer.dark #debug-bar td,
+  #toolbarContainer.dark #debug-bar button,
+  #toolbarContainer.dark #debug-bar .toolbar {
+    background-color: transparent;
+    color: #DFDFDF; }
+  #toolbarContainer.dark #debug-bar button {
+    background-color: #252525; }
+  #toolbarContainer.dark #debug-bar table strong {
+    color: #FDC894; }
+  #toolbarContainer.dark #debug-bar table tbody tr:hover {
+    background-color: #434343; }
+  #toolbarContainer.dark #debug-bar table tbody tr.current {
+    background-color: #FDC894; }
+    #toolbarContainer.dark #debug-bar table tbody tr.current td {
+      color: #252525; }
+    #toolbarContainer.dark #debug-bar table tbody tr.current:hover td {
+      background-color: #DD4814;
+      color: #FFFFFF; }
+  #toolbarContainer.dark #debug-bar .toolbar {
+    background-color: #434343;
+    box-shadow: 0 0 4px #434343;
+    -moz-box-shadow: 0 0 4px #434343;
+    -webkit-box-shadow: 0 0 4px #434343; }
+    #toolbarContainer.dark #debug-bar .toolbar img {
+      filter: brightness(0) invert(1); }
+  #toolbarContainer.dark #debug-bar.fixed-top .toolbar {
+    box-shadow: 0 0 4px #434343;
+    -moz-box-shadow: 0 0 4px #434343;
+    -webkit-box-shadow: 0 0 4px #434343; }
+  #toolbarContainer.dark #debug-bar.fixed-top .tab {
+    box-shadow: 0 1px 4px #434343;
+    -moz-box-shadow: 0 1px 4px #434343;
+    -webkit-box-shadow: 0 1px 4px #434343; }
+  #toolbarContainer.dark #debug-bar .muted {
+    color: #DFDFDF; }
+    #toolbarContainer.dark #debug-bar .muted td {
+      color: #434343; }
+    #toolbarContainer.dark #debug-bar .muted:hover td {
+      color: #DFDFDF; }
+  #toolbarContainer.dark #debug-bar #toolbar-position,
+  #toolbarContainer.dark #debug-bar #toolbar-theme {
+    filter: brightness(0) invert(0.6); }
+  #toolbarContainer.dark #debug-bar .ci-label.active {
+    background-color: #252525; }
+  #toolbarContainer.dark #debug-bar .ci-label:hover {
+    background-color: #252525; }
+  #toolbarContainer.dark #debug-bar .ci-label .badge {
+    background-color: #5BC0DE;
+    color: #DFDFDF; }
+  #toolbarContainer.dark #debug-bar .tab {
+    background-color: #252525;
+    box-shadow: 0 -1px 4px #434343;
+    -moz-box-shadow: 0 -1px 4px #434343;
+    -webkit-box-shadow: 0 -1px 4px #434343; }
+  #toolbarContainer.dark #debug-bar .timeline th,
+  #toolbarContainer.dark #debug-bar .timeline td {
+    border-color: #434343; }
+  #toolbarContainer.dark #debug-bar .timeline .timer {
+    background-color: #DD8615; }
+
+#toolbarContainer.dark .debug-view.show-view {
+  border-color: #DD8615; }
+
+#toolbarContainer.dark .debug-view-path {
+  background-color: #FDC894;
+  color: #434343; }
+
+#toolbarContainer.dark td[data-debugbar-route] input[type=text] {
+  background: #000;
+  color: #fff; }
+
+#toolbarContainer.light #debug-icon {
+  background-color: #FFFFFF;
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF; }
+  #toolbarContainer.light #debug-icon a:active, #toolbarContainer.light #debug-icon a:link, #toolbarContainer.light #debug-icon a:visited {
+    color: #DD8615; }
+
+#toolbarContainer.light #debug-bar {
+  background-color: #FFFFFF;
+  color: #434343; }
+  #toolbarContainer.light #debug-bar h1,
+  #toolbarContainer.light #debug-bar h2,
+  #toolbarContainer.light #debug-bar h3,
+  #toolbarContainer.light #debug-bar p,
+  #toolbarContainer.light #debug-bar a,
+  #toolbarContainer.light #debug-bar button,
+  #toolbarContainer.light #debug-bar table,
+  #toolbarContainer.light #debug-bar thead,
+  #toolbarContainer.light #debug-bar tr,
+  #toolbarContainer.light #debug-bar td,
+  #toolbarContainer.light #debug-bar button,
+  #toolbarContainer.light #debug-bar .toolbar {
+    background-color: transparent;
+    color: #434343; }
+  #toolbarContainer.light #debug-bar button {
+    background-color: #FFFFFF; }
+  #toolbarContainer.light #debug-bar table strong {
+    color: #FDC894; }
+  #toolbarContainer.light #debug-bar table tbody tr:hover {
+    background-color: #DFDFDF; }
+  #toolbarContainer.light #debug-bar table tbody tr.current {
+    background-color: #FDC894; }
+    #toolbarContainer.light #debug-bar table tbody tr.current:hover td {
+      background-color: #DD4814;
+      color: #FFFFFF; }
+  #toolbarContainer.light #debug-bar .toolbar {
+    background-color: #FFFFFF;
+    box-shadow: 0 0 4px #DFDFDF;
+    -moz-box-shadow: 0 0 4px #DFDFDF;
+    -webkit-box-shadow: 0 0 4px #DFDFDF; }
+    #toolbarContainer.light #debug-bar .toolbar img {
+      filter: brightness(0) invert(0.4); }
+  #toolbarContainer.light #debug-bar.fixed-top .toolbar {
+    box-shadow: 0 0 4px #DFDFDF;
+    -moz-box-shadow: 0 0 4px #DFDFDF;
+    -webkit-box-shadow: 0 0 4px #DFDFDF; }
+  #toolbarContainer.light #debug-bar.fixed-top .tab {
+    box-shadow: 0 1px 4px #DFDFDF;
+    -moz-box-shadow: 0 1px 4px #DFDFDF;
+    -webkit-box-shadow: 0 1px 4px #DFDFDF; }
+  #toolbarContainer.light #debug-bar .muted {
+    color: #434343; }
+    #toolbarContainer.light #debug-bar .muted td {
+      color: #DFDFDF; }
+    #toolbarContainer.light #debug-bar .muted:hover td {
+      color: #434343; }
+  #toolbarContainer.light #debug-bar #toolbar-position,
+  #toolbarContainer.light #debug-bar #toolbar-theme {
+    filter: brightness(0) invert(0.6); }
+  #toolbarContainer.light #debug-bar .ci-label.active {
+    background-color: #DFDFDF; }
+  #toolbarContainer.light #debug-bar .ci-label:hover {
+    background-color: #DFDFDF; }
+  #toolbarContainer.light #debug-bar .ci-label .badge {
+    background-color: #5BC0DE;
+    color: #FFFFFF; }
+  #toolbarContainer.light #debug-bar .tab {
+    background-color: #FFFFFF;
+    box-shadow: 0 -1px 4px #DFDFDF;
+    -moz-box-shadow: 0 -1px 4px #DFDFDF;
+    -webkit-box-shadow: 0 -1px 4px #DFDFDF; }
+  #toolbarContainer.light #debug-bar .timeline th,
+  #toolbarContainer.light #debug-bar .timeline td {
+    border-color: #DFDFDF; }
+  #toolbarContainer.light #debug-bar .timeline .timer {
+    background-color: #DD8615; }
+
+#toolbarContainer.light .debug-view.show-view {
+  border-color: #DD8615; }
+
+#toolbarContainer.light .debug-view-path {
+  background-color: #FDC894;
+  color: #434343; }
+
+.debug-bar-width30 {
+  width: 30%; }
+
+.debug-bar-width10 {
+  width: 10%; }
+
+.debug-bar-width70p {
+  width: 70px; }
+
+.debug-bar-width140p {
+  width: 140px; }
+
+.debug-bar-width20e {
+  width: 20em; }
+
+.debug-bar-width6r {
+  width: 6rem; }
+
+.debug-bar-ndisplay {
+  display: none; }
+
+.debug-bar-alignRight {
+  text-align: right; }
+
+.debug-bar-alignLeft {
+  text-align: left; }
+
+.debug-bar-noverflow {
+  overflow: hidden; }
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
new file mode 100644
index 0000000..ca38f9b
--- /dev/null
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -0,0 +1,672 @@
+/*
+ * Functionality for the CodeIgniter Debug Toolbar.
+ */
+
+var ciDebugBar = {
+
+	toolbarContainer : null,
+	toolbar : null,
+	icon : null,
+
+	//--------------------------------------------------------------------
+
+	init : function () {
+		this.toolbarContainer = document.getElementById('toolbarContainer');
+		this.toolbar          = document.getElementById('debug-bar');
+		this.icon             = document.getElementById('debug-icon');
+
+		ciDebugBar.createListeners();
+		ciDebugBar.setToolbarState();
+		ciDebugBar.setToolbarPosition();
+		ciDebugBar.setToolbarTheme();
+		ciDebugBar.toggleViewsHints();
+		ciDebugBar.routerLink();
+
+		document.getElementById('debug-bar-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
+		document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
+
+		// Allows to highlight the row of the current history request
+		var btn = document.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
+		ciDebugBar.addClass(btn.parentNode.parentNode, 'current');
+
+		historyLoad = document.getElementsByClassName('ci-history-load');
+
+		for (var i = 0; i < historyLoad.length; i++)
+		{
+			historyLoad[i].addEventListener('click', function () {
+				loadDoc(this.getAttribute('data-time'));
+			}, true);
+		}
+
+		// Display the active Tab on page load
+		var tab = ciDebugBar.readCookie('debug-bar-tab');
+		if (document.getElementById(tab))
+		{
+			var el           = document.getElementById(tab);
+			el.style.display = 'block';
+			ciDebugBar.addClass(el, 'active');
+			tab = document.querySelector('[data-tab=' + tab + ']');
+			if (tab)
+			{
+				ciDebugBar.addClass(tab.parentNode, 'active');
+			}
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	createListeners : function () {
+		var buttons = [].slice.call(document.querySelectorAll('#debug-bar .ci-label a'));
+
+		for (var i = 0; i < buttons.length; i++)
+		{
+			buttons[i].addEventListener('click', ciDebugBar.showTab, true);
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	showTab: function () {
+		// Get the target tab, if any
+		var tab = document.getElementById(this.getAttribute('data-tab'));
+
+		// If the label have not a tab stops here
+		if (! tab)
+		{
+			return;
+		}
+
+		// Remove debug-bar-tab cookie
+		ciDebugBar.createCookie('debug-bar-tab', '', -1);
+
+		// Check our current state.
+		var state = tab.style.display;
+
+		// Hide all tabs
+		var tabs = document.querySelectorAll('#debug-bar .tab');
+
+		for (var i = 0; i < tabs.length; i++)
+		{
+			tabs[i].style.display = 'none';
+		}
+
+		// Mark all labels as inactive
+		var labels = document.querySelectorAll('#debug-bar .ci-label');
+
+		for (var i = 0; i < labels.length; i++)
+		{
+			ciDebugBar.removeClass(labels[i], 'active');
+		}
+
+		// Show/hide the selected tab
+		if (state != 'block')
+		{
+			tab.style.display = 'block';
+			ciDebugBar.addClass(this.parentNode, 'active');
+			// Create debug-bar-tab cookie to persistent state
+			ciDebugBar.createCookie('debug-bar-tab', this.getAttribute('data-tab'), 365);
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	addClass : function (el, className) {
+		if (el.classList)
+		{
+			el.classList.add(className);
+		}
+		else
+		{
+			el.className += ' ' + className;
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	removeClass : function (el, className) {
+		if (el.classList)
+		{
+			el.classList.remove(className);
+		}
+		else
+		{
+			el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Toggle display of a data table
+	 *
+	 * @param obj
+	 */
+	toggleDataTable : function (obj) {
+		if (typeof obj == 'string')
+		{
+			obj = document.getElementById(obj + '_table');
+		}
+
+		if (obj)
+		{
+			obj.style.display = obj.style.display == 'none' ? 'block' : 'none';
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	/**
+	 *   Toggle tool bar from full to icon and icon to full
+	 */
+	toggleToolbar : function () {
+		var open = ciDebugBar.toolbar.style.display != 'none';
+
+		ciDebugBar.icon.style.display    = open == true ? 'inline-block' : 'none';
+		ciDebugBar.toolbar.style.display = open == false ? 'inline-block' : 'none';
+
+		// Remember it for other page loads on this site
+		ciDebugBar.createCookie('debug-bar-state', '', -1);
+		ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365);
+	},
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the initial state of the toolbar (open or minimized) when
+	 * the page is first loaded to allow it to remember the state between refreshes.
+	 */
+	setToolbarState: function () {
+		var open = ciDebugBar.readCookie('debug-bar-state');
+
+		ciDebugBar.icon.style.display    = open != 'open' ? 'inline-block' : 'none';
+		ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none';
+	},
+
+	//--------------------------------------------------------------------
+
+	toggleViewsHints: function () {
+		// Avoid toggle hints on history requests that are not the initial
+		if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new'))
+		{
+			var a  = document.querySelector('a[data-tab="ci-views"]');
+			a.href = '#';
+			return;
+		}
+
+		var nodeList       = []; // [ Element, NewElement( 1 )/OldElement( 0 ) ]
+		var sortedComments = [];
+		var comments       = [];
+
+		var getComments = function () {
+			var nodes        = [];
+			var result       = [];
+			var xpathResults = document.evaluate( "//comment()[starts-with(., ' DEBUG-VIEW')]", document, null, XPathResult.ANY_TYPE, null);
+			var nextNode     = xpathResults.iterateNext();
+			while ( nextNode )
+			{
+				nodes.push( nextNode );
+				nextNode = xpathResults.iterateNext();
+			}
+
+			// sort comment by opening and closing tags
+			for (var i = 0; i < nodes.length; ++i)
+			{
+				// get file path + name to use as key
+				var path = nodes[i].nodeValue.substring( 18, nodes[i].nodeValue.length - 1 );
+
+				if ( nodes[i].nodeValue[12] === 'S' ) // simple check for start comment
+				{
+					// create new entry
+					result[path] = [ nodes[i], null ];
+				}
+				else if (result[path])
+				{
+					// add to existing entry
+					result[path][1] = nodes[i];
+				}
+			}
+
+			return result;
+		};
+
+		// find node that has TargetNode as parentNode
+		var getParentNode = function ( node, targetNode ) {
+			if ( node.parentNode === null )
+			{
+				return null;
+			}
+
+			if ( node.parentNode !== targetNode )
+			{
+				return getParentNode( node.parentNode, targetNode );
+			}
+
+			return node;
+		};
+
+		// define invalid & outer ( also invalid ) elements
+		const INVALID_ELEMENTS = [ 'NOSCRIPT', 'SCRIPT', 'STYLE' ];
+		const OUTER_ELEMENTS   = [ 'HTML', 'BODY', 'HEAD' ];
+
+		var getValidElementInner = function ( node, reverse ) {
+			// handle invalid tags
+			if ( OUTER_ELEMENTS.indexOf( node.nodeName ) !== -1 )
+			{
+				for (var i = 0; i < document.body.children.length; ++i)
+				{
+					var index   = reverse ? document.body.children.length - ( i + 1 ) : i;
+					var element = document.body.children[index];
+
+					// skip invalid tags
+					if ( INVALID_ELEMENTS.indexOf( element.nodeName ) !== -1 )
+					{
+						continue;
+					}
+
+					return [ element, reverse ];
+				}
+
+				return null;
+			}
+
+			// get to next valid element
+			while ( node !== null && INVALID_ELEMENTS.indexOf( node.nodeName ) !== -1 )
+			{
+				node = reverse ? node.previousElementSibling : node.nextElementSibling;
+			}
+
+			// return non array if we couldnt find something
+			if ( node === null )
+			{
+				return null;
+			}
+
+			return [ node, reverse ];
+		};
+
+		// get next valid element ( to be safe to add divs )
+		// @return [ element, skip element ] or null if we couldnt find a valid place
+		var getValidElement = function ( nodeElement ) {
+			if (nodeElement)
+			{
+				if ( nodeElement.nextElementSibling !== null )
+				{
+					return getValidElementInner( nodeElement.nextElementSibling, false )
+						|| getValidElementInner( nodeElement.previousElementSibling, true );
+				}
+				if ( nodeElement.previousElementSibling !== null )
+				{
+					return getValidElementInner( nodeElement.previousElementSibling, true );
+				}
+			}
+
+			// something went wrong! -> element is not in DOM
+			return null;
+		};
+
+		function showHints()
+		{
+			// Had AJAX? Reset view blocks
+			sortedComments = getComments();
+
+			for (var key in sortedComments)
+			{
+				var startElement = getValidElement( sortedComments[key][0] );
+				var endElement   = getValidElement( sortedComments[key][1] );
+
+				// skip if we couldnt get a valid element
+				if ( startElement === null || endElement === null )
+				{
+					continue;
+				}
+
+				// find element which has same parent as startelement
+				var jointParent = getParentNode( endElement[0], startElement[0].parentNode );
+				if ( jointParent === null )
+				{
+					// find element which has same parent as endelement
+					jointParent = getParentNode( startElement[0], endElement[0].parentNode );
+					if ( jointParent === null )
+					{
+						// both tries failed
+						continue;
+					}
+					else
+					{
+						startElement[0] = jointParent;
+					}
+				}
+				else
+				{
+					endElement[0] = jointParent;
+				}
+
+				var debugDiv   = document.createElement( 'div' ); // holder
+				var debugPath  = document.createElement( 'div' ); // path
+				var childArray = startElement[0].parentNode.childNodes; // target child array
+				var parent     = startElement[0].parentNode;
+				var start, end;
+
+				// setup container
+				debugDiv.classList.add( 'debug-view' );
+				debugDiv.classList.add( 'show-view' );
+				debugPath.classList.add( 'debug-view-path' );
+				debugPath.innerText = key;
+				debugDiv.appendChild( debugPath );
+
+				// calc distance between them
+				// start
+				for (var i = 0; i < childArray.length; ++i)
+				{
+					// check for comment ( start & end ) -> if its before valid start element
+					if ( childArray[i] === sortedComments[key][1] ||
+						childArray[i] === sortedComments[key][0] ||
+						childArray[i] === startElement[0] )
+					{
+						start = i;
+						if ( childArray[i] === sortedComments[key][0] )
+						{
+							start++; // increase to skip the start comment
+						}
+						break;
+					}
+				}
+				// adjust if we want to skip the start element
+				if ( startElement[1] )
+				{
+					start++;
+				}
+
+				// end
+				for (var i = start; i < childArray.length; ++i)
+				{
+					if ( childArray[i] === endElement[0] )
+					{
+						end = i;
+						// dont break to check for end comment after end valid element
+					}
+					else if ( childArray[i] === sortedComments[key][1] )
+					{
+						// if we found the end comment, we can break
+						end = i;
+						break;
+					}
+				}
+
+				// move elements
+				var number = end - start;
+				if ( endElement[1] )
+				{
+					number++;
+				}
+				for (var i = 0; i < number; ++i)
+				{
+					if ( INVALID_ELEMENTS.indexOf( childArray[start] ) !== -1 )
+					{
+						// skip invalid childs that can cause problems if moved
+						start++;
+						continue;
+					}
+					debugDiv.appendChild( childArray[start] );
+				}
+
+				// add container to DOM
+				nodeList.push( parent.insertBefore( debugDiv, childArray[start] ) );
+			}
+
+			ciDebugBar.createCookie('debug-view', 'show', 365);
+			ciDebugBar.addClass(btn, 'active');
+		}
+
+		function hideHints()
+		{
+			for (var i = 0; i < nodeList.length; ++i)
+			{
+				var index;
+
+				// find index
+				for (var j = 0; j < nodeList[i].parentNode.childNodes.length; ++j)
+				{
+					if ( nodeList[i].parentNode.childNodes[j] === nodeList[i] )
+					{
+						index = j;
+						break;
+					}
+				}
+
+				// move child back
+				while ( nodeList[i].childNodes.length !== 1 )
+				{
+					nodeList[i].parentNode.insertBefore( nodeList[i].childNodes[1], nodeList[i].parentNode.childNodes[index].nextSibling  );
+					index++;
+				}
+
+				nodeList[i].parentNode.removeChild( nodeList[i] );
+			}
+			nodeList.length = 0;
+
+			ciDebugBar.createCookie('debug-view', '', -1);
+			ciDebugBar.removeClass(btn, 'active');
+		}
+
+		var btn = document.querySelector('[data-tab=ci-views]');
+
+		// If the Views Collector is inactive stops here
+		if (! btn)
+		{
+			return;
+		}
+
+		btn.parentNode.onclick = function () {
+			if (ciDebugBar.readCookie('debug-view'))
+			{
+				hideHints();
+			}
+			else
+			{
+				showHints();
+			}
+		};
+
+		// Determine Hints state on page load
+		if (ciDebugBar.readCookie('debug-view'))
+		{
+			showHints();
+		}
+	},
+
+	//--------------------------------------------------------------------
+
+	setToolbarPosition: function () {
+		var btnPosition = document.getElementById('toolbar-position');
+
+		if (ciDebugBar.readCookie('debug-bar-position') === 'top')
+		{
+			ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top');
+			ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top');
+		}
+
+		btnPosition.addEventListener('click', function () {
+			var position = ciDebugBar.readCookie('debug-bar-position');
+
+			ciDebugBar.createCookie('debug-bar-position', '', -1);
+
+			if (!position || position === 'bottom')
+			{
+				ciDebugBar.createCookie('debug-bar-position', 'top', 365);
+				ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top');
+				ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top');
+			}
+			else
+			{
+				ciDebugBar.createCookie('debug-bar-position', 'bottom', 365);
+				ciDebugBar.removeClass(ciDebugBar.icon, 'fixed-top');
+				ciDebugBar.removeClass(ciDebugBar.toolbar, 'fixed-top');
+			}
+		}, true);
+	},
+
+	//--------------------------------------------------------------------
+
+	setToolbarTheme: function () {
+		var btnTheme    = document.getElementById('toolbar-theme');
+		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
+		var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
+
+		// If a cookie is set with a value, we force the color scheme
+		if (ciDebugBar.readCookie('debug-bar-theme') === 'dark')
+		{
+			ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light');
+			ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark');
+		}
+		else if (ciDebugBar.readCookie('debug-bar-theme') === 'light')
+		{
+			ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
+			ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
+		}
+
+		btnTheme.addEventListener('click', function () {
+			var theme = ciDebugBar.readCookie('debug-bar-theme');
+
+			if (!theme && window.matchMedia("(prefers-color-scheme: dark)").matches)
+			{
+				// If there is no cookie, and "prefers-color-scheme" is set to "dark"
+				// It means that the user wants to switch to light mode
+				ciDebugBar.createCookie('debug-bar-theme', 'light', 365);
+				ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
+				ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
+			}
+			else
+			{
+				if (theme === 'dark')
+				{
+					ciDebugBar.createCookie('debug-bar-theme', 'light', 365);
+					ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
+					ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
+				}
+				else
+				{
+					// In any other cases: if there is no cookie, or the cookie is set to
+					// "light", or the "prefers-color-scheme" is "light"...
+					ciDebugBar.createCookie('debug-bar-theme', 'dark', 365);
+					ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light');
+					ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark');
+				}
+			}
+		}, true);
+	},
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper to create a cookie.
+	 *
+	 * @param name
+	 * @param value
+	 * @param days
+	 */
+	createCookie : function (name,value,days) {
+		if (days)
+		{
+			var date = new Date();
+
+			date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+
+			var expires = "; expires=" + date.toGMTString();
+		}
+		else
+		{
+			var expires = "";
+		}
+
+		document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax";
+	},
+
+	//--------------------------------------------------------------------
+
+	readCookie : function (name) {
+		var nameEQ = name + "=";
+		var ca     = document.cookie.split(';');
+
+		for (var i = 0; i < ca.length; i++)
+		{
+			var c = ca[i];
+			while (c.charAt(0) == ' ')
+			{
+				c = c.substring(1,c.length);
+			}
+			if (c.indexOf(nameEQ) == 0)
+			{
+				return c.substring(nameEQ.length,c.length);
+			}
+		}
+		return null;
+	},
+
+	//--------------------------------------------------------------------
+
+	trimSlash: function (text) {
+		return text.replace(/^\/|\/$/g, '');
+	},
+
+	routerLink: function () {
+		var row, _location;
+		var rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"]');
+		var patt   = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
+
+		for (var i = 0; i < rowGet.length; i++)
+		{
+			row = rowGet[i];
+			if (!/\/\(.+?\)/.test(rowGet[i].innerText))
+			{
+				row.style = 'cursor: pointer;';
+				row.setAttribute('title', location.origin + '/' + ciDebugBar.trimSlash(row.innerText));
+				row.addEventListener('click', function (ev) {
+					_location          = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText);
+					var redirectWindow = window.open(_location, '_blank');
+					redirectWindow.location;
+				});
+			}
+			else
+			{
+				row.innerHTML = '<div>' + row.innerText + '</div>'
+					+ '<form data-debugbar-route-tpl="' + ciDebugBar.trimSlash(row.innerText.replace(patt, '?')) + '">'
+					+ row.innerText.replace(patt, '<input type="text" placeholder="$1">')
+					+ '<input type="submit" value="Go" style="margin-left: 4px;">'
+					+ '</form>';
+			}
+		}
+
+		rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"] form');
+		for (var i = 0; i < rowGet.length; i++)
+		{
+			row = rowGet[i];
+
+			row.addEventListener('submit', function (event) {
+				event.preventDefault()
+				var inputArray = [], t = 0;
+				var input      = event.target.querySelectorAll('input[type=text]');
+				var tpl        = event.target.getAttribute('data-debugbar-route-tpl');
+
+				for (var n = 0; n < input.length; n++)
+				{
+					if (input[n].value.length > 0)
+					{
+						inputArray.push(input[n].value);
+					}
+				}
+
+				if (inputArray.length > 0)
+				{
+					_location = location.origin + '/' + tpl.replace(/\?/g, function () {
+						return inputArray[t++]
+					});
+
+					var redirectWindow = window.open(_location, '_blank');
+					redirectWindow.location;
+				}
+			})
+		}
+	}
+
+};
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
new file mode 100644
index 0000000..7c99914
--- /dev/null
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * @var \CodeIgniter\Debug\Toolbar $this
+ * @var int                        $totalTime
+ * @var int                        $totalMemory
+ * @var string                     $url
+ * @var string                     $method
+ * @var bool                       $isAJAX
+ * @var int                        $startTime
+ * @var int                        $totalTime
+ * @var int                        $totalMemory
+ * @var float                      $segmentDuration
+ * @var int                        $segmentCount
+ * @var string                     $CI_VERSION
+ * @var array                      $collectors
+ * @var array                      $vars
+ * @var array                      $styles
+ * @var \CodeIgniter\View\Parser   $parser
+ */
+
+?>
+<style type="text/css">
+	<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . '/toolbar.css')) ?>
+</style>
+
+<script id="toolbar_js" type="text/javascript">
+	<?= file_get_contents(__DIR__ . '/toolbar.js') ?>
+</script>
+<div id="debug-icon" class="debug-bar-ndisplay">
+	<a id="debug-icon-link" href="javascript:void(0)">
+		<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
+	</a>
+</div>
+<div id="debug-bar">
+	<div class="toolbar">
+		<span id="toolbar-position"><a href="javascript: void(0)">&#8597;</a></span>
+		<span id="toolbar-theme"><a href="javascript: void(0)">&#128261;</a></span>
+		<span class="ci-label">
+			<a href="javascript: void(0)" data-tab="ci-timeline">
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD7SURBVEhLY6ArSEtLK09NTbWHcvGC9PR0BaDaQiAdUl9fzwQVxg+AFvwHamqHcnGCpKQkeaDa9yD1UD09UCn8AKaBWJySkmIApFehi0ONwwRQBceBLurAh4FqFoHUAtkrgPgREN+ByYEw1DhMANVEMIhAYQ5U1wtU/wmILwLZRlAp/IBYC8gGw88CaFj3A/FnIL4ETDXGUCnyANSC/UC6HIpnQMXAqQXIvo0khxNDjcMEQEmU9AzDuNI7Lgw1DhOAJIEuhQcRKMcC+e+QNHdDpcgD6BaAANSSQqBcENFlDi6AzQKqgkFlwWhxjVI8o2OgmkFaXI8CTMDAAAAxd1O4FzLMaAAAAABJRU5ErkJggg==">
+				<span class="hide-sm"><?= $totalTime ?> ms &nbsp; <?= $totalMemory ?> MB</span>
+			</a>
+		</span>
+
+		<?php foreach ($collectors as $c) : ?>
+			<?php if (! $c['isEmpty'] && ($c['hasTabContent'] || $c['hasLabel'])) : ?>
+				<span class="ci-label">
+					<a href="javascript: void(0)" data-tab="ci-<?= $c['titleSafe'] ?>">
+						<img src="<?= $c['icon'] ?>">
+						<span class="hide-sm">
+							<?= $c['title'] ?>
+							<?php if (! is_null($c['badgeValue'])) : ?>
+								<span class="badge"><?= $c['badgeValue'] ?></span>
+							<?php endif ?>
+						</span>
+					</a>
+				</span>
+			<?php endif ?>
+		<?php endforeach ?>
+
+		<span class="ci-label">
+			<a href="javascript: void(0)" data-tab="ci-vars">
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACLSURBVEhLYxgFJIHU1NSraWlp/6H4T0pKSjRUijoAyXAwBlrYDpViAFpmARQrJwZDtWACoCROC4D8CnR5XBiqBRMADfyNprgRKkUdAApzoCUdUNwE5MtApYYIALp6NBWBMVQLJgAaOJqK8AOgq+mSio6DggjEBtLUT0UwQ5HZIADkj6aiUTAggIEBANAEDa/lkCRlAAAAAElFTkSuQmCC">
+				<span class="hide-sm">Vars</span>
+			</a>
+		</span>
+
+		<h1>
+			<span class="ci-label">
+				<a href="javascript: void(0)" data-tab="ci-config">
+					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
+					<?= $CI_VERSION ?>
+				</a>
+			</span>
+		</h1>
+
+		<!-- Open/Close Toggle -->
+		<a id="debug-bar-link" href="javascript:void(0)" title="Open/Close">
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVEhL7ZVLDoJAEEThRuoGDwSEG+jCuFU34s3AK3APP1VDDSGMqI1xx0s6M/2rnlHEaMZElmWrPM+vsDvsYbQ7+us0TReSC2EBrEHxCevRYuppYLXkQpC8sVCuGfTvqSE3hFdFwUGuGfRvqSE35NUAfKZrbQNQm2jrMA+gOK+M+FmhDsRL5voHMA8gFGecq0JOXLWlQg7E7AMIxZnjOiZOEJ82gFCcedUE4gS56QP8yf8ywItz7e+RituKlkkDBoIOH4Nd4HZD4NsGYJ/Abn1xEVOcuZ8f0zc/tHiYmzTAwscBvDIK/veyQ9K/rnewjdF26q0kF1IUxZIFPAVW98x/a+qp8L2M/+HMhETRE6S8TxpZ7KGXAAAAAElFTkSuQmCC">
+		</a>
+	</div>
+
+	<!-- Timeline -->
+	<div id="ci-timeline" class="tab">
+		<table class="timeline">
+			<thead>
+			<tr>
+				<th class="debug-bar-width30">NAME</th>
+				<th class="debug-bar-width10">COMPONENT</th>
+				<th class="debug-bar-width10">DURATION</th>
+				<?php for ($i = 0; $i < $segmentCount; $i++) : ?>
+					<th><?= $i * $segmentDuration ?> ms</th>
+				<?php endfor ?>
+			</tr>
+			</thead>
+			<tbody>
+			<?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration,
+				$styles) ?>
+			</tbody>
+		</table>
+	</div>
+
+	<!-- Collector-provided Tabs -->
+	<?php foreach ($collectors as $c) : ?>
+		<?php if (! $c['isEmpty']) : ?>
+			<?php if ($c['hasTabContent']) : ?>
+				<div id="ci-<?= $c['titleSafe'] ?>" class="tab">
+					<h2><?= $c['title'] ?> <span><?= $c['titleDetails'] ?></span></h2>
+
+					<?= is_string($c['display']) ? $c['display'] : $parser->setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?>
+				</div>
+			<?php endif ?>
+		<?php endif ?>
+	<?php endforeach ?>
+
+	<!-- In & Out -->
+	<div id="ci-vars" class="tab">
+
+		<!-- VarData from Collectors -->
+		<?php if (isset($vars['varData'])) : ?>
+			<?php foreach ($vars['varData'] as $heading => $items) : ?>
+
+				<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ',
+					'-', $heading)) ?>'); return false;">
+					<h2><?= $heading ?></h2>
+				</a>
+
+				<?php if (is_array($items)) : ?>
+
+					<table id="<?= strtolower(str_replace(' ', '-', $heading . '_table')) ?>">
+						<tbody>
+						<?php foreach ($items as $key => $value) : ?>
+							<tr>
+								<td><?= $key ?></td>
+								<td><?= $value ?></td>
+							</tr>
+						<?php endforeach ?>
+						</tbody>
+					</table>
+
+				<?php else: ?>
+					<p class="muted">No data to display.</p>
+				<?php endif ?>
+			<?php endforeach ?>
+		<?php endif ?>
+
+		<!-- Session -->
+		<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('session'); return false;">
+			<h2>Session User Data</h2>
+		</a>
+
+		<?php if (isset($vars['session'])) : ?>
+			<?php if (! empty($vars['session'])) : ?>
+				<table id="session_table">
+					<tbody>
+					<?php foreach ($vars['session'] as $key => $value) : ?>
+						<tr>
+							<td><?= $key ?></td>
+							<td><?= $value ?></td>
+						</tr>
+					<?php endforeach ?>
+					</tbody>
+				</table>
+			<?php else : ?>
+				<p class="muted">No data to display.</p>
+			<?php endif ?>
+		<?php else : ?>
+			<p class="muted">Session doesn't seem to be active.</p>
+		<?php endif ?>
+
+		<h2>Request <span>( <?= $vars['request'] ?> )</span></h2>
+
+		<?php if (isset($vars['get']) && $get = $vars['get']) : ?>
+			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('get'); return false;">
+				<h3>$_GET</h3>
+			</a>
+
+			<table id="get_table">
+				<tbody>
+				<?php foreach ($get as $name => $value) : ?>
+					<tr>
+						<td><?= $name ?></td>
+						<td><?= $value ?></td>
+					</tr>
+				<?php endforeach ?>
+				</tbody>
+			</table>
+		<?php endif ?>
+
+		<?php if (isset($vars['post']) && $post = $vars['post']) : ?>
+			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('post'); return false;">
+				<h3>$_POST</h3>
+			</a>
+
+			<table id="post_table">
+				<tbody>
+				<?php foreach ($post as $name => $value) : ?>
+					<tr>
+						<td><?= $name ?></td>
+						<td><?= $value ?></td>
+					</tr>
+				<?php endforeach ?>
+				</tbody>
+			</table>
+		<?php endif ?>
+
+		<?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
+			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('request_headers'); return false;">
+				<h3>Headers</h3>
+			</a>
+
+			<table id="request_headers_table">
+				<tbody>
+				<?php foreach ($headers as $header => $value) : ?>
+					<tr>
+						<td><?= $header ?></td>
+						<td><?= $value ?></td>
+					</tr>
+				<?php endforeach ?>
+				</tbody>
+			</table>
+		<?php endif ?>
+
+		<?php if (isset($vars['cookies']) && $cookies = $vars['cookies']) : ?>
+			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('cookie'); return false;">
+				<h3>Cookies</h3>
+			</a>
+
+			<table id="cookie_table">
+				<tbody>
+				<?php foreach ($cookies as $name => $value) : ?>
+					<tr>
+						<td><?= $name ?></td>
+						<td><?= is_array($value) ? print_r($value, true) : $value ?></td>
+					</tr>
+				<?php endforeach ?>
+				</tbody>
+			</table>
+		<?php endif ?>
+
+		<h2>Response
+			<span>( <?= $vars['response']['statusCode'] . ' - ' . $vars['response']['reason'] ?> )</span>
+		</h2>
+
+		<?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
+			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('response_headers'); return false;">
+				<h3>Headers</h3>
+			</a>
+
+			<table id="response_headers_table">
+				<tbody>
+				<?php foreach ($headers as $header => $value) : ?>
+					<tr>
+						<td><?= $header ?></td>
+						<td><?= $value ?></td>
+					</tr>
+				<?php endforeach ?>
+				</tbody>
+			</table>
+		<?php endif ?>
+	</div>
+
+	<!-- Config Values -->
+	<div id="ci-config" class="tab">
+		<h2>System Configuration</h2>
+
+		<?= $parser->setData($config)->render('_config.tpl') ?>
+	</div>
+</div>
+<style type="text/css">
+	<?php foreach($styles as $name => $style) : ?>
+	.<?= $name ?> {
+		<?= $style ?>
+	}
+
+	<?php endforeach ?>
+</style>
diff --git a/system/Debug/Toolbar/Views/toolbarloader.js.php b/system/Debug/Toolbar/Views/toolbarloader.js.php
new file mode 100644
index 0000000..70242b5
--- /dev/null
+++ b/system/Debug/Toolbar/Views/toolbarloader.js.php
@@ -0,0 +1,93 @@
+<?php if (ENVIRONMENT !== 'testing') : ?>
+document.addEventListener('DOMContentLoaded', loadDoc, false);
+
+function loadDoc(time) {
+	if (isNaN(time)) {
+		time = document.getElementById("debugbar_loader").getAttribute("data-time");
+		localStorage.setItem('debugbar-time', time);
+	}
+
+	localStorage.setItem('debugbar-time-new', time);
+
+	var url = "<?= rtrim(site_url(), '/') ?>";
+
+	var xhttp = new XMLHttpRequest();
+	xhttp.onreadystatechange = function() {
+		if (this.readyState === 4 && this.status === 200) {
+			var toolbar = document.getElementById("toolbarContainer");
+			if (!toolbar) {
+				toolbar = document.createElement('div');
+				toolbar.setAttribute('id', 'toolbarContainer');
+				document.body.appendChild(toolbar);
+			}
+
+			// copy for easier manipulation
+			let responseText = this.responseText;
+
+			// get csp blocked parts
+			// the style block is the first and starts at 0
+			{
+				let PosBeg = responseText.indexOf( '>', responseText.indexOf( '<style' ) ) + 1;
+				let PosEnd = responseText.indexOf( '</style>', PosBeg );
+				document.getElementById( 'debugbar_dynamic_style' ).innerHTML = responseText.substr( PosBeg, PosEnd - PosBeg );
+				responseText = responseText.substr( PosEnd + 8 );
+			}
+			// the script block starts right after style blocks ended
+			{
+				let PosBeg = responseText.indexOf( '>', responseText.indexOf( '<script' ) ) + 1;
+				let PosEnd = responseText.indexOf( '</script>' );
+				document.getElementById( 'debugbar_dynamic_script' ).innerHTML = responseText.substr( PosBeg, PosEnd - PosBeg );
+				responseText = responseText.substr( PosEnd + 9 );
+			}
+			// check for last style block
+			{
+				let PosBeg = responseText.indexOf( '>', responseText.lastIndexOf( '<style' ) ) + 1;
+				let PosEnd = responseText.indexOf( '</style>', PosBeg );
+				document.getElementById( 'debugbar_dynamic_style' ).innerHTML += responseText.substr( PosBeg, PosEnd - PosBeg );
+				responseText = responseText.substr( 0, PosBeg + 8 );
+			}
+
+			toolbar.innerHTML = responseText;
+			if (typeof ciDebugBar === 'object') {
+				ciDebugBar.init();
+			}
+		} else if (this.readyState === 4 && this.status === 404) {
+			console.log('CodeIgniter DebugBar: File "WRITEPATH/debugbar/debugbar_' + time + '" not found.');
+		}
+	};
+
+	xhttp.open("GET", url + "?debugbar_time=" + time, true);
+	xhttp.send();
+}
+
+// Track all AJAX requests
+if (window.ActiveXObject) {
+	var oldXHR = new ActiveXObject('Microsoft.XMLHTTP');
+} else {
+	var oldXHR = window.XMLHttpRequest;
+}
+
+function newXHR() {
+	var realXHR = new oldXHR();
+	realXHR.addEventListener("readystatechange", function() {
+		// Only success responses and URLs that do not contains "debugbar_time" are tracked
+		if (realXHR.readyState === 4 && realXHR.status.toString()[0] === '2' && realXHR.responseURL.indexOf('debugbar_time') === -1) {
+			if (realXHR.getAllResponseHeaders().indexOf("Debugbar-Time") >= 0) {
+    				var debugbarTime = realXHR.getResponseHeader('Debugbar-Time');
+
+				if (debugbarTime) {
+					var h2 = document.querySelector('#ci-history > h2');
+					if (h2) {
+						h2.innerHTML = 'History <small>You have new debug data.</small> <button onclick="loadDoc(' + debugbarTime + ')">Update</button>';
+						var badge = document.querySelector('a[data-tab="ci-history"] > span > .badge');
+						badge.className += ' active';
+					}
+				}
+			}
+		}
+	}, false);
+	return realXHR;
+}
+
+window.XMLHttpRequest = newXHR;
+<?php endif; ?>
diff --git a/system/Email/Email.php b/system/Email/Email.php
new file mode 100644
index 0000000..36720ba
--- /dev/null
+++ b/system/Email/Email.php
@@ -0,0 +1,2484 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Email;
+
+use CodeIgniter\Events\Events;
+use Config\Mimes;
+use ErrorException;
+
+/**
+ * CodeIgniter Email Class
+ *
+ * Permits email to be sent using Mail, Sendmail, or SMTP.
+ */
+class Email
+{
+	/**
+	 * Properties from the last successful send.
+	 *
+	 * @var array|null
+	 */
+	public $archive;
+
+	/**
+	 * Properties to be added to the next archive.
+	 *
+	 * @var array
+	 */
+	protected $tmpArchive = [];
+
+	/**
+	 * @var string
+	 */
+	public $fromEmail;
+
+	/**
+	 * @var string
+	 */
+	public $fromName;
+
+	/**
+	 * Used as the User-Agent and X-Mailer headers' value.
+	 *
+	 * @var string
+	 */
+	public $userAgent = 'CodeIgniter';
+
+	/**
+	 * Path to the Sendmail binary.
+	 *
+	 * @var string
+	 */
+	public $mailPath = '/usr/sbin/sendmail';
+
+	/**
+	 * Which method to use for sending e-mails.
+	 *
+	 * @var string 'mail', 'sendmail' or 'smtp'
+	 */
+	public $protocol = 'mail';
+
+	/**
+	 * STMP Server host
+	 *
+	 * @var string
+	 */
+	public $SMTPHost = '';
+
+	/**
+	 * SMTP Username
+	 *
+	 * @var string
+	 */
+	public $SMTPUser = '';
+
+	/**
+	 * SMTP Password
+	 *
+	 * @var string
+	 */
+	public $SMTPPass = '';
+
+	/**
+	 * SMTP Server port
+	 *
+	 * @var integer
+	 */
+	public $SMTPPort = 25;
+
+	/**
+	 * SMTP connection timeout in seconds
+	 *
+	 * @var integer
+	 */
+	public $SMTPTimeout = 5;
+
+	/**
+	 * SMTP persistent connection
+	 *
+	 * @var boolean
+	 */
+	public $SMTPKeepAlive = false;
+
+	/**
+	 * SMTP Encryption
+	 *
+	 * @var string Empty, 'tls' or 'ssl'
+	 */
+	public $SMTPCrypto = '';
+
+	/**
+	 * Whether to apply word-wrapping to the message body.
+	 *
+	 * @var boolean
+	 */
+	public $wordWrap = true;
+
+	/**
+	 * Number of characters to wrap at.
+	 *
+	 * @see Email::$wordWrap
+	 * @var integer
+	 */
+	public $wrapChars = 76;
+
+	/**
+	 * Message format.
+	 *
+	 * @var string 'text' or 'html'
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (default: utf-8)
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	/**
+	 * Alternative message (for HTML messages only)
+	 *
+	 * @var string
+	 */
+	public $altMessage = '';
+
+	/**
+	 * Whether to validate e-mail addresses.
+	 *
+	 * @var boolean
+	 */
+	public $validate = true;
+
+	/**
+	 * X-Priority header value.
+	 *
+	 * @var integer 1-5
+	 */
+	public $priority = 3;
+
+	/**
+	 * Newline character sequence.
+	 * Use "\r\n" to comply with RFC 822.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string "\r\n" or "\n"
+	 */
+	public $newline = "\n";
+
+	/**
+	 * CRLF character sequence
+	 *
+	 * RFC 2045 specifies that for 'quoted-printable' encoding,
+	 * "\r\n" must be used. However, it appears that some servers
+	 * (even on the receiving end) don't handle it properly and
+	 * switching to "\n", while improper, is the only solution
+	 * that seems to work for all environments.
+	 *
+	 * @link http://www.ietf.org/rfc/rfc822.txt
+	 * @var  string
+	 */
+	public $CRLF = "\n";
+
+	/**
+	 * Whether to use Delivery Status Notification.
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+	/**
+	 * Whether to send multipart alternatives.
+	 * Yahoo! doesn't seem to like these.
+	 *
+	 * @var boolean
+	 */
+	public $sendMultipart = true;
+
+	/**
+	 * Whether to send messages to BCC recipients in batches.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * BCC Batch max number size.
+	 *
+	 * @see Email::$BCCBatchMode
+	 * @var integer|string
+	 */
+	public $BCCBatchSize = 200;
+
+	/**
+	 * Subject header
+	 *
+	 * @var string
+	 */
+	protected $subject = '';
+
+	/**
+	 * Message body
+	 *
+	 * @var string
+	 */
+	protected $body = '';
+
+	/**
+	 * Final message body to be sent.
+	 *
+	 * @var string
+	 */
+	protected $finalBody = '';
+
+	/**
+	 * Final headers to send
+	 *
+	 * @var string
+	 */
+	protected $headerStr = '';
+
+	/**
+	 * SMTP Connection socket placeholder
+	 *
+	 * @var resource|null
+	 */
+	protected $SMTPConnect;
+
+	/**
+	 * Mail encoding
+	 *
+	 * @var string '8bit' or '7bit'
+	 */
+	protected $encoding = '8bit';
+
+	/**
+	 * Whether to perform SMTP authentication
+	 *
+	 * @var boolean
+	 */
+	protected $SMTPAuth = false;
+
+	/**
+	 * Whether to send a Reply-To header
+	 *
+	 * @var boolean
+	 */
+	protected $replyToFlag = false;
+
+	/**
+	 * Debug messages
+	 *
+	 * @see Email::printDebugger()
+	 * @var array
+	 */
+	protected $debugMessage = [];
+
+	/**
+	 * Recipients
+	 *
+	 * @var array|string
+	 */
+	protected $recipients = [];
+
+	/**
+	 * CC Recipients
+	 *
+	 * @var array
+	 */
+	protected $CCArray = [];
+
+	/**
+	 * BCC Recipients
+	 *
+	 * @var array
+	 */
+	protected $BCCArray = [];
+
+	/**
+	 * Message headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Attachment data
+	 *
+	 * @var array
+	 */
+	protected $attachments = [];
+
+	/**
+	 * Valid $protocol values
+	 *
+	 * @see Email::$protocol
+	 * @var array
+	 */
+	protected $protocols = [
+		'mail',
+		'sendmail',
+		'smtp',
+	];
+
+	/**
+	 * Base charsets
+	 *
+	 * Character sets valid for 7-bit encoding,
+	 * excluding language suffix.
+	 *
+	 * @var array
+	 */
+	protected $baseCharsets = [
+		'us-ascii',
+		'iso-2022-',
+	];
+
+	/**
+	 * Bit depths
+	 *
+	 * Valid mail encodings
+	 *
+	 * @see Email::$encoding
+	 * @var array
+	 */
+	protected $bitDepths = [
+		'7bit',
+		'8bit',
+	];
+
+	/**
+	 * $priority translations
+	 *
+	 * Actual values to send with the X-Priority header
+	 *
+	 * @var array
+	 */
+	protected $priorities = [
+		1 => '1 (Highest)',
+		2 => '2 (High)',
+		3 => '3 (Normal)',
+		4 => '4 (Low)',
+		5 => '5 (Lowest)',
+	];
+
+	/**
+	 * mbstring.func_overload flag
+	 *
+	 * @var boolean
+	 */
+	protected static $func_overload;
+
+	/**
+	 * Constructor - Sets Email Preferences
+	 *
+	 * The constructor can be passed an array of config values
+	 *
+	 * @param array|null $config
+	 */
+	public function __construct($config = null)
+	{
+		$this->initialize($config);
+		if (! isset(static::$func_overload))
+		{
+			static::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+		}
+	}
+
+	/**
+	 * Initialize preferences
+	 *
+	 * @param array|\Config\Email $config
+	 *
+	 * @return Email
+	 */
+	public function initialize($config)
+	{
+		$this->clear();
+
+		if ($config instanceof \Config\Email)
+		{
+			$config = get_object_vars($config);
+		}
+
+		foreach (array_keys(get_class_vars(get_class($this))) as $key)
+		{
+			if (property_exists($this, $key) && isset($config[$key]))
+			{
+				$method = 'set' . ucfirst($key);
+
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+				else
+				{
+					$this->$key = $config[$key];
+				}
+			}
+		}
+
+		$this->charset  = strtoupper($this->charset);
+		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+		return $this;
+	}
+
+	/**
+	 * Initialize the Email Data
+	 *
+	 * @param boolean $clearAttachments
+	 *
+	 * @return Email
+	 */
+	public function clear($clearAttachments = false)
+	{
+		$this->subject      = '';
+		$this->body         = '';
+		$this->finalBody    = '';
+		$this->headerStr    = '';
+		$this->replyToFlag  = false;
+		$this->recipients   = [];
+		$this->CCArray      = [];
+		$this->BCCArray     = [];
+		$this->headers      = [];
+		$this->debugMessage = [];
+
+		$this->setHeader('Date', $this->setDate());
+
+		if ($clearAttachments !== false)
+		{
+			$this->attachments = [];
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set FROM
+	 *
+	 * @param string      $from
+	 * @param string      $name
+	 * @param string|null $returnPath Return-Path
+	 *
+	 * @return Email
+	 */
+	public function setFrom($from, $name = '', $returnPath = null)
+	{
+		if (preg_match('/\<(.*)\>/', $from, $match))
+		{
+			$from = $match[1];
+		}
+
+		if ($this->validate)
+		{
+			$this->validateEmail($this->stringToArray($from));
+
+			if ($returnPath)
+			{
+				$this->validateEmail($this->stringToArray($returnPath));
+			}
+		}
+
+		// Store the plain text values
+		$this->tmpArchive['fromEmail'] = $from;
+		$this->tmpArchive['fromName']  = $name;
+
+		// prepare the display name
+		if ($name !== '')
+		{
+			// only use Q encoding if there are characters that would require it
+			if (! preg_match('/[\200-\377]/', $name))
+			{
+				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
+				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
+			}
+			else
+			{
+				$name = $this->prepQEncoding($name);
+			}
+		}
+
+		$this->setHeader('From', $name . ' <' . $from . '>');
+		if (! isset($returnPath))
+		{
+			$returnPath = $from;
+		}
+		$this->setHeader('Return-Path', '<' . $returnPath . '>');
+		$this->tmpArchive['returnPath'] = $returnPath;
+
+		return $this;
+	}
+
+	/**
+	 * Set Reply-to
+	 *
+	 * @param string $replyto
+	 * @param string $name
+	 *
+	 * @return Email
+	 */
+	public function setReplyTo($replyto, $name = '')
+	{
+		if (preg_match('/\<(.*)\>/', $replyto, $match))
+		{
+			$replyto = $match[1];
+		}
+
+		if ($this->validate)
+		{
+			$this->validateEmail($this->stringToArray($replyto));
+		}
+
+		if ($name !== '')
+		{
+			$this->tmpArchive['replyName'] = $name;
+
+			// only use Q encoding if there are characters that would require it
+			if (! preg_match('/[\200-\377]/', $name))
+			{
+				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
+				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
+			}
+			else
+			{
+				$name = $this->prepQEncoding($name);
+			}
+		}
+
+		$this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
+		$this->replyToFlag           = true;
+		$this->tmpArchive['replyTo'] = $replyto;
+
+		return $this;
+	}
+
+	/**
+	 * Set Recipients
+	 *
+	 * @param string|array $to
+	 *
+	 * @return Email
+	 */
+	public function setTo($to)
+	{
+		$to = $this->stringToArray($to);
+		$to = $this->cleanEmail($to);
+
+		if ($this->validate)
+		{
+			$this->validateEmail($to);
+		}
+
+		if ($this->getProtocol() !== 'mail')
+		{
+			$this->setHeader('To', implode(', ', $to));
+		}
+
+		$this->recipients = $to;
+
+		return $this;
+	}
+
+	/**
+	 * Set CC
+	 *
+	 * @param string $cc
+	 *
+	 * @return Email
+	 */
+	public function setCC($cc)
+	{
+		$cc = $this->cleanEmail($this->stringToArray($cc));
+
+		if ($this->validate)
+		{
+			$this->validateEmail($cc);
+		}
+
+		$this->setHeader('Cc', implode(', ', $cc));
+
+		if ($this->getProtocol() === 'smtp')
+		{
+			$this->CCArray = $cc;
+		}
+
+		$this->tmpArchive['CCArray'] = $cc;
+
+		return $this;
+	}
+
+	/**
+	 * Set BCC
+	 *
+	 * @param string $bcc
+	 * @param string $limit
+	 *
+	 * @return Email
+	 */
+	public function setBCC($bcc, $limit = '')
+	{
+		if ($limit !== '' && is_numeric($limit))
+		{
+			$this->BCCBatchMode = true;
+			$this->BCCBatchSize = $limit;
+		}
+
+		$bcc = $this->cleanEmail($this->stringToArray($bcc));
+
+		if ($this->validate)
+		{
+			$this->validateEmail($bcc);
+		}
+
+		if ($this->getProtocol() === 'smtp' || ($this->BCCBatchMode && count($bcc) > $this->BCCBatchSize))
+		{
+			$this->BCCArray = $bcc;
+		}
+		else
+		{
+			$this->setHeader('Bcc', implode(', ', $bcc));
+			$this->tmpArchive['BCCArray'] = $bcc;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set Email Subject
+	 *
+	 * @param string $subject
+	 *
+	 * @return Email
+	 */
+	public function setSubject($subject)
+	{
+		$this->tmpArchive['subject'] = $subject;
+
+		$subject = $this->prepQEncoding($subject);
+		$this->setHeader('Subject', $subject);
+
+		return $this;
+	}
+
+	/**
+	 * Set Body
+	 *
+	 * @param string $body
+	 *
+	 * @return Email
+	 */
+	public function setMessage($body)
+	{
+		$this->body = rtrim(str_replace("\r", '', $body));
+
+		return $this;
+	}
+
+	/**
+	 * Assign file attachments
+	 *
+	 * @param string      $file        Can be local path, URL or buffered content
+	 * @param string      $disposition 'attachment'
+	 * @param string|null $newname
+	 * @param string      $mime
+	 *
+	 * @return Email|boolean
+	 */
+	public function attach($file, $disposition = '', $newname = null, $mime = '')
+	{
+		if ($mime === '')
+		{
+			if (strpos($file, '://') === false && ! is_file($file))
+			{
+				$this->setErrorMessage(lang('Email.attachmentMissing', [$file]));
+
+				return false;
+			}
+
+			if (! $fp = @fopen($file, 'rb'))
+			{
+				$this->setErrorMessage(lang('Email.attachmentUnreadable', [$file]));
+
+				return false;
+			}
+
+			$fileContent = stream_get_contents($fp);
+
+			$mime = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
+
+			fclose($fp);
+		}
+		else
+		{
+			$fileContent = & $file; // buffered file
+		}
+
+		// declare names on their own, to make phpcbf happy
+		$namesAttached = [
+			$file,
+			$newname,
+		];
+
+		$this->attachments[] = [
+			'name'        => $namesAttached,
+			'disposition' => empty($disposition) ? 'attachment' : $disposition,
+			// Can also be 'inline'  Not sure if it matters
+			'type'        => $mime,
+			'content'     => chunk_split(base64_encode($fileContent)),
+			'multipart'   => 'mixed',
+		];
+
+		return $this;
+	}
+
+	/**
+	 * Set and return attachment Content-ID
+	 *
+	 * Useful for attached inline pictures
+	 *
+	 * @param string $filename
+	 *
+	 * @return string|boolean
+	 */
+	public function setAttachmentCID($filename)
+	{
+		foreach ($this->attachments as $i => $attachment)
+		{
+			if ($attachment['name'][0] === $filename)
+			{
+				$this->attachments[$i]['multipart'] = 'related';
+
+				$this->attachments[$i]['cid'] = uniqid(basename($attachment['name'][0]) . '@', true);
+
+				return $attachment['cid'];
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add a Header Item
+	 *
+	 * @param string $header
+	 * @param string $value
+	 *
+	 * @return Email
+	 */
+	public function setHeader($header, $value)
+	{
+		$this->headers[$header] = str_replace(["\n", "\r"], '', $value);
+
+		return $this;
+	}
+
+	/**
+	 * Convert a String to an Array
+	 *
+	 * @param string $email
+	 *
+	 * @return array
+	 */
+	protected function stringToArray($email)
+	{
+		if (! is_array($email))
+		{
+			return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
+		}
+
+		return $email;
+	}
+
+	/**
+	 * Set Multipart Value
+	 *
+	 * @param string $str
+	 *
+	 * @return Email
+	 */
+	public function setAltMessage($str)
+	{
+		$this->altMessage = (string) $str;
+
+		return $this;
+	}
+
+	/**
+	 * Set Mailtype
+	 *
+	 * @param string $type
+	 *
+	 * @return Email
+	 */
+	public function setMailType($type = 'text')
+	{
+		$this->mailType = ($type === 'html') ? 'html' : 'text';
+
+		return $this;
+	}
+
+	/**
+	 * Set Wordwrap
+	 *
+	 * @param boolean $wordWrap
+	 *
+	 * @return Email
+	 */
+	public function setWordWrap($wordWrap = true)
+	{
+		$this->wordWrap = (bool) $wordWrap;
+
+		return $this;
+	}
+
+	/**
+	 * Set Protocol
+	 *
+	 * @param string $protocol
+	 *
+	 * @return Email
+	 */
+	public function setProtocol($protocol = 'mail')
+	{
+		$this->protocol = in_array($protocol, $this->protocols, true) ? strtolower($protocol) : 'mail';
+
+		return $this;
+	}
+
+	/**
+	 * Set Priority
+	 *
+	 * @param integer $n
+	 *
+	 * @return Email
+	 */
+	public function setPriority($n = 3)
+	{
+		$this->priority = preg_match('/^[1-5]$/', (string) $n) ? (int) $n : 3;
+
+		return $this;
+	}
+
+	/**
+	 * Set Newline Character
+	 *
+	 * @param string $newline
+	 *
+	 * @return Email
+	 */
+	public function setNewline($newline = "\n")
+	{
+		$this->newline = in_array($newline, ["\n", "\r\n", "\r"], true) ? $newline : "\n";
+
+		return $this;
+	}
+
+	/**
+	 * Set CRLF
+	 *
+	 * @param string $CRLF
+	 *
+	 * @return Email
+	 */
+	public function setCRLF($CRLF = "\n")
+	{
+		$this->CRLF = ($CRLF !== "\n" && $CRLF !== "\r\n" && $CRLF !== "\r") ? "\n" : $CRLF;
+
+		return $this;
+	}
+
+	/**
+	 * Get the Message ID
+	 *
+	 * @return string
+	 */
+	protected function getMessageID()
+	{
+		$from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
+
+		return '<' . uniqid('', true) . strstr($from, '@') . '>';
+	}
+
+	/**
+	 * Get Mail Protocol
+	 *
+	 * @return string
+	 */
+	protected function getProtocol()
+	{
+		$this->protocol = strtolower($this->protocol);
+
+		if (! in_array($this->protocol, $this->protocols, true))
+		{
+			$this->protocol = 'mail';
+		}
+
+		return $this->protocol;
+	}
+
+	/**
+	 * Get Mail Encoding
+	 *
+	 * @return string
+	 */
+	protected function getEncoding()
+	{
+		if (! in_array($this->encoding, $this->bitDepths, true))
+		{
+			$this->encoding = '8bit';
+		}
+
+		foreach ($this->baseCharsets as $charset)
+		{
+			if (strpos($this->charset, $charset) === 0)
+			{
+				$this->encoding = '7bit';
+
+				break;
+			}
+		}
+
+		return $this->encoding;
+	}
+
+	/**
+	 * Get content type (text/html/attachment)
+	 *
+	 * @return string
+	 */
+	protected function getContentType()
+	{
+		if ($this->mailType === 'html')
+		{
+			return empty($this->attachments) ? 'html' : 'html-attach';
+		}
+
+		if ($this->mailType === 'text' && ! empty($this->attachments))
+		{
+			return 'plain-attach';
+		}
+
+		return 'plain';
+	}
+
+	/**
+	 * Set RFC 822 Date
+	 *
+	 * @return string
+	 */
+	protected function setDate()
+	{
+		$timezone = date('Z');
+		$operator = ($timezone[0] === '-') ? '-' : '+';
+		$timezone = abs($timezone);
+		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
+
+		return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
+	}
+
+	/**
+	 * Mime message
+	 *
+	 * @return string
+	 */
+	protected function getMimeMessage()
+	{
+		return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
+	}
+
+	/**
+	 * Validate Email Address
+	 *
+	 * @param string|array $email
+	 *
+	 * @return boolean
+	 */
+	public function validateEmail($email)
+	{
+		if (! is_array($email))
+		{
+			$this->setErrorMessage(lang('Email.mustBeArray'));
+
+			return false;
+		}
+
+		foreach ($email as $val)
+		{
+			if (! $this->isValidEmail($val))
+			{
+				$this->setErrorMessage(lang('Email.invalidAddress', [$val]));
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Email Validation
+	 *
+	 * @param string $email
+	 *
+	 * @return boolean
+	 */
+	public function isValidEmail($email)
+	{
+		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && $atpos = strpos($email, '@'))
+		{
+			$email = static::substr($email, 0, ++$atpos)
+				. idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
+		}
+
+		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
+	}
+
+	/**
+	 * Clean Extended Email Address: Joe Smith <joe@smith.com>
+	 *
+	 * @param string|array $email
+	 *
+	 * @return array|string
+	 */
+	public function cleanEmail($email)
+	{
+		if (! is_array($email))
+		{
+			return preg_match('/\<(.*)\>/', $email, $match) ? $match[1] : $email;
+		}
+
+		$cleanEmail = [];
+
+		foreach ($email as $addy)
+		{
+			$cleanEmail[] = preg_match('/\<(.*)\>/', $addy, $match) ? $match[1] : $addy;
+		}
+
+		return $cleanEmail;
+	}
+
+	/**
+	 * Build alternative plain text message
+	 *
+	 * Provides the raw message for use in plain-text headers of
+	 * HTML-formatted emails.
+	 * If the user hasn't specified his own alternative message
+	 * it creates one by stripping the HTML
+	 *
+	 * @return string
+	 */
+	protected function getAltMessage()
+	{
+		if (! empty($this->altMessage))
+		{
+			return ($this->wordWrap) ? $this->wordWrap($this->altMessage, 76) : $this->altMessage;
+		}
+
+		$body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
+		$body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
+
+		for ($i = 20; $i >= 3; $i --)
+		{
+			$body = str_replace(str_repeat("\n", $i), "\n\n", $body);
+		}
+
+		// Reduce multiple spaces
+		$body = preg_replace('| +|', ' ', $body);
+
+		return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
+	}
+
+	/**
+	 * Word Wrap
+	 *
+	 * @param string       $str
+	 * @param integer|null $charlim Line-length limit
+	 *
+	 * @return string
+	 */
+	public function wordWrap($str, $charlim = null)
+	{
+		// Set the character limit, if not already present
+		if (empty($charlim))
+		{
+			$charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
+		}
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		// Reduce multiple spaces at end of line
+		$str = preg_replace('| +\n|', "\n", $str);
+
+		// If the current word is surrounded by {unwrap} tags we'll
+		// strip the entire chunk and replace it with a marker.
+		$unwrap = [];
+
+		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
+		{
+			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
+			{
+				$unwrap[] = $matches[1][$i];
+				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
+			}
+		}
+
+		// Use PHP's native function to do the initial wordwrap.
+		// We set the cut flag to FALSE so that any individual words that are
+		// too long get left alone. In the next step we'll deal with them.
+		$str = wordwrap($str, $charlim, "\n", false);
+
+		// Split the string into individual lines of text and cycle through them
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			// Is the line within the allowed character count?
+			// If so we'll join it to the output and continue
+			if (static::strlen($line) <= $charlim)
+			{
+				$output .= $line . $this->newline;
+
+				continue;
+			}
+
+			$temp = '';
+
+			do
+			{
+				// If the over-length word is a URL we won't wrap it
+				if (preg_match('!\[url.+\]|://|www\.!', $line))
+				{
+					break;
+				}
+
+				// Trim the word down
+				$temp .= static::substr($line, 0, $charlim - 1);
+				$line  = static::substr($line, $charlim - 1);
+			}
+			while (static::strlen($line) > $charlim);
+
+			// If $temp contains data it means we had to split up an over-length
+			// word into smaller chunks so we'll add it back to our current line
+			if ($temp !== '')
+			{
+				$output .= $temp . $this->newline;
+			}
+
+			$output .= $line . $this->newline;
+		}
+
+		// Put our markers back
+		if ($unwrap)
+		{
+			foreach ($unwrap as $key => $val)
+			{
+				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
+			}
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Build final headers
+	 */
+	protected function buildHeaders()
+	{
+		$this->setHeader('User-Agent', $this->userAgent);
+		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
+		$this->setHeader('X-Mailer', $this->userAgent);
+		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
+		$this->setHeader('Message-ID', $this->getMessageID());
+		$this->setHeader('Mime-Version', '1.0');
+	}
+
+	/**
+	 * Write Headers as a string
+	 */
+	protected function writeHeaders()
+	{
+		if ($this->protocol === 'mail' && isset($this->headers['Subject']))
+		{
+			$this->subject = $this->headers['Subject'];
+			unset($this->headers['Subject']);
+		}
+
+		reset($this->headers);
+		$this->headerStr = '';
+
+		foreach ($this->headers as $key => $val)
+		{
+			$val = trim($val);
+
+			if ($val !== '')
+			{
+				$this->headerStr .= $key . ': ' . $val . $this->newline;
+			}
+		}
+
+		if ($this->getProtocol() === 'mail')
+		{
+			$this->headerStr = rtrim($this->headerStr);
+		}
+	}
+
+	/**
+	 * Build Final Body and attachments
+	 */
+	protected function buildMessage()
+	{
+		if ($this->wordWrap === true && $this->mailType !== 'html')
+		{
+			$this->body = $this->wordWrap($this->body);
+		}
+
+		$this->writeHeaders();
+		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
+		$body = '';
+
+		switch ($this->getContentType())
+		{
+			case 'plain':
+				$hdr .= 'Content-Type: text/plain; charset='
+					. $this->charset
+					. $this->newline
+					. 'Content-Transfer-Encoding: '
+					. $this->getEncoding();
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+					$this->finalBody  = $this->body;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+				}
+
+				return;
+
+			case 'html':
+				$boundary = uniqid('B_ALT_', true);
+
+				if ($this->sendMultipart === false)
+				{
+					$hdr .= 'Content-Type: text/html; charset='
+						. $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable';
+				}
+				else
+				{
+					$hdr  .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+					$body .= $this->getMimeMessage() . $this->newline . $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+						. $this->getAltMessage() . $this->newline . $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+				}
+
+				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
+
+				if ($this->getProtocol() === 'mail')
+				{
+					  $this->headerStr .= $hdr;
+				}
+				else
+				{
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+				}
+
+				if ($this->sendMultipart !== false)
+				{
+					$this->finalBody .= '--' . $boundary . '--';
+				}
+
+				return;
+
+			case 'plain-attach':
+				$boundary = uniqid('B_ATC_', true);
+				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				$body .= $this->getMimeMessage() . $this->newline
+					. $this->newline
+					. '--' . $boundary . $this->newline
+					. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+					. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+					. $this->newline
+					. $this->body . $this->newline . $this->newline;
+
+				$this->appendAttachments($body, $boundary);
+				break;
+
+			case 'html-attach':
+				$altBoundary  = uniqid('B_ALT_', true);
+				$lastBoundary = null;
+
+				if ($this->attachmentsHaveMultipart('mixed'))
+				{
+					$atcBoundary  = uniqid('B_ATC_', true);
+					$hdr         .= 'Content-Type: multipart/mixed; boundary="' . $atcBoundary . '"';
+					$lastBoundary = $atcBoundary;
+				}
+
+				if ($this->attachmentsHaveMultipart('related'))
+				{
+					$relBoundary = uniqid('B_REL_', true);
+
+					$relBoundaryHeader = 'Content-Type: multipart/related; boundary="' . $relBoundary . '"';
+
+					if (isset($lastBoundary))
+					{
+						$body .= '--' . $lastBoundary . $this->newline . $relBoundaryHeader;
+					}
+					else
+					{
+						$hdr .= $relBoundaryHeader;
+					}
+
+					$lastBoundary = $relBoundary;
+				}
+
+				if ($this->getProtocol() === 'mail')
+				{
+					$this->headerStr .= $hdr;
+				}
+
+				static::strlen($body) && $body .= $this->newline . $this->newline;
+
+				$body .= $this->getMimeMessage() . $this->newline . $this->newline
+					. '--' . $lastBoundary . $this->newline
+					. 'Content-Type: multipart/alternative; boundary="' . $altBoundary . '"' . $this->newline . $this->newline
+					. '--' . $altBoundary . $this->newline
+					. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+					. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+					. $this->getAltMessage() . $this->newline . $this->newline
+					. '--' . $altBoundary . $this->newline
+					. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+					. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+					. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+					. '--' . $altBoundary . '--' . $this->newline . $this->newline;
+
+				if (! empty($relBoundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $relBoundary, 'related');
+				}
+
+				// multipart/mixed attachments
+				if (! empty($atcBoundary))
+				{
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $atcBoundary, 'mixed');
+				}
+
+				break;
+		}
+
+		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	protected function attachmentsHaveMultipart($type)
+	{
+		foreach ($this->attachments as &$attachment)
+		{
+			if ($attachment['multipart'] === $type)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Prepares attachment string
+	 *
+	 * @param string      $body      Message body to append to
+	 * @param string      $boundary  Multipart boundary
+	 * @param string|null $multipart When provided, only attachments of this type will be processed
+	 *
+	 * @return void
+	 */
+	protected function appendAttachments(&$body, $boundary, $multipart = null)
+	{
+		foreach ($this->attachments as $attachment)
+		{
+			if (isset($multipart) && $attachment['multipart'] !== $multipart)
+			{
+				continue;
+			}
+			$name  = $attachment['name'][1] ?? basename($attachment['name'][0]);
+			$body .= '--' . $boundary . $this->newline
+				. 'Content-Type: ' . $attachment['type'] . '; name="' . $name . '"' . $this->newline
+				. 'Content-Disposition: ' . $attachment['disposition'] . ';' . $this->newline
+				. 'Content-Transfer-Encoding: base64' . $this->newline
+				. (empty($attachment['cid']) ? '' : 'Content-ID: <' . $attachment['cid'] . '>' . $this->newline)
+				. $this->newline
+				. $attachment['content'] . $this->newline;
+		}
+
+		// $name won't be set if no attachments were appended,
+		// and therefore a boundary wouldn't be necessary
+		if (! empty($name))
+		{
+			$body .= '--' . $boundary . '--';
+		}
+	}
+
+	/**
+	 * Prep Quoted Printable
+	 *
+	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
+	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQuotedPrintable($str)
+	{
+		// ASCII code numbers for "safe" characters that can always be
+		// used literally, without encoding, as described in RFC 2049.
+		// http://www.ietf.org/rfc/rfc2049.txt
+		static $asciiSafeChars = [
+			// ' (  )   +   ,   -   .   /   :   =   ?
+			39,
+			40,
+			41,
+			43,
+			44,
+			45,
+			46,
+			47,
+			58,
+			61,
+			63,
+			// numbers
+			48,
+			49,
+			50,
+			51,
+			52,
+			53,
+			54,
+			55,
+			56,
+			57,
+			// upper-case letters
+			65,
+			66,
+			67,
+			68,
+			69,
+			70,
+			71,
+			72,
+			73,
+			74,
+			75,
+			76,
+			77,
+			78,
+			79,
+			80,
+			81,
+			82,
+			83,
+			84,
+			85,
+			86,
+			87,
+			88,
+			89,
+			90,
+			// lower-case letters
+			97,
+			98,
+			99,
+			100,
+			101,
+			102,
+			103,
+			104,
+			105,
+			106,
+			107,
+			108,
+			109,
+			110,
+			111,
+			112,
+			113,
+			114,
+			115,
+			116,
+			117,
+			118,
+			119,
+			120,
+			121,
+			122,
+		];
+
+		// We are intentionally wrapping so mail servers will encode characters
+		// properly and MUAs will behave, so {unwrap} must go!
+		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
+
+		// RFC 2045 specifies CRLF as "\r\n".
+		// However, many developers choose to override that and violate
+		// the RFC rules due to (apparently) a bug in MS Exchange,
+		// which only works with "\n".
+		if ($this->CRLF === "\r\n")
+		{
+			return quoted_printable_encode($str);
+		}
+
+		// Reduce multiple spaces & remove nulls
+		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		$escape = '=';
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			$length = static::strlen($line);
+			$temp   = '';
+
+			// Loop through each character in the line to add soft-wrap
+			// characters at the end of a line " =\r\n" and add the newly
+			// processed line(s) to the output (see comment on $crlf class property)
+			for ($i = 0; $i < $length; $i ++)
+			{
+				// Grab the next character
+				$char  = $line[$i];
+				$ascii = ord($char);
+
+				// Convert spaces and tabs but only if it's the end of the line
+				if ($ascii === 32 || $ascii === 9)
+				{
+					if ($i === ($length - 1))
+					{
+						$char = $escape . sprintf('%02s', dechex($ascii));
+					}
+				}
+				// DO NOT move this below the $ascii_safe_chars line!
+				//
+				// = (equals) signs are allowed by RFC2049, but must be encoded
+				// as they are the encoding delimiter!
+				elseif ($ascii === 61)
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+				}
+				elseif (! in_array($ascii, $asciiSafeChars, true))
+				{
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
+				}
+
+				// If we're at the character limit, add the line to the output,
+				// reset our temp variable, and keep on chuggin'
+				if ((static::strlen($temp) + static::strlen($char)) >= 76)
+				{
+					$output .= $temp . $escape . $this->CRLF;
+					$temp    = '';
+				}
+
+				// Add the character to our temporary line
+				$temp .= $char;
+			}
+
+			// Add our completed line to the output
+			$output .= $temp . $this->CRLF;
+		}
+
+		// get rid of extra CRLF tacked onto the end
+		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
+	}
+
+	/**
+	 * Prep Q Encoding
+	 *
+	 * Performs "Q Encoding" on a string for use in email headers.
+	 * It's related but not identical to quoted-printable, so it has its
+	 * own method.
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	protected function prepQEncoding($str)
+	{
+		$str = str_replace(["\r", "\n"], '', $str);
+
+		if ($this->charset === 'UTF-8')
+		{
+			// Note: We used to have mb_encode_mimeheader() as the first choice
+			//       here, but it turned out to be buggy and unreliable. DO NOT
+			//       re-add it! -- Narf
+			if (extension_loaded('iconv'))
+			{
+				$output = @iconv_mime_encode('', $str, [
+					'scheme'           => 'Q',
+					'line-length'      => 76,
+					'input-charset'    => $this->charset,
+					'output-charset'   => $this->charset,
+					'line-break-chars' => $this->CRLF,
+				]);
+
+				// There are reports that iconv_mime_encode() might fail and return FALSE
+				if ($output !== false)
+				{
+					// iconv_mime_encode() will always put a header field name.
+					// We've passed it an empty one, but it still prepends our
+					// encoded string with ': ', so we need to strip it.
+					return static::substr($output, 2);
+				}
+
+				$chars = iconv_strlen($str, 'UTF-8');
+			}
+			elseif (extension_loaded('mbstring'))
+			{
+				$chars = mb_strlen($str, 'UTF-8');
+			}
+		}
+
+		// We might already have this set for UTF-8
+		if (! isset($chars))
+		{
+			$chars = static::strlen($str);
+		}
+
+		$output = '=?' . $this->charset . '?Q?';
+
+		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++)
+		{
+			$chr = ($this->charset === 'UTF-8' && extension_loaded('iconv')) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+
+			// RFC 2045 sets a limit of 76 characters per line.
+			// We'll append ?= to the end of each line though.
+			if ($length + ($l = static::strlen($chr)) > 74)
+			{
+				$output .= '?=' . $this->CRLF // EOL
+					. ' =?' . $this->charset . '?Q?' . $chr; // New line
+
+				$length = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
+			}
+			else
+			{
+				$output .= $chr;
+				$length += $l;
+			}
+		}
+
+		// End the header
+		return $output . '?=';
+	}
+
+	/**
+	 * Send Email
+	 *
+	 * @param boolean $autoClear
+	 *
+	 * @return boolean
+	 */
+	public function send($autoClear = true)
+	{
+		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
+		{
+			$this->setFrom($this->fromEmail, $this->fromName);
+		}
+
+		if (! isset($this->headers['From']))
+		{
+			$this->setErrorMessage(lang('Email.noFrom'));
+
+			return false;
+		}
+
+		if ($this->replyToFlag === false)
+		{
+			$this->setReplyTo($this->headers['From']);
+		}
+
+		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc']))
+		{
+			$this->setErrorMessage(lang('Email.noRecipients'));
+
+			return false;
+		}
+
+		$this->buildHeaders();
+
+		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
+		{
+			$this->batchBCCSend();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			return true;
+		}
+
+		$this->buildMessage();
+		$result = $this->spoolEmail();
+
+		if ($result)
+		{
+			$this->setArchiveValues();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			Events::trigger('email', $this->archive);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Batch Bcc Send. Sends groups of BCCs in batches
+	 */
+	public function batchBCCSend()
+	{
+		$float = $this->BCCBatchSize - 1;
+		$set   = '';
+		$chunk = [];
+
+		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i++)
+		{
+			if (isset($this->BCCArray[$i]))
+			{
+				$set .= ', ' . $this->BCCArray[$i];
+			}
+
+			if ($i === $float)
+			{
+				$chunk[] = static::substr($set, 1);
+				$float  += $this->BCCBatchSize;
+				$set     = '';
+			}
+
+			if ($i === $c - 1)
+			{
+				$chunk[] = static::substr($set, 1);
+			}
+		}
+
+		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
+		{
+			unset($this->headers['Bcc']);
+			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
+
+			if ($this->protocol !== 'smtp')
+			{
+				$this->setHeader('Bcc', implode(', ', $bcc));
+			}
+			else
+			{
+				$this->BCCArray = $bcc;
+			}
+
+			$this->buildMessage();
+			$this->spoolEmail();
+		}
+
+		// Update the archive
+		$this->setArchiveValues();
+		Events::trigger('email', $this->archive);
+	}
+
+	/**
+	 * Unwrap special elements
+	 */
+	protected function unwrapSpecials()
+	{
+		$this->finalBody = preg_replace_callback(
+			'/\{unwrap\}(.*?)\{\/unwrap\}/si',
+			[
+				$this,
+				'removeNLCallback',
+			],
+			$this->finalBody
+		);
+	}
+
+	/**
+	 * Strip line-breaks via callback
+	 *
+	 * @param string $matches
+	 *
+	 * @return string
+	 */
+	protected function removeNLCallback($matches)
+	{
+		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
+		{
+			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
+		}
+
+		return $matches[1];
+	}
+
+	/**
+	 * Spool mail to the mail server
+	 *
+	 * @return boolean
+	 */
+	protected function spoolEmail()
+	{
+		$this->unwrapSpecials();
+		$protocol = $this->getProtocol();
+		$method   = 'sendWith' . ucfirst($protocol);
+
+		try
+		{
+			$success = $this->$method();
+		}
+		catch (ErrorException $e)
+		{
+			$success = false;
+			log_message('error', 'Email: ' . $method . ' throwed ' . $e->getMessage());
+		}
+
+		if (! $success)
+		{
+			$this->setErrorMessage(lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
+
+			return false;
+		}
+
+		$this->setErrorMessage(lang('Email.sent', [$protocol]));
+
+		return true;
+	}
+
+	/**
+	 * Validate email for shell
+	 *
+	 * Applies stricter, shell-safe validation to email addresses.
+	 * Introduced to prevent RCE via sendmail's -f option.
+	 *
+	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
+	 *
+	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+	 *
+	 * @param string $email
+	 *
+	 * @return boolean
+	 */
+	protected function validateEmailForShell(&$email)
+	{
+		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
+		{
+			$email = static::substr($email, 0, ++$atpos)
+				. idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
+		}
+
+		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+	}
+
+	/**
+	 * Send using mail()
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithMail()
+	{
+		$recipients = is_array($this->recipients) ? implode(', ', $this->recipients) : $this->recipients;
+
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['Return-Path']);
+
+		if (! $this->validateEmailForShell($from))
+		{
+			return mail($recipients, $this->subject, $this->finalBody, $this->headerStr);
+		}
+
+		// most documentation of sendmail using the "-f" flag lacks a space after it, however
+		// we've encountered servers that seem to require it to be in place.
+		return mail($recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
+	}
+
+	/**
+	 * Send using Sendmail
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSendmail()
+	{
+		// _validate_email_for_shell() below accepts by reference,
+		// so this needs to be assigned to a variable
+		$from = $this->cleanEmail($this->headers['From']);
+
+		$from = $this->validateEmailForShell($from) ? '-f ' . $from : '';
+
+		// is popen() enabled?
+		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
+		{
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
+			return false;
+		}
+
+		fputs($fp, $this->headerStr);
+		fputs($fp, $this->finalBody);
+		$status = pclose($fp);
+
+		if ($status !== 0)
+		{
+			$this->setErrorMessage(lang('Email.exitStatus', [$status]));
+			$this->setErrorMessage(lang('Email.noSocket'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Send using SMTP
+	 *
+	 * @return boolean
+	 */
+	protected function sendWithSmtp()
+	{
+		if ($this->SMTPHost === '')
+		{
+			$this->setErrorMessage(lang('Email.noHostname'));
+
+			return false;
+		}
+
+		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
+		{
+			return false;
+		}
+
+		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		foreach ($this->recipients as $val)
+		{
+			if (! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->CCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		foreach ($this->BCCArray as $val)
+		{
+			if ($val !== '' && ! $this->sendCommand('to', $val))
+			{
+				$this->SMTPEnd();
+
+				return false;
+			}
+		}
+
+		if (! $this->sendCommand('data'))
+		{
+			$this->SMTPEnd();
+
+			return false;
+		}
+
+		// perform dot transformation on any lines that begin with a dot
+		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
+		$this->sendData($this->newline . '.');
+		$reply = $this->getSMTPData();
+		$this->setErrorMessage($reply);
+		$this->SMTPEnd();
+
+		if (strpos($reply, '250') !== 0)
+		{
+			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * SMTP End
+	 *
+	 * Shortcut to send RSET or QUIT depending on keep-alive
+	 */
+	protected function SMTPEnd()
+	{
+		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
+	}
+
+	/**
+	 * SMTP Connect
+	 *
+	 * @return string|boolean
+	 */
+	protected function SMTPConnect()
+	{
+		if (is_resource($this->SMTPConnect))
+		{
+			return true;
+		}
+
+		$ssl = '';
+
+		if ($this->SMTPPort === 465)
+		{
+			$ssl = 'tls://';
+		}
+		elseif ($this->SMTPCrypto === 'ssl')
+		{
+			$ssl = 'ssl://';
+		}
+
+		$this->SMTPConnect = fsockopen(
+			$ssl . $this->SMTPHost,
+			$this->SMTPPort,
+			$errno,
+			$errstr,
+			$this->SMTPTimeout
+		);
+
+		if (! is_resource($this->SMTPConnect))
+		{
+			$this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
+
+			return false;
+		}
+
+		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
+		$this->setErrorMessage($this->getSMTPData());
+
+		if ($this->SMTPCrypto === 'tls')
+		{
+			$this->sendCommand('hello');
+			$this->sendCommand('starttls');
+			$crypto = stream_socket_enable_crypto(
+				$this->SMTPConnect,
+				true,
+				STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+			);
+
+			if ($crypto !== true)
+			{
+				$this->setErrorMessage(lang('Email.SMTPError', [$this->getSMTPData()]));
+
+				return false;
+			}
+		}
+
+		return $this->sendCommand('hello');
+	}
+
+	/**
+	 * Send SMTP command
+	 *
+	 * @param string $cmd
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendCommand($cmd, $data = '')
+	{
+		switch ($cmd)
+		{
+			case 'hello':
+				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
+				{
+					$this->sendData('EHLO ' . $this->getHostname());
+				}
+				else
+				{
+					$this->sendData('HELO ' . $this->getHostname());
+				}
+
+				$resp = 250;
+				break;
+
+			case 'starttls':
+				$this->sendData('STARTTLS');
+				$resp = 220;
+				break;
+
+			case 'from':
+				$this->sendData('MAIL FROM:<' . $data . '>');
+				$resp = 250;
+				break;
+
+			case 'to':
+				if ($this->DSN)
+				{
+					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+				}
+				else
+				{
+					$this->sendData('RCPT TO:<' . $data . '>');
+				}
+				$resp = 250;
+				break;
+
+			case 'data':
+				$this->sendData('DATA');
+				$resp = 354;
+				break;
+
+			case 'reset':
+				$this->sendData('RSET');
+				$resp = 250;
+				break;
+
+			case 'quit':
+				$this->sendData('QUIT');
+				$resp = 221;
+				break;
+
+			default:
+				$resp = null;
+		}
+
+		$reply = $this->getSMTPData();
+
+		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+
+		if ($resp === null || ((int) static::substr($reply, 0, 3) !== $resp))
+		{
+			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
+
+			return false;
+		}
+
+		if ($cmd === 'quit')
+		{
+			fclose($this->SMTPConnect);
+		}
+
+		return true;
+	}
+
+	/**
+	 * SMTP Authenticate
+	 *
+	 * @return boolean
+	 */
+	protected function SMTPAuthenticate()
+	{
+		if (! $this->SMTPAuth)
+		{
+			return true;
+		}
+
+		if ($this->SMTPUser === '' && $this->SMTPPass === '')
+		{
+			$this->setErrorMessage(lang('Email.noSMTPAuth'));
+
+			return false;
+		}
+
+		$this->sendData('AUTH LOGIN');
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '503') === 0)    // Already authenticated
+		{
+			return true;
+		}
+
+		if (strpos($reply, '334') !== 0)
+		{
+			$this->setErrorMessage(lang('Email.failedSMTPLogin', [$reply]));
+
+			return false;
+		}
+
+		$this->sendData(base64_encode($this->SMTPUser));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '334') !== 0)
+		{
+			$this->setErrorMessage(lang('Email.SMTPAuthUsername', [$reply]));
+
+			return false;
+		}
+
+		$this->sendData(base64_encode($this->SMTPPass));
+		$reply = $this->getSMTPData();
+
+		if (strpos($reply, '235') !== 0)
+		{
+			$this->setErrorMessage(lang('Email.SMTPAuthPassword', [$reply]));
+
+			return false;
+		}
+
+		if ($this->SMTPKeepAlive)
+		{
+			$this->SMTPAuth = false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Send SMTP data
+	 *
+	 * @param string $data
+	 *
+	 * @return boolean
+	 */
+	protected function sendData($data)
+	{
+		$data .= $this->newline;
+
+		$result = null;
+
+		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
+			{
+				break;
+			}
+
+			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
+			if ($result === 0)
+			{
+				if ($timestamp === 0)
+				{
+					$timestamp = time();
+				}
+				elseif ($timestamp < (time() - $this->SMTPTimeout))
+				{
+					$result = false;
+
+					break;
+				}
+
+				usleep(250000);
+
+				continue;
+			}
+
+			$timestamp = 0;
+		}
+
+		if (! is_int($result))
+		{
+			$this->setErrorMessage(lang('Email.SMTPDataFailure', [$data]));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get SMTP data
+	 *
+	 * @return string
+	 */
+	protected function getSMTPData()
+	{
+		$data = '';
+
+		while ($str = fgets($this->SMTPConnect, 512))
+		{
+			$data .= $str;
+
+			if ($str[3] === ' ')
+			{
+				break;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Get Hostname
+	 *
+	 * There are only two legal types of hostname - either a fully
+	 * qualified domain name (eg: "mail.example.com") or an IP literal
+	 * (eg: "[1.2.3.4]").
+	 *
+	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
+	 * @link http://cbl.abuseat.org/namingproblems.html
+	 *
+	 * @return string
+	 */
+	protected function getHostname()
+	{
+		if (isset($_SERVER['SERVER_NAME']))
+		{
+			return $_SERVER['SERVER_NAME'];
+		}
+
+		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
+	}
+
+	/**
+	 * Get Debug Message
+	 *
+	 * @param array $include List of raw data chunks to include in the output
+	 *                       Valid options are: 'headers', 'subject', 'body'
+	 *
+	 * @return string
+	 */
+	public function printDebugger($include = ['headers', 'subject', 'body'])
+	{
+		$msg = implode('', $this->debugMessage);
+
+		// Determine which parts of our raw data needs to be printed
+		$rawData = '';
+
+		if (! is_array($include))
+		{
+			$include = [$include];
+		}
+
+		if (in_array('headers', $include, true))
+		{
+			$rawData = htmlspecialchars($this->headerStr) . "\n";
+		}
+		if (in_array('subject', $include, true))
+		{
+			$rawData .= htmlspecialchars($this->subject) . "\n";
+		}
+		if (in_array('body', $include, true))
+		{
+			$rawData .= htmlspecialchars($this->finalBody);
+		}
+
+		return $msg . ($rawData === '' ? '' : '<pre>' . $rawData . '</pre>');
+	}
+
+	/**
+	 * Set Message
+	 *
+	 * @param string $msg
+	 */
+	protected function setErrorMessage($msg)
+	{
+		$this->debugMessage[] = $msg . '<br />';
+	}
+
+	/**
+	 * Mime Types
+	 *
+	 * @param string $ext
+	 *
+	 * @return string
+	 */
+	protected function mimeTypes($ext = '')
+	{
+		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
+		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+	}
+
+	/**
+	 * Destructor
+	 */
+	public function __destruct()
+	{
+		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+	}
+
+	/**
+	 * Byte-safe strlen()
+	 *
+	 * @param string $str
+	 *
+	 * @return integer
+	 */
+	protected static function strlen($str)
+	{
+		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
+	}
+
+	/**
+	 * Byte-safe substr()
+	 *
+	 * @param string       $str
+	 * @param integer      $start
+	 * @param integer|null $length
+	 *
+	 * @return string
+	 */
+	protected static function substr($str, $start, $length = null)
+	{
+		if (static::$func_overload)
+		{
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+	}
+
+	/**
+	 * Determines the values that should be stored in $archive.
+	 *
+	 * @return array The updated archive values
+	 */
+	protected function setArchiveValues(): array
+	{
+		// Get property values and add anything prepped in tmpArchive
+		$this->archive = array_merge(get_object_vars($this), $this->tmpArchive);
+		unset($this->archive['archive']);
+
+		// Clear tmpArchive for next run
+		$this->tmpArchive = [];
+
+		return $this->archive;
+	}
+}
diff --git a/system/Encryption/EncrypterInterface.php b/system/Encryption/EncrypterInterface.php
new file mode 100644
index 0000000..6fe653d
--- /dev/null
+++ b/system/Encryption/EncrypterInterface.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption;
+
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
+
+/**
+ * CodeIgniter Encryption Handler
+ *
+ * Provides two-way keyed encryption
+ */
+interface EncrypterInterface
+{
+	/**
+	 * Encrypt - convert plaintext into ciphertext
+	 *
+	 * @param string            $data   Input data
+	 * @param array|string|null $params Overridden parameters, specifically the key
+	 *
+	 * @throws EncryptionException
+	 *
+	 * @return string
+	 */
+	public function encrypt($data, $params = null);
+
+	/**
+	 * Decrypt - convert ciphertext into plaintext
+	 *
+	 * @param string            $data   Encrypted data
+	 * @param array|string|null $params Overridden parameters, specifically the key
+	 *
+	 * @throws EncryptionException
+	 *
+	 * @return string
+	 */
+	public function decrypt($data, $params = null);
+}
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
new file mode 100644
index 0000000..f09bbd0
--- /dev/null
+++ b/system/Encryption/Encryption.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption;
+
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
+use Config\Encryption as EncryptionConfig;
+
+/**
+ * CodeIgniter Encryption Manager
+ *
+ * Provides two-way keyed encryption via PHP's Sodium and/or OpenSSL extensions.
+ * This class determines the driver, cipher, and mode to use, and then
+ * initializes the appropriate encryption handler.
+ */
+class Encryption
+{
+	/**
+	 * The encrypter we create
+	 *
+	 * @var EncrypterInterface
+	 */
+	protected $encrypter;
+
+	/**
+	 * The driver being used
+	 *
+	 * @var string
+	 */
+	protected $driver;
+
+	/**
+	 * The key/seed being used
+	 *
+	 * @var string
+	 */
+	protected $key;
+
+	/**
+	 * The derived HMAC key
+	 *
+	 * @var string
+	 */
+	protected $hmacKey;
+
+	/**
+	 * HMAC digest to use
+	 *
+	 * @var string
+	 */
+	protected $digest = 'SHA512';
+
+	/**
+	 * Map of drivers to handler classes, in preference order
+	 *
+	 * @var array
+	 */
+	protected $drivers = [
+		'OpenSSL',
+		'Sodium',
+	];
+
+	/**
+	 * Handlers that are to be installed
+	 *
+	 * @var array<string, boolean>
+	 */
+	protected $handlers = [];
+
+	/**
+	 * Class constructor
+	 *
+	 * @param EncryptionConfig $config Configuration parameters
+	 *
+	 * @throws EncryptionException
+	 *
+	 * @return void
+	 */
+	public function __construct(EncryptionConfig $config = null)
+	{
+		$config = $config ?? new EncryptionConfig();
+
+		$this->key    = $config->key;
+		$this->driver = $config->driver;
+		$this->digest = $config->digest ?? 'SHA512';
+
+		// Map what we have installed
+		$this->handlers = [
+			'OpenSSL' => extension_loaded('openssl'),
+			// the SodiumHandler uses some API (like sodium_pad) that is available only on v1.0.14+
+			'Sodium'  => extension_loaded('sodium') && version_compare(SODIUM_LIBRARY_VERSION, '1.0.14', '>='),
+		];
+
+		// If requested driver is not active, bail
+		if (! in_array($this->driver, $this->drivers, true) || (array_key_exists($this->driver, $this->handlers) && ! $this->handlers[$this->driver]))
+		{
+			// this should never happen in travis-ci
+			throw EncryptionException::forNoHandlerAvailable($this->driver);
+		}
+	}
+
+	/**
+	 * Initialize or re-initialize an encrypter
+	 *
+	 * @param EncryptionConfig $config Configuration parameters
+	 *
+	 * @throws EncryptionException
+	 *
+	 * @return EncrypterInterface
+	 */
+	public function initialize(EncryptionConfig $config = null)
+	{
+		// override config?
+		if ($config)
+		{
+			$this->key    = $config->key;
+			$this->driver = $config->driver;
+			$this->digest = $config->digest ?? 'SHA512';
+		}
+
+		// Insist on a driver
+		if (empty($this->driver))
+		{
+			throw EncryptionException::forNoDriverRequested();
+		}
+
+		// Check for an unknown driver
+		if (! in_array($this->driver, $this->drivers, true))
+		{
+			throw EncryptionException::forUnKnownHandler($this->driver);
+		}
+
+		if (empty($this->key))
+		{
+			throw EncryptionException::forNeedsStarterKey();
+		}
+
+		// Derive a secret key for the encrypter
+		$this->hmacKey = bin2hex(\hash_hkdf($this->digest, $this->key));
+
+		$handlerName     = 'CodeIgniter\\Encryption\\Handlers\\' . $this->driver . 'Handler';
+		$this->encrypter = new $handlerName($config);
+
+		return $this->encrypter;
+	}
+
+	/**
+	 * Create a random key
+	 *
+	 * @param integer $length Output length
+	 *
+	 * @return string
+	 */
+	public static function createKey($length = 32)
+	{
+		return random_bytes($length);
+	}
+
+	/**
+	 * __get() magic, providing readonly access to some of our protected properties
+	 *
+	 * @param string $key Property name
+	 *
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		if ($this->__isset($key))
+		{
+			return $this->{$key};
+		}
+
+		return null;
+	}
+
+	/**
+	 * __isset() magic, providing checking for some of our protected properties
+	 *
+	 * @param  string $key Property name
+	 * @return boolean
+	 */
+	public function __isset($key): bool
+	{
+		return in_array($key, ['key', 'digest', 'driver', 'drivers'], true);
+	}
+}
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
new file mode 100644
index 0000000..ddf5066
--- /dev/null
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
+
+/**
+ * Encryption exception
+ */
+class EncryptionException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Thrown when no driver is present in the active encryption session.
+	 *
+	 * @return static
+	 */
+	public static function forNoDriverRequested()
+	{
+		return new static(lang('Encryption.noDriverRequested'));
+	}
+
+	/**
+	 * Thrown when the handler requested is not available.
+	 *
+	 * @param string $handler
+	 *
+	 * @return static
+	 */
+	public static function forNoHandlerAvailable(string $handler)
+	{
+		return new static(lang('Encryption.noHandlerAvailable', [$handler]));
+	}
+
+	/**
+	 * Thrown when the handler requested is unknown.
+	 *
+	 * @param string $driver
+	 *
+	 * @return static
+	 */
+	public static function forUnKnownHandler(string $driver = null)
+	{
+		return new static(lang('Encryption.unKnownHandler', [$driver]));
+	}
+
+	/**
+	 * Thrown when no starter key is provided for the current encryption session.
+	 *
+	 * @return static
+	 */
+	public static function forNeedsStarterKey()
+	{
+		return new static(lang('Encryption.starterKeyNeeded'));
+	}
+
+	/**
+	 * Thrown during data decryption when a problem or error occurred.
+	 *
+	 * @return static
+	 */
+	public static function forAuthenticationFailed()
+	{
+		return new static(lang('Encryption.authenticationFailed'));
+	}
+
+	/**
+	 * Thrown during data encryption when a problem or error occurred.
+	 *
+	 * @return static
+	 */
+	public static function forEncryptionFailed()
+	{
+		return new static(lang('Encryption.encryptionFailed'));
+	}
+}
diff --git a/system/Encryption/Handlers/BaseHandler.php b/system/Encryption/Handlers/BaseHandler.php
new file mode 100644
index 0000000..50a1cd6
--- /dev/null
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption\Handlers;
+
+use CodeIgniter\Encryption\EncrypterInterface;
+use Config\Encryption;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Base class for encryption handling
+ */
+abstract class BaseHandler implements EncrypterInterface
+{
+	/**
+	 * Logger instance to record error messages and warnings.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Encryption|null $config
+	 */
+	public function __construct(Encryption $config = null)
+	{
+		$config = $config ?? config('Encryption');
+
+		// make the parameters conveniently accessible
+		foreach (get_object_vars($config) as $key => $value)
+		{
+			if (property_exists($this, $key))
+			{
+				$this->{$key} = $value;
+			}
+		}
+	}
+
+	/**
+	 * Byte-safe substr()
+	 *
+	 * @param string  $str
+	 * @param integer $start
+	 * @param integer $length
+	 *
+	 * @return string
+	 */
+	protected static function substr($str, $start, $length = null)
+	{
+		return mb_substr($str, $start, $length, '8bit');
+	}
+
+	/**
+	 * __get() magic, providing readonly access to some of our properties
+	 *
+	 * @param  string $key Property name
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		if ($this->__isset($key))
+		{
+			return $this->{$key};
+		}
+
+		return null;
+	}
+
+	/**
+	 * __isset() magic, providing checking for some of our properties
+	 *
+	 * @param  string $key Property name
+	 * @return boolean
+	 */
+	public function __isset($key): bool
+	{
+		return property_exists($this, $key);
+	}
+}
diff --git a/system/Encryption/Handlers/OpenSSLHandler.php b/system/Encryption/Handlers/OpenSSLHandler.php
new file mode 100644
index 0000000..3c6c3ef
--- /dev/null
+++ b/system/Encryption/Handlers/OpenSSLHandler.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption\Handlers;
+
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
+
+/**
+ * Encryption handling for OpenSSL library
+ */
+class OpenSSLHandler extends BaseHandler
+{
+	/**
+	 * HMAC digest to use
+	 *
+	 * @var string
+	 */
+	protected $digest = 'SHA512';
+
+	/**
+	 * Cipher to use
+	 *
+	 * @var string
+	 */
+	protected $cipher = 'AES-256-CTR';
+
+	/**
+	 * Starter key
+	 *
+	 * @var string
+	 */
+	protected $key = '';
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function encrypt($data, $params = null)
+	{
+		// Allow key override
+		if ($params)
+		{
+			$this->key = is_array($params) && isset($params['key']) ? $params['key'] : $params;
+		}
+
+		if (empty($this->key))
+		{
+			throw EncryptionException::forNeedsStarterKey();
+		}
+
+		// derive a secret key
+		$secret = \hash_hkdf($this->digest, $this->key);
+
+		// basic encryption
+		$iv = ($ivSize = \openssl_cipher_iv_length($this->cipher)) ? \openssl_random_pseudo_bytes($ivSize) : null;
+
+		$data = \openssl_encrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv);
+
+		if ($data === false)
+		{
+			throw EncryptionException::forEncryptionFailed();
+		}
+
+		$result = $iv . $data;
+
+		$hmacKey = \hash_hmac($this->digest, $result, $secret, true);
+
+		return $hmacKey . $result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function decrypt($data, $params = null)
+	{
+		// Allow key override
+		if ($params)
+		{
+			$this->key = is_array($params) && isset($params['key']) ? $params['key'] : $params;
+		}
+
+		if (empty($this->key))
+		{
+			throw EncryptionException::forNeedsStarterKey();
+		}
+
+		// derive a secret key
+		$secret = \hash_hkdf($this->digest, $this->key);
+
+		$hmacLength = self::substr($this->digest, 3) / 8;
+		$hmacKey    = self::substr($data, 0, $hmacLength);
+		$data       = self::substr($data, $hmacLength);
+		$hmacCalc   = \hash_hmac($this->digest, $data, $secret, true);
+
+		if (! hash_equals($hmacKey, $hmacCalc))
+		{
+			throw EncryptionException::forAuthenticationFailed();
+		}
+
+		if ($ivSize = \openssl_cipher_iv_length($this->cipher))
+		{
+			$iv   = self::substr($data, 0, $ivSize);
+			$data = self::substr($data, $ivSize);
+		}
+		else
+		{
+			$iv = null;
+		}
+
+		return \openssl_decrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv);
+	}
+}
diff --git a/system/Encryption/Handlers/SodiumHandler.php b/system/Encryption/Handlers/SodiumHandler.php
new file mode 100644
index 0000000..49b49f5
--- /dev/null
+++ b/system/Encryption/Handlers/SodiumHandler.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption\Handlers;
+
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
+
+/**
+ * SodiumHandler uses libsodium in encryption.
+ *
+ * @see https://github.com/jedisct1/libsodium/issues/392
+ */
+class SodiumHandler extends BaseHandler
+{
+	/**
+	 * Starter key
+	 *
+	 * @var string
+	 */
+	protected $key = '';
+
+	/**
+	 * Block size for padding message.
+	 *
+	 * @var integer
+	 */
+	protected $blockSize = 16;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function encrypt($data, $params = null)
+	{
+		$this->parseParams($params);
+
+		if (empty($this->key))
+		{
+			throw EncryptionException::forNeedsStarterKey();
+		}
+
+		// create a nonce for this operation
+		$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES); // 24 bytes
+
+		// add padding before we encrypt the data
+		if ($this->blockSize <= 0)
+		{
+			throw EncryptionException::forEncryptionFailed();
+		}
+
+		$data = sodium_pad($data, $this->blockSize);
+
+		// encrypt message and combine with nonce
+		$ciphertext = $nonce . sodium_crypto_secretbox($data, $nonce, $this->key);
+
+		// cleanup buffers
+		sodium_memzero($data);
+		sodium_memzero($this->key);
+
+		return $ciphertext;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function decrypt($data, $params = null)
+	{
+		$this->parseParams($params);
+
+		if (empty($this->key))
+		{
+			throw EncryptionException::forNeedsStarterKey();
+		}
+
+		if (mb_strlen($data, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
+		{
+			// message was truncated
+			throw EncryptionException::forAuthenticationFailed();
+		}
+
+		// Extract info from encrypted data
+		$nonce      = self::substr($data, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+		$ciphertext = self::substr($data, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+
+		// decrypt data
+		$data = sodium_crypto_secretbox_open($ciphertext, $nonce, $this->key);
+
+		if ($data === false)
+		{
+			// message was tampered in transit
+			throw EncryptionException::forAuthenticationFailed(); // @codeCoverageIgnore
+		}
+
+		// remove extra padding during encryption
+		if ($this->blockSize <= 0)
+		{
+			throw EncryptionException::forAuthenticationFailed();
+		}
+
+		$data = sodium_unpad($data, $this->blockSize);
+
+		// cleanup buffers
+		sodium_memzero($ciphertext);
+		sodium_memzero($this->key);
+
+		return $data;
+	}
+
+	/**
+	 * Parse the $params before doing assignment.
+	 *
+	 * @param array|string|null $params
+	 *
+	 * @throws EncryptionException If key is empty
+	 *
+	 * @return void
+	 */
+	protected function parseParams($params)
+	{
+		if ($params === null)
+		{
+			return;
+		}
+
+		if (is_array($params))
+		{
+			if (isset($params['key']))
+			{
+				$this->key = $params['key'];
+			}
+
+			if (isset($params['blockSize']))
+			{
+				$this->blockSize = $params['blockSize'];
+			}
+
+			return;
+		}
+
+		$this->key = (string) $params;
+	}
+}
diff --git a/system/Entity.php b/system/Entity.php
new file mode 100644
index 0000000..e1a2be7
--- /dev/null
+++ b/system/Entity.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use CodeIgniter\Entity\Entity as CoreEntity;
+
+/**
+ * Entity encapsulation, for use with CodeIgniter\Model
+ *
+ * @deprecated use CodeIgniter\Entity\Entity class instead
+ */
+class Entity extends CoreEntity
+{
+}
diff --git a/system/Entity/Cast/ArrayCast.php b/system/Entity/Cast/ArrayCast.php
new file mode 100644
index 0000000..0a5397f
--- /dev/null
+++ b/system/Entity/Cast/ArrayCast.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class ArrayCast
+ */
+class ArrayCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): array
+	{
+		if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0))
+		{
+			$value = unserialize($value);
+		}
+
+		return (array) $value;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public static function set($value, array $params = []): string
+	{
+		return serialize($value);
+	}
+}
diff --git a/system/Entity/Cast/BaseCast.php b/system/Entity/Cast/BaseCast.php
new file mode 100644
index 0000000..bee3145
--- /dev/null
+++ b/system/Entity/Cast/BaseCast.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class BaseCast
+ */
+abstract class BaseCast implements CastInterface
+{
+	/**
+	 * Get
+	 *
+	 * @param mixed $value  Data
+	 * @param array $params Additional param
+	 *
+	 * @return mixed
+	 */
+	public static function get($value, array $params = [])
+	{
+		return $value;
+	}
+
+	/**
+	 * Set
+	 *
+	 * @param mixed $value  Data
+	 * @param array $params Additional param
+	 *
+	 * @return mixed
+	 */
+	public static function set($value, array $params = [])
+	{
+		return $value;
+	}
+}
diff --git a/system/Entity/Cast/BooleanCast.php b/system/Entity/Cast/BooleanCast.php
new file mode 100644
index 0000000..cb35390
--- /dev/null
+++ b/system/Entity/Cast/BooleanCast.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class BooleanCast
+ */
+class BooleanCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): bool
+	{
+		return (bool) $value;
+	}
+}
diff --git a/system/Entity/Cast/CSVCast.php b/system/Entity/Cast/CSVCast.php
new file mode 100644
index 0000000..3fd84b8
--- /dev/null
+++ b/system/Entity/Cast/CSVCast.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class CSVCast
+ */
+class CSVCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): array
+	{
+		return explode(',', $value);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public static function set($value, array $params = []): string
+	{
+		return implode(',', $value);
+	}
+}
diff --git a/system/Entity/Cast/CastInterface.php b/system/Entity/Cast/CastInterface.php
new file mode 100644
index 0000000..66b2d8f
--- /dev/null
+++ b/system/Entity/Cast/CastInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Interface CastInterface
+ */
+interface CastInterface
+{
+	/**
+	 * Get
+	 *
+	 * @param mixed $value  Data
+	 * @param array $params Additional param
+	 *
+	 * @return mixed
+	 */
+	public static function get($value, array $params = []);
+
+	/**
+	 * Set
+	 *
+	 * @param mixed $value  Data
+	 * @param array $params Additional param
+	 *
+	 * @return mixed
+	 */
+	public static function set($value, array $params = []);
+}
diff --git a/system/Entity/Cast/DatetimeCast.php b/system/Entity/Cast/DatetimeCast.php
new file mode 100644
index 0000000..18fa0a5
--- /dev/null
+++ b/system/Entity/Cast/DatetimeCast.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+use CodeIgniter\I18n\Time;
+use DateTime;
+use Exception;
+
+/**
+ * Class DatetimeCast
+ */
+class DatetimeCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 *
+	 * @throws Exception
+	 */
+	public static function get($value, array $params = [])
+	{
+		if ($value instanceof Time)
+		{
+			return $value;
+		}
+
+		if ($value instanceof DateTime)
+		{
+			return Time::instance($value);
+		}
+
+		if (is_numeric($value))
+		{
+			return Time::createFromTimestamp($value);
+		}
+
+		if (is_string($value))
+		{
+			return Time::parse($value);
+		}
+
+		return $value;
+	}
+}
diff --git a/system/Entity/Cast/FloatCast.php b/system/Entity/Cast/FloatCast.php
new file mode 100644
index 0000000..2fc2a8e
--- /dev/null
+++ b/system/Entity/Cast/FloatCast.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class FloatCast
+ */
+class FloatCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): float
+	{
+		return (float) $value;
+	}
+}
diff --git a/system/Entity/Cast/IntegerCast.php b/system/Entity/Cast/IntegerCast.php
new file mode 100644
index 0000000..366d021
--- /dev/null
+++ b/system/Entity/Cast/IntegerCast.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class IntegerCast
+ */
+class IntegerCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): int
+	{
+		return (int) $value;
+	}
+}
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
new file mode 100644
index 0000000..9c0c2fc
--- /dev/null
+++ b/system/Entity/Cast/JsonCast.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+use CodeIgniter\Entity\Exceptions\CastException;
+use JsonException;
+use stdClass;
+
+/**
+ * Class JsonCast
+ */
+class JsonCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = [])
+	{
+		$associative = in_array('array', $params, true);
+		$tmp         = ! is_null($value) ? ($associative ? [] : new stdClass) : null;
+
+		if (function_exists('json_decode')
+			&& ((is_string($value)
+					&& strlen($value) > 1
+					&& in_array($value[0], ['[', '{', '"'], true))
+				|| is_numeric($value)
+			)
+		)
+		{
+			try
+			{
+				$tmp = json_decode($value, $associative, 512, JSON_THROW_ON_ERROR);
+			}
+			catch (JsonException $e)
+			{
+				throw CastException::forInvalidJsonFormat($e->getCode());
+			}
+		}
+
+		return $tmp;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public static function set($value, array $params = []): string
+	{
+		if (function_exists('json_encode'))
+		{
+			try
+			{
+				$value = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR);
+			}
+			catch (JsonException $e)
+			{
+				throw CastException::forInvalidJsonFormat($e->getCode());
+			}
+		}
+
+		return $value;
+	}
+}
diff --git a/system/Entity/Cast/ObjectCast.php b/system/Entity/Cast/ObjectCast.php
new file mode 100644
index 0000000..0988abc
--- /dev/null
+++ b/system/Entity/Cast/ObjectCast.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class ObjectCast
+ */
+class ObjectCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): object
+	{
+		return (object) $value;
+	}
+}
diff --git a/system/Entity/Cast/StringCast.php b/system/Entity/Cast/StringCast.php
new file mode 100644
index 0000000..17c2442
--- /dev/null
+++ b/system/Entity/Cast/StringCast.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+/**
+ * Class StringCast
+ */
+class StringCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): string
+	{
+		return (string) $value;
+	}
+}
diff --git a/system/Entity/Cast/TimestampCast.php b/system/Entity/Cast/TimestampCast.php
new file mode 100644
index 0000000..d87a15f
--- /dev/null
+++ b/system/Entity/Cast/TimestampCast.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+use CodeIgniter\Entity\Exceptions\CastException;
+
+/**
+ * Class TimestampCast
+ */
+class TimestampCast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = [])
+	{
+		$value = strtotime($value);
+
+		if ($value === false)
+		{
+			throw CastException::forInvalidTimestamp();
+		}
+
+		return $value;
+	}
+}
diff --git a/system/Entity/Cast/URICast.php b/system/Entity/Cast/URICast.php
new file mode 100644
index 0000000..3379988
--- /dev/null
+++ b/system/Entity/Cast/URICast.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Cast;
+
+use CodeIgniter\HTTP\URI;
+
+/**
+ * Class URICast
+ */
+class URICast extends BaseCast
+{
+	/**
+	 * @inheritDoc
+	 */
+	public static function get($value, array $params = []): URI
+	{
+		return $value instanceof URI ? $value : new URI($value);
+	}
+}
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
new file mode 100644
index 0000000..9ae6d5e
--- /dev/null
+++ b/system/Entity/Entity.php
@@ -0,0 +1,614 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity;
+
+use CodeIgniter\Entity\Cast\ArrayCast;
+use CodeIgniter\Entity\Cast\BooleanCast;
+use CodeIgniter\Entity\Cast\CastInterface;
+use CodeIgniter\Entity\Cast\CSVCast;
+use CodeIgniter\Entity\Cast\DatetimeCast;
+use CodeIgniter\Entity\Cast\FloatCast;
+use CodeIgniter\Entity\Cast\IntegerCast;
+use CodeIgniter\Entity\Cast\JsonCast;
+use CodeIgniter\Entity\Cast\ObjectCast;
+use CodeIgniter\Entity\Cast\StringCast;
+use CodeIgniter\Entity\Cast\TimestampCast;
+use CodeIgniter\Entity\Cast\URICast;
+use CodeIgniter\Entity\Exceptions\CastException;
+use CodeIgniter\I18n\Time;
+use Exception;
+use JsonSerializable;
+
+/**
+ * Entity encapsulation, for use with CodeIgniter\Model
+ */
+class Entity implements JsonSerializable
+{
+	/**
+	 * Maps names used in sets and gets against unique
+	 * names within the class, allowing independence from
+	 * database column names.
+	 *
+	 * Example:
+	 *  $datamap = [
+	 *      'db_name' => 'class_name'
+	 *  ];
+	 */
+	protected $datamap = [];
+
+	protected $dates = [
+		'created_at',
+		'updated_at',
+		'deleted_at',
+	];
+
+	/**
+	 * Array of field names and the type of value to cast them as when
+	 * they are accessed.
+	 */
+	protected $casts = [];
+
+	/**
+	 * Custom convert handlers
+	 *
+	 * @var array<string, string>
+	 */
+	protected $castHandlers = [];
+
+	/**
+	 * Default convert handlers
+	 *
+	 * @var array<string, string>
+	 */
+	private $defaultCastHandlers = [
+		'array'     => ArrayCast::class,
+		'bool'      => BooleanCast::class,
+		'boolean'   => BooleanCast::class,
+		'csv'       => CSVCast::class,
+		'datetime'  => DatetimeCast::class,
+		'double'    => FloatCast::class,
+		'float'     => FloatCast::class,
+		'int'       => IntegerCast::class,
+		'integer'   => IntegerCast::class,
+		'json'      => JsonCast::class,
+		'object'    => ObjectCast::class,
+		'string'    => StringCast::class,
+		'timestamp' => TimestampCast::class,
+		'uri'       => URICast::class,
+	];
+
+	/**
+	 * Holds the current values of all class vars.
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * Holds original copies of all class vars so we can determine
+	 * what's actually been changed and not accidentally write
+	 * nulls where we shouldn't.
+	 *
+	 * @var array
+	 */
+	protected $original = [];
+
+	/**
+	 * Holds info whenever properties have to be casted
+	 *
+	 * @var boolean
+	 **/
+	private $_cast = true;
+
+	/**
+	 * Allows filling in Entity parameters during construction.
+	 *
+	 * @param array|null $data
+	 */
+	public function __construct(array $data = null)
+	{
+		$this->syncOriginal();
+
+		$this->fill($data);
+	}
+
+	/**
+	 * Takes an array of key/value pairs and sets them as class
+	 * properties, using any `setCamelCasedProperty()` methods
+	 * that may or may not exist.
+	 *
+	 * @param array $data
+	 *
+	 * @return $this
+	 */
+	public function fill(array $data = null)
+	{
+		if (! is_array($data))
+		{
+			return $this;
+		}
+
+		foreach ($data as $key => $value)
+		{
+			$this->__set($key, $value);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * General method that will return all public and protected values
+	 * of this entity as an array. All values are accessed through the
+	 * __get() magic method so will have any casts, etc applied to them.
+	 *
+	 * @param boolean $onlyChanged If true, only return values that have changed since object creation
+	 * @param boolean $cast        If true, properties will be casted.
+	 * @param boolean $recursive   If true, inner entities will be casted as array as well.
+	 *
+	 * @return array
+	 */
+	public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
+	{
+		$this->_cast = $cast;
+
+		$keys = array_filter(array_keys($this->attributes), function ($key) {
+			return strpos($key, '_') !== 0;
+		});
+
+		if (is_array($this->datamap))
+		{
+			$keys = array_unique(
+				array_merge(array_diff($keys, $this->datamap), array_keys($this->datamap))
+			);
+		}
+
+		$return = [];
+
+		// Loop over the properties, to allow magic methods to do their thing.
+		foreach ($keys as $key)
+		{
+			if ($onlyChanged && ! $this->hasChanged($key))
+			{
+				continue;
+			}
+
+			$return[$key] = $this->__get($key);
+
+			if ($recursive)
+			{
+				if ($return[$key] instanceof Entity)
+				{
+					$return[$key] = $return[$key]->toArray($onlyChanged, $cast, $recursive);
+				}
+				elseif (is_callable([$return[$key], 'toArray']))
+				{
+					$return[$key] = $return[$key]->toArray();
+				}
+			}
+		}
+
+		$this->_cast = true;
+
+		return $return;
+	}
+
+	/**
+	 * Returns the raw values of the current attributes.
+	 *
+	 * @param boolean $onlyChanged If true, only return values that have changed since object creation
+	 * @param boolean $recursive   If true, inner entities will be casted as array as well.
+	 *
+	 * @return array
+	 */
+	public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
+	{
+		$return = [];
+
+		if (! $onlyChanged)
+		{
+			if ($recursive)
+			{
+				return array_map(function ($value) use ($onlyChanged, $recursive) {
+					if ($value instanceof Entity)
+					{
+						$value = $value->toRawArray($onlyChanged, $recursive);
+					}
+					elseif (is_callable([$value, 'toRawArray']))
+					{
+						$value = $value->toRawArray();
+					}
+
+					return $value;
+				}, $this->attributes);
+			}
+
+			return $this->attributes;
+		}
+
+		foreach ($this->attributes as $key => $value)
+		{
+			if (! $this->hasChanged($key))
+			{
+				continue;
+			}
+
+			if ($recursive)
+			{
+				if ($value instanceof Entity)
+				{
+					$value = $value->toRawArray($onlyChanged, $recursive);
+				}
+				elseif (is_callable([$value, 'toRawArray']))
+				{
+					$value = $value->toRawArray();
+				}
+			}
+
+			$return[$key] = $value;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Ensures our "original" values match the current values.
+	 *
+	 * @return $this
+	 */
+	public function syncOriginal()
+	{
+		$this->original = $this->attributes;
+
+		return $this;
+	}
+
+	/**
+	 * Checks a property to see if it has changed since the entity
+	 * was created. Or, without a parameter, checks if any
+	 * properties have changed.
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function hasChanged(string $key = null): bool
+	{
+		// If no parameter was given then check all attributes
+		if (is_null($key))
+		{
+			return $this->original !== $this->attributes;
+		}
+
+		// Key doesn't exist in either
+		if (! array_key_exists($key, $this->original) && ! array_key_exists($key, $this->attributes))
+		{
+			return false;
+		}
+
+		// It's a new element
+		if (! array_key_exists($key, $this->original) && array_key_exists($key, $this->attributes))
+		{
+			return true;
+		}
+
+		return $this->original[$key] !== $this->attributes[$key];
+	}
+
+	/**
+	 * Set raw data array without any mutations
+	 *
+	 * @param array $data
+	 *
+	 * @return $this
+	 */
+	public function setAttributes(array $data)
+	{
+		$this->attributes = $data;
+
+		$this->syncOriginal();
+
+		return $this;
+	}
+
+	/**
+	 * Checks the datamap to see if this column name is being mapped,
+	 * and returns the mapped name, if any, or the original name.
+	 *
+	 * @param string $key
+	 *
+	 * @return mixed|string
+	 */
+	protected function mapProperty(string $key)
+	{
+		if (empty($this->datamap))
+		{
+			return $key;
+		}
+
+		if (! empty($this->datamap[$key]))
+		{
+			return $this->datamap[$key];
+		}
+
+		return $key;
+	}
+
+	/**
+	 * Converts the given string|timestamp|DateTime|Time instance
+	 * into the "CodeIgniter\I18n\Time" object.
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws Exception
+	 *
+	 * @return Time|mixed
+	 */
+	protected function mutateDate($value)
+	{
+		return DatetimeCast::get($value);
+	}
+
+	/**
+	 * Provides the ability to cast an item as a specific data type.
+	 * Add ? at the beginning of $type  (i.e. ?string) to get NULL
+	 * instead of casting $value if $value === null
+	 *
+	 * @param mixed  $value     Attribute value
+	 * @param string $attribute Attribute name
+	 * @param string $method    Allowed to "get" and "set"
+	 *
+	 * @throws CastException
+	 *
+	 * @return mixed
+	 */
+	protected function castAs($value, string $attribute, string $method = 'get')
+	{
+		if (empty($this->casts[$attribute]))
+		{
+			return $value;
+		}
+
+		$type = $this->casts[$attribute];
+
+		$isNullable = false;
+
+		if (strpos($type, '?') === 0)
+		{
+			$isNullable = true;
+
+			if (is_null($value))
+			{
+				return null;
+			}
+
+			$type = substr($type, 1);
+		}
+
+		//In order not to create a separate handler for the
+		// json-array type, we transform the required one.
+		$type = $type === 'json-array' ? 'json[array]' : $type;
+
+		if (! in_array($method, ['get', 'set'], true))
+		{
+			throw CastException::forInvalidMethod($method);
+		}
+
+		$params = [];
+
+		//Attempt to retrieve additional parameters if specified
+		// type[param, param2,param3]
+		if (preg_match('/^(.+)\[(.+)\]$/', $type, $matches))
+		{
+			$type   = $matches[1];
+			$params = array_map('trim', explode(',', $matches[2]));
+		}
+
+		if ($isNullable)
+		{
+			$params[] = 'nullable';
+		}
+
+		$type = trim($type, '[]');
+
+		$handlers = array_merge($this->defaultCastHandlers, $this->castHandlers);
+
+		if (empty($handlers[$type]))
+		{
+			return $value;
+		}
+
+		if (! is_subclass_of($handlers[$type], CastInterface::class))
+		{
+			throw CastException::forInvalidInterface($handlers[$type]);
+		}
+
+		return $handlers[$type]::$method($value, $params);
+	}
+
+	/**
+	 * Cast as JSON
+	 *
+	 * @param mixed   $value
+	 * @param boolean $asArray
+	 *
+	 * @throws CastException
+	 *
+	 * @return mixed
+	 */
+	private function castAsJson($value, bool $asArray = false)
+	{
+		return JsonCast::get($value, $asArray ? ['array'] : []);
+	}
+
+	/**
+	 * Support for json_encode()
+	 *
+	 * @return array|mixed
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
+
+	/**
+	 * Change the value of the private $_cast property
+	 *
+	 * @param boolean|null $cast
+	 *
+	 * @return boolean|Entity
+	 */
+	public function cast(bool $cast = null)
+	{
+		if (is_null($cast))
+		{
+			return $this->_cast;
+		}
+
+		$this->_cast = $cast;
+
+		return $this;
+	}
+
+	/**
+	 * Magic method to all protected/private class properties to be
+	 * easily set, either through a direct access or a
+	 * `setCamelCasedProperty()` method.
+	 *
+	 * Examples:
+	 *  $this->my_property = $p;
+	 *  $this->setMyProperty() = $p;
+	 *
+	 * @param string     $key
+	 * @param mixed|null $value
+	 *
+	 * @throws Exception
+	 *
+	 * @return $this
+	 */
+	public function __set(string $key, $value = null)
+	{
+		$key = $this->mapProperty($key);
+
+		// Check if the field should be mutated into a date
+		if (in_array($key, $this->dates, true))
+		{
+			$value = $this->mutateDate($value);
+		}
+
+		$value = $this->castAs($value, $key, 'set');
+
+		// if a set* method exists for this key, use that method to
+		// insert this value. should be outside $isNullable check,
+		// so maybe wants to do sth with null value automatically
+		$method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+		if (method_exists($this, $method))
+		{
+			$this->$method($value);
+
+			return $this;
+		}
+
+		// Otherwise, just the value. This allows for creation of new
+		// class properties that are undefined, though they cannot be
+		// saved. Useful for grabbing values through joins, assigning
+		// relationships, etc.
+		$this->attributes[$key] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Magic method to allow retrieval of protected and private class properties
+	 * either by their name, or through a `getCamelCasedProperty()` method.
+	 *
+	 * Examples:
+	 *  $p = $this->my_property
+	 *  $p = $this->getMyProperty()
+	 *
+	 * @param string $key
+	 *
+	 * @throws Exception
+	 *
+	 * @return mixed
+	 */
+	public function __get(string $key)
+	{
+		$key = $this->mapProperty($key);
+
+		$result = null;
+
+		// Convert to CamelCase for the method
+		$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+		// if a set* method exists for this key,
+		// use that method to insert this value.
+		if (method_exists($this, $method))
+		{
+			$result = $this->$method();
+		}
+
+		// Otherwise return the protected property
+		// if it exists.
+		elseif (array_key_exists($key, $this->attributes))
+		{
+			$result = $this->attributes[$key];
+		}
+
+		// Do we need to mutate this into a date?
+		if (in_array($key, $this->dates, true))
+		{
+			$result = $this->mutateDate($result);
+		}
+		// Or cast it as something?
+		elseif ($this->_cast)
+		{
+			$result = $this->castAs($result, $key);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns true if a property exists names $key, or a getter method
+	 * exists named like for __get().
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function __isset(string $key): bool
+	{
+		$key = $this->mapProperty($key);
+
+		$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+		if (method_exists($this, $method))
+		{
+			return true;
+		}
+
+		return isset($this->attributes[$key]);
+	}
+
+	/**
+	 * Unsets an attribute property.
+	 *
+	 * @param string $key
+	 *
+	 * @return void
+	 */
+	public function __unset(string $key): void
+	{
+		unset($this->attributes[$key]);
+	}
+}
diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php
new file mode 100644
index 0000000..420d6ba
--- /dev/null
+++ b/system/Entity/Exceptions/CastException.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+/**
+ * CastException is thrown for invalid cast initialization and management.
+ */
+class CastException extends FrameworkException
+{
+	/**
+	 * Thrown when the cast class does not extends BaseCast.
+	 *
+	 * @param string $class
+	 *
+	 * @return static
+	 */
+	public static function forInvalidInterface(string $class)
+	{
+		return new static(lang('Cast.baseCastMissing', [$class]));
+	}
+
+	/**
+	 * Thrown when the Json format is invalid.
+	 *
+	 * @param integer $error
+	 *
+	 * @return static
+	 */
+	public static function forInvalidJsonFormat(int $error)
+	{
+		switch ($error)
+		{
+			case JSON_ERROR_DEPTH:
+				return new static(lang('Cast.jsonErrorDepth'));
+			case JSON_ERROR_STATE_MISMATCH:
+				return new static(lang('Cast.jsonErrorStateMismatch'));
+			case JSON_ERROR_CTRL_CHAR:
+				return new static(lang('Cast.jsonErrorCtrlChar'));
+			case JSON_ERROR_SYNTAX:
+				return new static(lang('Cast.jsonErrorSyntax'));
+			case JSON_ERROR_UTF8:
+				return new static(lang('Cast.jsonErrorUtf8'));
+			default:
+				return new static(lang('Cast.jsonErrorUnknown'));
+		}
+	}
+
+	/**
+	 * Thrown when the cast method is not `get` or `set`.
+	 *
+	 * @param string $method
+	 *
+	 * @return static
+	 */
+	public static function forInvalidMethod(string $method)
+	{
+		return new static(lang('Cast.invalidCastMethod', [$method]));
+	}
+
+	/**
+	 * Thrown when the casting timestamp is not correct timestamp.
+	 *
+	 * @return static
+	 */
+	public static function forInvalidTimestamp()
+	{
+		return new static(lang('Cast.invalidTimestamp'));
+	}
+}
diff --git a/system/Events/Events.php b/system/Events/Events.php
new file mode 100644
index 0000000..59489b6
--- /dev/null
+++ b/system/Events/Events.php
@@ -0,0 +1,313 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Events;
+
+use Config\Modules;
+use Config\Services;
+
+define('EVENT_PRIORITY_LOW', 200);
+define('EVENT_PRIORITY_NORMAL', 100);
+define('EVENT_PRIORITY_HIGH', 10);
+
+/**
+ * Events
+ */
+class Events
+{
+	/**
+	 * The list of listeners.
+	 *
+	 * @var array
+	 */
+	protected static $listeners = [];
+
+	/**
+	 * Flag to let us know if we've read from the Config file(s)
+	 * and have all of the defined events.
+	 *
+	 * @var boolean
+	 */
+	protected static $initialized = false;
+
+	/**
+	 * If true, events will not actually be fired.
+	 * Useful during testing.
+	 *
+	 * @var boolean
+	 */
+	protected static $simulate = false;
+
+	/**
+	 * Stores information about the events
+	 * for display in the debug toolbar.
+	 *
+	 * @var array<array<string, float|string>>
+	 */
+	protected static $performanceLog = [];
+
+	/**
+	 * A list of found files.
+	 *
+	 * @var string[]
+	 */
+	protected static $files = [];
+
+	/**
+	 * Ensures that we have a events file ready.
+	 *
+	 * @return void
+	 */
+	public static function initialize()
+	{
+		// Don't overwrite anything....
+		if (static::$initialized)
+		{
+			return;
+		}
+
+		/**
+		 * @var Modules
+		 */
+		$config = config('Modules');
+		$events = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php';
+		$files  = [];
+
+		if ($config->shouldDiscover('events'))
+		{
+			$files = Services::locator()->search('Config/Events.php');
+		}
+
+		$files = array_filter(array_map(static function (string $file) {
+			if (is_file($file))
+			{
+				return realpath($file) ?: $file;
+			}
+
+			return false; // @codeCoverageIgnore
+		}, $files));
+
+		static::$files = array_unique(array_merge($files, [$events]));
+
+		foreach (static::$files as $file)
+		{
+			include $file;
+		}
+
+		static::$initialized = true;
+	}
+
+	/**
+	 * Registers an action to happen on an event. The action can be any sort
+	 * of callable:
+	 *
+	 *  Events::on('create', 'myFunction');               // procedural function
+	 *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
+	 *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
+	 *  Events::on('create', function() {});              // Closure
+	 *
+	 * @param string   $eventName
+	 * @param callable $callback
+	 * @param integer  $priority
+	 *
+	 * @return void
+	 */
+	public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORMAL)
+	{
+		if (! isset(static::$listeners[$eventName]))
+		{
+			static::$listeners[$eventName] = [
+				true, // If there's only 1 item, it's sorted.
+				[$priority],
+				[$callback],
+			];
+		}
+		else
+		{
+			static::$listeners[$eventName][0]   = false; // Not sorted
+			static::$listeners[$eventName][1][] = $priority;
+			static::$listeners[$eventName][2][] = $callback;
+		}
+	}
+
+	/**
+	 * Runs through all subscribed methods running them one at a time,
+	 * until either:
+	 *  a) All subscribers have finished or
+	 *  b) a method returns false, at which point execution of subscribers stops.
+	 *
+	 * @param string $eventName
+	 * @param mixed  $arguments
+	 *
+	 * @return boolean
+	 */
+	public static function trigger($eventName, ...$arguments): bool
+	{
+		// Read in our Config/Events file so that we have them all!
+		if (! static::$initialized)
+		{
+			static::initialize();
+		}
+
+		$listeners = static::listeners($eventName);
+
+		foreach ($listeners as $listener)
+		{
+			$start = microtime(true);
+
+			$result = static::$simulate === false ? call_user_func($listener, ...$arguments) : true;
+
+			if (CI_DEBUG)
+			{
+				static::$performanceLog[] = [
+					'start' => $start,
+					'end'   => microtime(true),
+					'event' => strtolower($eventName),
+				];
+			}
+
+			if ($result === false)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns an array of listeners for a single event. They are
+	 * sorted by priority.
+	 *
+	 * @param string $eventName
+	 *
+	 * @return array
+	 */
+	public static function listeners($eventName): array
+	{
+		if (! isset(static::$listeners[$eventName]))
+		{
+			return [];
+		}
+
+		// The list is not sorted
+		if (! static::$listeners[$eventName][0])
+		{
+			// Sort it!
+			array_multisort(static::$listeners[$eventName][1], SORT_NUMERIC, static::$listeners[$eventName][2]);
+
+			// Mark it as sorted already!
+			static::$listeners[$eventName][0] = true;
+		}
+
+		return static::$listeners[$eventName][2];
+	}
+
+	/**
+	 * Removes a single listener from an event.
+	 *
+	 * If the listener couldn't be found, returns FALSE, else TRUE if
+	 * it was removed.
+	 *
+	 * @param string   $eventName
+	 * @param callable $listener
+	 *
+	 * @return boolean
+	 */
+	public static function removeListener($eventName, callable $listener): bool
+	{
+		if (! isset(static::$listeners[$eventName]))
+		{
+			return false;
+		}
+
+		foreach (static::$listeners[$eventName][2] as $index => $check)
+		{
+			if ($check === $listener)
+			{
+				unset(static::$listeners[$eventName][1][$index]);
+				unset(static::$listeners[$eventName][2][$index]);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Removes all listeners.
+	 *
+	 * If the event_name is specified, only listeners for that event will be
+	 * removed, otherwise all listeners for all events are removed.
+	 *
+	 * @param string|null $eventName
+	 *
+	 * @return void
+	 */
+	public static function removeAllListeners($eventName = null)
+	{
+		if (! is_null($eventName))
+		{
+			unset(static::$listeners[$eventName]);
+		}
+		else
+		{
+			static::$listeners = [];
+		}
+	}
+
+	/**
+	 * Sets the path to the file that routes are read from.
+	 *
+	 * @param array $files
+	 *
+	 * @return void
+	 */
+	public static function setFiles(array $files)
+	{
+		static::$files = $files;
+	}
+
+	/**
+	 * Returns the files that were found/loaded during this request.
+	 *
+	 * @return string[]
+	 */
+	public function getFiles()
+	{
+		return static::$files;
+	}
+
+	/**
+	 * Turns simulation on or off. When on, events will not be triggered,
+	 * simply logged. Useful during testing when you don't actually want
+	 * the tests to run.
+	 *
+	 * @param boolean $choice
+	 *
+	 * @return void
+	 */
+	public static function simulate(bool $choice = true)
+	{
+		static::$simulate = $choice;
+	}
+
+	/**
+	 * Getter for the performance log records.
+	 *
+	 * @return array<array<string, float|string>>
+	 */
+	public static function getPerformanceLogs()
+	{
+		return static::$performanceLog;
+	}
+}
diff --git a/system/Exceptions/AlertError.php b/system/Exceptions/AlertError.php
new file mode 100644
index 0000000..7e2e8df
--- /dev/null
+++ b/system/Exceptions/AlertError.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use Error;
+
+/**
+ * Error: Action must be taken immediately (system/db down, etc)
+ */
+class AlertError extends Error
+{
+}
diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php
new file mode 100644
index 0000000..6e4527d
--- /dev/null
+++ b/system/Exceptions/CastException.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+/**
+ * Cast Exceptions.
+ *
+ * @deprecated use CodeIgniter\Entity\Exceptions\CastException instead.
+ *
+ * @codeCoverageIgnore
+ */
+class CastException extends CriticalError
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Error code
+	 *
+	 * @var integer
+	 */
+	protected $code = 3;
+
+	public static function forInvalidJsonFormatException(int $error)
+	{
+		switch ($error)
+		{
+			case JSON_ERROR_DEPTH:
+				return new static(lang('Cast.jsonErrorDepth'));
+			case JSON_ERROR_STATE_MISMATCH:
+				return new static(lang('Cast.jsonErrorStateMismatch'));
+			case JSON_ERROR_CTRL_CHAR:
+				return new static(lang('Cast.jsonErrorCtrlChar'));
+			case JSON_ERROR_SYNTAX:
+				return new static(lang('Cast.jsonErrorSyntax'));
+			case JSON_ERROR_UTF8:
+				return new static(lang('Cast.jsonErrorUtf8'));
+			default:
+				return new static(lang('Cast.jsonErrorUnknown'));
+		}
+	}
+}
diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php
new file mode 100644
index 0000000..3958111
--- /dev/null
+++ b/system/Exceptions/ConfigException.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+/**
+ * Exception for automatic logging.
+ */
+class ConfigException extends CriticalError
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Error code
+	 *
+	 * @var integer
+	 */
+	protected $code = 3;
+
+	public static function forDisabledMigrations()
+	{
+		return new static(lang('Migrations.disabled'));
+	}
+}
diff --git a/system/Exceptions/CriticalError.php b/system/Exceptions/CriticalError.php
new file mode 100644
index 0000000..c835572
--- /dev/null
+++ b/system/Exceptions/CriticalError.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use Error;
+
+/**
+ * Error: Critical conditions, like component unavailable, etc.
+ */
+class CriticalError extends Error
+{
+}
diff --git a/system/Exceptions/DebugTraceableTrait.php b/system/Exceptions/DebugTraceableTrait.php
new file mode 100644
index 0000000..660cdcf
--- /dev/null
+++ b/system/Exceptions/DebugTraceableTrait.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace CodeIgniter\Exceptions;
+
+use Throwable;
+
+/**
+ * This trait provides framework exceptions the ability to pinpoint
+ * accurately where the exception was raised rather than instantiated.
+ *
+ * This is used primarily for factory-instantiated exceptions.
+ */
+trait DebugTraceableTrait
+{
+	/**
+	 * Tweaks the exception's constructor to assign the file/line to where
+	 * it is actually raised rather than were it is instantiated.
+	 *
+	 * @param string         $message
+	 * @param integer        $code
+	 * @param Throwable|null $previous
+	 */
+	final public function __construct(string $message = '', int $code = 0, Throwable $previous = null)
+	{
+		parent::__construct($message, $code, $previous);
+
+		$trace = $this->getTrace()[0];
+
+		if (isset($trace['class']) && $trace['class'] === static::class)
+		{
+			[
+				'line' => $this->line,
+				'file' => $this->file,
+			] = $trace;
+		}
+	}
+}
diff --git a/system/Exceptions/DownloadException.php b/system/Exceptions/DownloadException.php
new file mode 100644
index 0000000..ee1ee25
--- /dev/null
+++ b/system/Exceptions/DownloadException.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use RuntimeException;
+
+/**
+ * Class DownloadException
+ */
+class DownloadException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	public static function forCannotSetFilePath(string $path)
+	{
+		return new static(lang('HTTP.cannotSetFilepath', [$path]));
+	}
+
+	public static function forCannotSetBinary()
+	{
+		return new static(lang('HTTP.cannotSetBinary'));
+	}
+
+	public static function forNotFoundDownloadSource()
+	{
+		return new static(lang('HTTP.notFoundDownloadSource'));
+	}
+
+	public static function forCannotSetCache()
+	{
+		return new static(lang('HTTP.cannotSetCache'));
+	}
+
+	public static function forCannotSetStatusCode(int $code, string $reason)
+	{
+		return new static(lang('HTTP.cannotSetStatusCode', [$code, $reason]));
+	}
+}
diff --git a/system/Exceptions/EmergencyError.php b/system/Exceptions/EmergencyError.php
new file mode 100644
index 0000000..0ec9c5b
--- /dev/null
+++ b/system/Exceptions/EmergencyError.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use Error;
+
+/**
+ * Error: system is unusable
+ */
+class EmergencyError extends Error
+{
+}
diff --git a/system/Exceptions/ExceptionInterface.php b/system/Exceptions/ExceptionInterface.php
new file mode 100644
index 0000000..75cf786
--- /dev/null
+++ b/system/Exceptions/ExceptionInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+/**
+ * Provides a domain-level interface for broad capture
+ * of all framework-related exceptions.
+ *
+ * catch (\CodeIgniter\Exceptions\ExceptionInterface) { ... }
+ */
+
+interface ExceptionInterface
+{
+}
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
new file mode 100644
index 0000000..55b29a6
--- /dev/null
+++ b/system/Exceptions/FrameworkException.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use RuntimeException;
+
+/**
+ * Class FrameworkException
+ *
+ * A collection of exceptions thrown by the framework
+ * that can only be determined at run time.
+ */
+class FrameworkException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	public static function forEnabledZlibOutputCompression()
+	{
+		return new static(lang('Core.enabledZlibOutputCompression'));
+	}
+
+	public static function forInvalidFile(string $path)
+	{
+		return new static(lang('Core.invalidFile', [$path]));
+	}
+
+	public static function forCopyError(string $path)
+	{
+		return new static(lang('Core.copyError', [$path]));
+	}
+
+	public static function forMissingExtension(string $extension)
+	{
+		if (strpos($extension, 'intl') !== false)
+		{
+			// @codeCoverageIgnoreStart
+			$message = sprintf(
+				'The framework needs the following extension(s) installed and loaded: %s.',
+				$extension
+			);
+			// @codeCoverageIgnoreEnd
+		}
+		else
+		{
+			$message = lang('Core.missingExtension', [$extension]);
+		}
+
+		return new static($message);
+	}
+
+	public static function forNoHandlers(string $class)
+	{
+		return new static(lang('Core.noHandlers', [$class]));
+	}
+
+	public static function forFabricatorCreateFailed(string $table, string $reason)
+	{
+		return new static(lang('Fabricator.createFailed', [$table, $reason]));
+	}
+}
diff --git a/system/Exceptions/ModelException.php b/system/Exceptions/ModelException.php
new file mode 100644
index 0000000..f42a179
--- /dev/null
+++ b/system/Exceptions/ModelException.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+/**
+ * Model Exceptions.
+ */
+
+class ModelException extends FrameworkException
+{
+	public static function forNoPrimaryKey(string $modelName)
+	{
+		return new static(lang('Database.noPrimaryKey', [$modelName]));
+	}
+
+	public static function forNoDateFormat(string $modelName)
+	{
+		return new static(lang('Database.noDateFormat', [$modelName]));
+	}
+}
diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php
new file mode 100644
index 0000000..1ba5c6d
--- /dev/null
+++ b/system/Exceptions/PageNotFoundException.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use OutOfBoundsException;
+
+class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Error code
+	 *
+	 * @var integer
+	 */
+	protected $code = 404;
+
+	public static function forPageNotFound(string $message = null)
+	{
+		return new static($message ?? lang('HTTP.pageNotFound'));
+	}
+
+	public static function forEmptyController()
+	{
+		return new static(lang('HTTP.emptyController'));
+	}
+
+	public static function forControllerNotFound(string $controller, string $method)
+	{
+		return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
+	}
+
+	public static function forMethodNotFound(string $method)
+	{
+		return new static(lang('HTTP.methodNotFound', [$method]));
+	}
+}
diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
new file mode 100644
index 0000000..31f0db0
--- /dev/null
+++ b/system/Files/Exceptions/FileException.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
+
+class FileException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	public static function forUnableToMove(string $from = null, string $to = null, string $error = null)
+	{
+		return new static(lang('Files.cannotMove', [$from, $to, $error]));
+	}
+}
diff --git a/system/Files/Exceptions/FileNotFoundException.php b/system/Files/Exceptions/FileNotFoundException.php
new file mode 100644
index 0000000..a5b9776
--- /dev/null
+++ b/system/Files/Exceptions/FileNotFoundException.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
+
+class FileNotFoundException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	public static function forFileNotFound(string $path)
+	{
+		return new static(lang('Files.fileNotFound', [$path]));
+	}
+}
diff --git a/system/Files/File.php b/system/Files/File.php
new file mode 100644
index 0000000..88a3b46
--- /dev/null
+++ b/system/Files/File.php
@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files;
+
+use CodeIgniter\Files\Exceptions\FileException;
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use Config\Mimes;
+use SplFileInfo;
+
+/**
+ * Wrapper for PHP's built-in SplFileInfo, with goodies.
+ */
+class File extends SplFileInfo
+{
+	/**
+	 * The files size in bytes
+	 *
+	 * @var integer
+	 */
+	protected $size;
+
+	/**
+	 * Original MimeType
+	 *
+	 * @var null|string
+	 */
+	protected $originalMimeType = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Run our SplFileInfo constructor with an optional verification
+	 * that the path is really a file.
+	 *
+	 * @param string  $path
+	 * @param boolean $checkFile
+	 */
+	public function __construct(string $path, bool $checkFile = false)
+	{
+		if ($checkFile && ! is_file($path))
+		{
+			throw FileNotFoundException::forFileNotFound($path);
+		}
+
+		parent::__construct($path);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the file size.
+	 *
+	 * Implementations SHOULD return the value stored in the "size" key of
+	 * the file in the $_FILES array if available, as PHP calculates this based
+	 * on the actual size transmitted.
+	 *
+	 * @return integer The file size in bytes
+	 */
+	public function getSize()
+	{
+		return $this->size ?? ($this->size = parent::getSize());
+	}
+
+	/**
+	 * Retrieve the file size by unit.
+	 *
+	 * @param string $unit
+	 *
+	 * @return integer|string
+	 */
+	public function getSizeByUnit(string $unit = 'b')
+	{
+		switch (strtolower($unit))
+		{
+			case 'kb':
+				return number_format($this->getSize() / 1024, 3);
+			case 'mb':
+				return number_format(($this->getSize() / 1024) / 1024, 3);
+			default:
+				return $this->getSize();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to determine the file extension based on the trusted
+	 * getType() method. If the mime type is unknown, will return null.
+	 *
+	 * @return string|null
+	 */
+	public function guessExtension(): ?string
+	{
+		return Mimes::guessExtensionFromType($this->getMimeType());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the media type of the file. SHOULD not use information from
+	 * the $_FILES array, but should use other methods to more accurately
+	 * determine the type of file, like finfo, or mime_content_type().
+	 *
+	 * @return string The media type we determined it to be.
+	 */
+	public function getMimeType(): string
+	{
+		if (! function_exists('finfo_open'))
+		{
+			// @codeCoverageIgnoreStart
+			return $this->originalMimeType ?? 'application/octet-stream';
+			// @codeCoverageIgnoreEnd
+		}
+
+		$finfo    = finfo_open(FILEINFO_MIME_TYPE);
+		$mimeType = finfo_file($finfo, $this->getRealPath() ?: $this->__toString());
+		finfo_close($finfo);
+		return $mimeType;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a random names based on a simple hash and the time, with
+	 * the correct file extension attached.
+	 *
+	 * @return string
+	 */
+	public function getRandomName(): string
+	{
+		$extension = $this->getExtension();
+		$extension = empty($extension) ? '' : '.' . $extension;
+		return time() . '_' . bin2hex(random_bytes(10)) . $extension;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves a file to a new location.
+	 *
+	 * @param string      $targetPath
+	 * @param string|null $name
+	 * @param boolean     $overwrite
+	 *
+	 * @return File
+	 */
+	public function move(string $targetPath, string $name = null, bool $overwrite = false)
+	{
+		$targetPath  = rtrim($targetPath, '/') . '/';
+		$name        = $name ?? $this->getBaseName();
+		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
+
+		$oldName = $this->getRealPath() ?: $this->__toString();
+
+		if (! @rename($oldName, $destination))
+		{
+			$error = error_get_last();
+			throw FileException::forUnableToMove($this->getBasename(), $targetPath, strip_tags($error['message']));
+		}
+
+		@chmod($destination, 0777 & ~umask());
+
+		return new File($destination);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the destination path for the move operation where overwriting is not expected.
+	 *
+	 * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
+	 * last element is an integer as there may be cases that the delimiter may be present in the filename.
+	 * For the all other cases, it appends an integer starting from zero before the file's extension.
+	 *
+	 * @param string  $destination
+	 * @param string  $delimiter
+	 * @param integer $i
+	 *
+	 * @return string
+	 */
+	public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string
+	{
+		while (is_file($destination))
+		{
+			$info      = pathinfo($destination);
+			$extension = isset($info['extension']) ? '.' . $info['extension'] : '';
+			if (strpos($info['filename'], $delimiter) !== false)
+			{
+				$parts = explode($delimiter, $info['filename']);
+				if (is_numeric(end($parts)))
+				{
+					$i = end($parts);
+					array_pop($parts);
+					$parts[]     = ++ $i;
+					$destination = $info['dirname'] . '/' . implode($delimiter, $parts) . $extension;
+				}
+				else
+				{
+					$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
+				}
+			}
+			else
+			{
+				$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
+			}
+		}
+		return $destination;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
new file mode 100644
index 0000000..254d1f8
--- /dev/null
+++ b/system/Filters/CSRF.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Security\Exceptions\SecurityException;
+use Config\Services;
+
+/**
+ * CSRF filter.
+ *
+ * This filter is not intended to be used from the command line.
+ *
+ * @codeCoverageIgnore
+ */
+class CSRF implements FilterInterface
+{
+	/**
+	 * Do whatever processing this filter needs to do.
+	 * By default it should not return anything during
+	 * normal execution. However, when an abnormal state
+	 * is found, it should return an instance of
+	 * CodeIgniter\HTTP\Response. If it does, script
+	 * execution will end and that Response will be
+	 * sent back to the client, allowing for error pages,
+	 * redirects, etc.
+	 *
+	 * @param RequestInterface|IncomingRequest $request
+	 * @param array|null                       $arguments
+	 *
+	 * @return mixed
+	 * @throws SecurityException
+	 */
+	public function before(RequestInterface $request, $arguments = null)
+	{
+		if ($request->isCLI())
+		{
+			return;
+		}
+
+		$security = Services::security();
+
+		try
+		{
+			$security->verify($request);
+		}
+		catch (SecurityException $e)
+		{
+			if ($security->shouldRedirect() && ! $request->isAJAX())
+			{
+				return redirect()->back()->with('error', $e->getMessage());
+			}
+
+			throw $e;
+		}
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * We don't have anything to do here.
+	 *
+	 * @param RequestInterface|IncomingRequest             $request
+	 * @param ResponseInterface|Response $response
+	 * @param array|null                                   $arguments
+	 *
+	 * @return mixed
+	 */
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+	{
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
new file mode 100644
index 0000000..c012b14
--- /dev/null
+++ b/system/Filters/DebugToolbar.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+/**
+ * Debug toolbar filter
+ */
+class DebugToolbar implements FilterInterface
+{
+	/**
+	 * We don't need to do anything here.
+	 *
+	 * @param RequestInterface|IncomingRequest $request
+	 * @param array|null                       $arguments
+	 *
+	 * @return void
+	 */
+	public function before(RequestInterface $request, $arguments = null)
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If the debug flag is set (CI_DEBUG) then collect performance
+	 * and debug information and display it in a toolbar.
+	 *
+	 * @param RequestInterface|IncomingRequest $request
+	 * @param ResponseInterface|Response       $response
+	 * @param array|null                       $arguments
+	 *
+	 * @return void
+	 */
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+	{
+		Services::toolbar()->prepare($request, $response);
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Filters/Exceptions/FilterException.php b/system/Filters/Exceptions/FilterException.php
new file mode 100644
index 0000000..22bbf20
--- /dev/null
+++ b/system/Filters/Exceptions/FilterException.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\Exceptions;
+
+use CodeIgniter\Exceptions\ConfigException;
+use CodeIgniter\Exceptions\ExceptionInterface;
+
+/**
+ * FilterException
+ */
+class FilterException extends ConfigException implements ExceptionInterface
+{
+	/**
+	 * Thrown when the provided alias is not within
+	 * the list of configured filter aliases.
+	 *
+	 * @param string $alias
+	 *
+	 * @return static
+	 */
+	public static function forNoAlias(string $alias)
+	{
+		return new static(lang('Filters.noFilter', [$alias]));
+	}
+
+	/**
+	 * Thrown when the filter class does not implement FilterInterface.
+	 *
+	 * @param string $class
+	 *
+	 * @return static
+	 */
+	public static function forIncorrectInterface(string $class)
+	{
+		return new static(lang('Filters.incorrectInterface', [$class]));
+	}
+}
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
new file mode 100644
index 0000000..0a9440f
--- /dev/null
+++ b/system/Filters/FilterInterface.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+/**
+ * Filter interface
+ */
+interface FilterInterface
+{
+	/**
+	 * Do whatever processing this filter needs to do.
+	 * By default it should not return anything during
+	 * normal execution. However, when an abnormal state
+	 * is found, it should return an instance of
+	 * CodeIgniter\HTTP\Response. If it does, script
+	 * execution will end and that Response will be
+	 * sent back to the client, allowing for error pages,
+	 * redirects, etc.
+	 *
+	 * @param RequestInterface $request
+	 * @param null             $arguments
+	 *
+	 * @return mixed
+	 */
+	public function before(RequestInterface $request, $arguments = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows After filters to inspect and modify the response
+	 * object as needed. This method does not allow any way
+	 * to stop execution of other after filters, short of
+	 * throwing an Exception or Error.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param null              $arguments
+	 *
+	 * @return mixed
+	 */
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
new file mode 100644
index 0000000..1ba881f
--- /dev/null
+++ b/system/Filters/Filters.php
@@ -0,0 +1,603 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\Filters\Exceptions\FilterException;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Filters as FiltersConfig;
+use Config\Modules;
+use Config\Services;
+
+/**
+ * Filters
+ */
+class Filters
+{
+	/**
+	 * The original config file
+	 *
+	 * @var FiltersConfig
+	 */
+	protected $config;
+
+	/**
+	 * The active IncomingRequest or CLIRequest
+	 *
+	 * @var RequestInterface
+	 */
+	protected $request;
+
+	/**
+	 * The active Response instance
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
+
+	/**
+	 * Handle to the modules config.
+	 *
+	 * @var Modules
+	 */
+	protected $modules;
+
+	/**
+	 * Whether we've done initial processing
+	 * on the filter lists.
+	 *
+	 * @var boolean
+	 */
+	protected $initialized = false;
+
+	/**
+	 * The processed filters that will
+	 * be used to check against.
+	 *
+	 * @var array
+	 */
+	protected $filters = [
+		'before' => [],
+		'after'  => [],
+	];
+
+	/**
+	 * The collection of filters' class names that will
+	 * be used to execute in each position.
+	 *
+	 * @var array
+	 */
+	protected $filtersClass = [
+		'before' => [],
+		'after'  => [],
+	];
+
+	/**
+	 * Any arguments to be passed to filters.
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * Any arguments to be passed to filtersClass.
+	 *
+	 * @var array
+	 */
+	protected $argumentsClass = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param FiltersConfig     $config
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param Modules|null      $modules
+	 */
+	public function __construct($config, RequestInterface $request, ResponseInterface $response, Modules $modules = null)
+	{
+		$this->config  = $config;
+		$this->request = &$request;
+		$this->setResponse($response);
+
+		$this->modules = $modules ?? config('Modules');
+	}
+
+	/**
+	 * If discoverFilters is enabled in Config then system will try to
+	 * auto-discover custom filters files in Namespaces and allow access to
+	 * the config object via the variable $customfilters as with the routes file
+	 *
+	 * Sample :
+	 * $filters->aliases['custom-auth'] = \Acme\Blob\Filters\BlobAuth::class;
+	 */
+	private function discoverFilters()
+	{
+		$locator = Services::locator();
+
+		// for access by custom filters
+		$filters = $this->config;
+
+		$files = $locator->search('Config/Filters.php');
+
+		foreach ($files as $file)
+		{
+			$className = $locator->getClassname($file);
+
+			// Don't include our main Filter config again...
+			if ($className === 'Config\\Filters')
+			{
+				continue;
+			}
+
+			include $file;
+		}
+	}
+
+	/**
+	 * Set the response explicity.
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public function setResponse(ResponseInterface $response)
+	{
+		$this->response = &$response;
+	}
+
+	/**
+	 * Runs through all of the filters for the specified
+	 * uri and position.
+	 *
+	 * @param string $uri
+	 * @param string $position
+	 *
+	 * @return RequestInterface|ResponseInterface|mixed
+	 * @throws FilterException
+	 */
+	public function run(string $uri, string $position = 'before')
+	{
+		$this->initialize(strtolower($uri));
+
+		foreach ($this->filtersClass[$position] as $className)
+		{
+			$class = new $className();
+
+			if (! $class instanceof FilterInterface)
+			{
+				throw FilterException::forIncorrectInterface(get_class($class));
+			}
+
+			if ($position === 'before')
+			{
+				$result = $class->before($this->request, $this->argumentsClass[$className] ?? null);
+
+				if ($result instanceof RequestInterface)
+				{
+					$this->request = $result;
+					continue;
+				}
+
+				// If the response object was sent back,
+				// then send it and quit.
+				if ($result instanceof ResponseInterface)
+				{
+					// short circuit - bypass any other filters
+					return $result;
+				}
+				// Ignore an empty result
+				if (empty($result))
+				{
+					continue;
+				}
+
+				return $result;
+			}
+
+			if ($position === 'after')
+			{
+				$result = $class->after($this->request, $this->response, $this->argumentsClass[$className] ?? null);
+
+				if ($result instanceof ResponseInterface)
+				{
+					$this->response = $result;
+
+					continue;
+				}
+			}
+		}
+
+		return $position === 'before' ? $this->request : $this->response;
+	}
+
+	/**
+	 * Runs through our list of filters provided by the configuration
+	 * object to get them ready for use, including getting uri masks
+	 * to proper regex, removing those we can from the possibilities
+	 * based on HTTP method, etc.
+	 *
+	 * The resulting $this->filters is an array of only filters
+	 * that should be applied to this request.
+	 *
+	 * We go ahead an process the entire tree because we'll need to
+	 * run through both a before and after and don't want to double
+	 * process the rows.
+	 *
+	 * @param string $uri
+	 *
+	 * @return Filters
+	 */
+	public function initialize(string $uri = null)
+	{
+		if ($this->initialized === true)
+		{
+			return $this;
+		}
+
+		if ($this->modules->shouldDiscover('filters'))
+		{
+			$this->discoverFilters();
+		}
+
+		$this->processGlobals($uri);
+		$this->processMethods();
+		$this->processFilters($uri);
+
+		// Set the toolbar filter to the last position to be executed
+		if (in_array('toolbar', $this->filters['after'], true) &&
+			($count = count($this->filters['after'])) > 1 &&
+			$this->filters['after'][$count - 1] !== 'toolbar'
+		)
+		{
+			array_splice($this->filters['after'], array_search('toolbar', $this->filters['after'], true), 1);
+			$this->filters['after'][] = 'toolbar';
+		}
+
+		$this->processAliasesToClass('before');
+		$this->processAliasesToClass('after');
+
+		$this->initialized = true;
+
+		return $this;
+	}
+
+	/**
+	 * Restores instance to its pre-initialized state.
+	 * Most useful for testing so the service can be
+	 * re-initialized to a different path.
+	 *
+	 * @return $this
+	 */
+	public function reset(): self
+	{
+		$this->initialized = false;
+		$this->arguments   = $this->argumentsClass = [];
+		$this->filters     = $this->filtersClass = [
+			'before' => [],
+			'after'  => [],
+		];
+
+		return $this;
+	}
+
+	/**
+	 * Returns the processed filters array.
+	 *
+	 * @return array
+	 */
+	public function getFilters(): array
+	{
+		return $this->filters;
+	}
+
+	/**
+	 * Returns the filtersClass array.
+	 *
+	 * @return array
+	 */
+	public function getFiltersClass(): array
+	{
+		return $this->filtersClass;
+	}
+
+	/**
+	 * Adds a new alias to the config file.
+	 * MUST be called prior to initialize();
+	 * Intended for use within routes files.
+	 *
+	 * @param string      $class
+	 * @param string|null $alias
+	 * @param string      $when
+	 * @param string      $section
+	 *
+	 * @return $this
+	 */
+	public function addFilter(string $class, string $alias = null, string $when = 'before', string $section = 'globals')
+	{
+		$alias = $alias ?? md5($class);
+
+		if (! isset($this->config->{$section}))
+		{
+			$this->config->{$section} = [];
+		}
+
+		if (! isset($this->config->{$section}[$when]))
+		{
+			$this->config->{$section}[$when] = [];
+		}
+
+		$this->config->aliases[$alias] = $class;
+
+		$this->config->{$section}[$when][] = $alias;
+
+		return $this;
+	}
+
+	/**
+	 * Ensures that a specific filter is on and enabled for the current request.
+	 *
+	 * Filters can have "arguments". This is done by placing a colon immediately
+	 * after the filter name, followed by a comma-separated list of arguments that
+	 * are passed to the filter when executed.
+	 *
+	 * @param string $name
+	 * @param string $when
+	 *
+	 * @return Filters
+	 */
+	public function enableFilter(string $name, string $when = 'before')
+	{
+		// Get parameters and clean name
+		if (strpos($name, ':') !== false)
+		{
+			[$name, $params] = explode(':', $name);
+
+			$params = explode(',', $params);
+			array_walk($params, function (&$item) {
+				$item = trim($item);
+			});
+
+			$this->arguments[$name] = $params;
+		}
+
+		if (! array_key_exists($name, $this->config->aliases))
+		{
+			throw FilterException::forNoAlias($name);
+		}
+
+		$classNames = (array) $this->config->aliases[$name];
+
+		foreach ($classNames as $className)
+		{
+			$this->argumentsClass[$className] = $this->arguments[$name] ?? null;
+		}
+
+		if (! isset($this->filters[$when][$name]))
+		{
+			$this->filters[$when][]    = $name;
+			$this->filtersClass[$when] = array_merge($this->filtersClass[$when], $classNames);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns the arguments for a specified key, or all.
+	 *
+	 * @param string|null $key
+	 *
+	 * @return mixed
+	 */
+	public function getArguments(string $key = null)
+	{
+		return is_null($key) ? $this->arguments : $this->arguments[$key];
+	}
+
+	//--------------------------------------------------------------------
+	// Processors
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add any applicable (not excluded) global filter settings to the mix.
+	 *
+	 * @param string $uri
+	 *
+	 * @return void
+	 */
+	protected function processGlobals(string $uri = null)
+	{
+		if (! isset($this->config->globals) || ! is_array($this->config->globals))
+		{
+			return;
+		}
+
+		$uri = strtolower(trim($uri, '/ '));
+
+		// Add any global filters, unless they are excluded for this URI
+		$sets = [
+			'before',
+			'after',
+		];
+
+		foreach ($sets as $set)
+		{
+			if (isset($this->config->globals[$set]))
+			{
+				// look at each alias in the group
+				foreach ($this->config->globals[$set] as $alias => $rules)
+				{
+					$keep = true;
+					if (is_array($rules))
+					{
+						// see if it should be excluded
+						if (isset($rules['except']))
+						{
+							// grab the exclusion rules
+							$check = $rules['except'];
+							if ($this->pathApplies($uri, $check))
+							{
+								$keep = false;
+							}
+						}
+					}
+					else
+					{
+						$alias = $rules; // simple name of filter to apply
+					}
+
+					if ($keep)
+					{
+						$this->filters[$set][] = $alias;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Add any method-specific filters to the mix.
+	 *
+	 * @return void
+	 */
+	protected function processMethods()
+	{
+		if (! isset($this->config->methods) || ! is_array($this->config->methods))
+		{
+			return;
+		}
+
+		// Request method won't be set for CLI-based requests
+		$method = strtolower($_SERVER['REQUEST_METHOD'] ?? 'cli');
+
+		if (array_key_exists($method, $this->config->methods))
+		{
+			$this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]);
+			return;
+		}
+	}
+
+	/**
+	 * Add any applicable configured filters to the mix.
+	 *
+	 * @param string $uri
+	 *
+	 * @return void
+	 */
+	protected function processFilters(string $uri = null)
+	{
+		if (! isset($this->config->filters) || ! $this->config->filters)
+		{
+			return;
+		}
+
+		$uri = strtolower(trim($uri, '/ '));
+
+		// Add any filters that apply to this URI
+		foreach ($this->config->filters as $alias => $settings)
+		{
+			// Look for inclusion rules
+			if (isset($settings['before']))
+			{
+				$path = $settings['before'];
+				if ($this->pathApplies($uri, $path))
+				{
+					$this->filters['before'][] = $alias;
+				}
+			}
+
+			if (isset($settings['after']))
+			{
+				$path = $settings['after'];
+				if ($this->pathApplies($uri, $path))
+				{
+					$this->filters['after'][] = $alias;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Maps filter aliases to the equivalent filter classes
+	 *
+	 * @param  string $position
+	 * @throws FilterException
+	 *
+	 * @return void
+	 */
+	protected function processAliasesToClass(string $position)
+	{
+		foreach ($this->filters[$position] as $alias => $rules)
+		{
+			if (is_numeric($alias) && is_string($rules))
+			{
+				$alias = $rules;
+			}
+
+			if (! array_key_exists($alias, $this->config->aliases))
+			{
+				throw FilterException::forNoAlias($alias);
+			}
+
+			if (is_array($this->config->aliases[$alias]))
+			{
+				$this->filtersClass[$position] = array_merge($this->filtersClass[$position], $this->config->aliases[$alias]);
+			}
+			else
+			{
+				$this->filtersClass[$position][] = $this->config->aliases[$alias];
+			}
+		}
+
+		// when using enableFilter() we already write the class name in ->filtersClass as well as the
+		// alias in ->filters. This leads to duplicates when using route filters.
+		// Since some filters like rate limiters rely on being executed once a request we filter em here.
+		$this->filtersClass[$position] = array_unique($this->filtersClass[$position]);
+	}
+
+	/**
+	 * Check paths for match for URI
+	 *
+	 * @param string $uri   URI to test against
+	 * @param mixed  $paths The path patterns to test
+	 *
+	 * @return boolean True if any of the paths apply to the URI
+	 */
+	private function pathApplies(string $uri, $paths)
+	{
+		// empty path matches all
+		if (empty($paths))
+		{
+			return true;
+		}
+
+		// make sure the paths are iterable
+		if (is_string($paths))
+		{
+			$paths = [$paths];
+		}
+
+		// treat each paths as pseudo-regex
+		foreach ($paths as $path)
+		{
+			// need to escape path separators
+			$path = str_replace('/', '\/', trim($path, '/ '));
+			// need to make pseudo wildcard real
+			$path = strtolower(str_replace('*', '.*', $path));
+			// Does this rule apply here?
+			if (preg_match('#^' . $path . '$#', $uri, $match) === 1)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
new file mode 100644
index 0000000..b6f0ef1
--- /dev/null
+++ b/system/Filters/Honeypot.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\Honeypot\Exceptions\HoneypotException;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+/**
+ * Honeypot filter
+ */
+class Honeypot implements FilterInterface
+{
+	/**
+	 * Checks if Honeypot field is empty; if not
+	 * then the requester is a bot
+	 *
+	 * @param RequestInterface $request
+	 * @param array|null       $arguments
+	 *
+	 * @return void
+	 */
+	public function before(RequestInterface $request, $arguments = null)
+	{
+		$honeypot = Services::honeypot(new \Config\Honeypot());
+		if ($honeypot->hasContent($request))
+		{
+			throw HoneypotException::isBot();
+		}
+	}
+
+	/**
+	 * Attach a honeypot to the current response.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param array|null        $arguments
+	 *
+	 * @return void
+	 */
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+	{
+		$honeypot = Services::honeypot(new \Config\Honeypot());
+		$honeypot->attachHoneypot($response);
+	}
+}
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
new file mode 100644
index 0000000..fbe3abf
--- /dev/null
+++ b/system/Format/Exceptions/FormatException.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
+
+/**
+ * FormatException
+ */
+class FormatException extends RuntimeException implements ExceptionInterface
+{
+	use DebugTraceableTrait;
+
+	/**
+	 * Thrown when the instantiated class does not exist.
+	 *
+	 * @param string $class
+	 *
+	 * @return FormatException
+	 */
+	public static function forInvalidFormatter(string $class)
+	{
+		return new static(lang('Format.invalidFormatter', [$class]));
+	}
+
+	/**
+	 * Thrown in JSONFormatter when the json_encode produces
+	 * an error code other than JSON_ERROR_NONE and JSON_ERROR_RECURSION.
+	 *
+	 * @param string $error
+	 *
+	 * @return FormatException
+	 */
+	public static function forInvalidJSON(string $error = null)
+	{
+		return new static(lang('Format.invalidJSON', [$error]));
+	}
+
+	/**
+	 * Thrown when the supplied MIME type has no
+	 * defined Formatter class.
+	 *
+	 * @param string $mime
+	 *
+	 * @return FormatException
+	 */
+	public static function forInvalidMime(string $mime)
+	{
+		return new static(lang('Format.invalidMime', [$mime]));
+	}
+
+	/**
+	 * Thrown on XMLFormatter when the `simplexml` extension
+	 * is not installed.
+	 *
+	 * @return FormatException
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function forMissingExtension()
+	{
+		return new static(lang('Format.missingExtension'));
+	}
+}
diff --git a/system/Format/Format.php b/system/Format/Format.php
new file mode 100644
index 0000000..6f5c0e4
--- /dev/null
+++ b/system/Format/Format.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
+
+use CodeIgniter\Format\Exceptions\FormatException;
+use Config\Format as FormatConfig;
+
+/**
+ * The Format class is a convenient place to create Formatters.
+ */
+class Format
+{
+	/**
+	 * Configuration instance
+	 *
+	 * @var FormatConfig
+	 */
+	protected $config;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param FormatConfig $config
+	 */
+	public function __construct(FormatConfig $config)
+	{
+		$this->config = $config;
+	}
+
+	/**
+	 * Returns the current configuration instance.
+	 *
+	 * @return FormatConfig
+	 */
+	public function getConfig()
+	{
+		return $this->config;
+	}
+
+	/**
+	 * A Factory method to return the appropriate formatter for the given mime type.
+	 *
+	 * @param string $mime
+	 *
+	 * @throws FormatException
+	 *
+	 * @return FormatterInterface
+	 */
+	public function getFormatter(string $mime): FormatterInterface
+	{
+		if (! array_key_exists($mime, $this->config->formatters))
+		{
+			throw FormatException::forInvalidMime($mime);
+		}
+
+		$className = $this->config->formatters[$mime];
+
+		if (! class_exists($className))
+		{
+			throw FormatException::forInvalidFormatter($className);
+		}
+
+		$class = new $className();
+
+		if (! $class instanceof FormatterInterface)
+		{
+			throw FormatException::forInvalidFormatter($className);
+		}
+
+		return $class;
+	}
+}
diff --git a/system/Format/FormatterInterface.php b/system/Format/FormatterInterface.php
new file mode 100644
index 0000000..6b4a119
--- /dev/null
+++ b/system/Format/FormatterInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
+
+/**
+ * Formatter interface
+ */
+interface FormatterInterface
+{
+	/**
+	 * Takes the given data and formats it.
+	 *
+	 * @param string|array $data
+	 *
+	 * @return mixed
+	 */
+	public function format($data);
+}
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
new file mode 100644
index 0000000..aefc607
--- /dev/null
+++ b/system/Format/JSONFormatter.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
+
+use CodeIgniter\Format\Exceptions\FormatException;
+use Config\Format;
+
+/**
+ * JSON data formatter
+ */
+class JSONFormatter implements FormatterInterface
+{
+	/**
+	 * Takes the given data and formats it.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return string|boolean (JSON string | false)
+	 */
+	public function format($data)
+	{
+		$config = new Format();
+
+		$options = $config->formatterOptions['application/json'] ?? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
+		$options = $options | JSON_PARTIAL_OUTPUT_ON_ERROR;
+
+		$options = ENVIRONMENT === 'production' ? $options : $options | JSON_PRETTY_PRINT;
+
+		$result = json_encode($data, $options, 512);
+
+		if (! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION], true))
+		{
+			throw FormatException::forInvalidJSON(json_last_error_msg());
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
new file mode 100644
index 0000000..249f916
--- /dev/null
+++ b/system/Format/XMLFormatter.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
+
+use CodeIgniter\Format\Exceptions\FormatException;
+use Config\Format;
+use SimpleXMLElement;
+
+/**
+ * XML data formatter
+ */
+class XMLFormatter implements FormatterInterface
+{
+	/**
+	 * Takes the given data and formats it.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return string|boolean (XML string | false)
+	 */
+	public function format($data)
+	{
+		$config = new Format();
+
+		// SimpleXML is installed but default
+		// but best to check, and then provide a fallback.
+		if (! extension_loaded('simplexml'))
+		{
+			// never thrown in travis-ci
+			// @codeCoverageIgnoreStart
+			throw FormatException::forMissingExtension();
+			// @codeCoverageIgnoreEnd
+		}
+
+		$options = $config->formatterOptions['application/xml'] ?? 0;
+		$output  = new SimpleXMLElement('<?xml version="1.0"?><response></response>', $options);
+
+		$this->arrayToXML((array) $data, $output);
+
+		return $output->asXML();
+	}
+
+	/**
+	 * A recursive method to convert an array into a valid XML string.
+	 *
+	 * Written by CodexWorld. Received permission by email on Nov 24, 2016 to use this code.
+	 *
+	 * @see http://www.codexworld.com/convert-array-to-xml-in-php/
+	 *
+	 * @param array            $data
+	 * @param SimpleXMLElement $output
+	 */
+	protected function arrayToXML(array $data, &$output)
+	{
+		foreach ($data as $key => $value)
+		{
+			$key = $this->normalizeXMLTag($key);
+
+			if (is_array($value))
+			{
+				$subnode = $output->addChild("$key");
+				$this->arrayToXML($value, $subnode);
+			}
+			else
+			{
+				$output->addChild("$key", htmlspecialchars("$value"));
+			}
+		}
+	}
+
+	/**
+	 * Normalizes tags into the allowed by W3C.
+	 * Regex adopted from this StackOverflow answer.
+	 *
+	 * @param string|integer $key
+	 *
+	 * @return string
+	 *
+	 * @see https://stackoverflow.com/questions/60001029/invalid-characters-in-xml-tag-name
+	 */
+	protected function normalizeXMLTag($key)
+	{
+		$startChar = 'A-Z_a-z' .
+			'\\x{C0}-\\x{D6}\\x{D8}-\\x{F6}\\x{F8}-\\x{2FF}\\x{370}-\\x{37D}' .
+			'\\x{37F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{2070}-\\x{218F}' .
+			'\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}' .
+			'\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}';
+		$validName = $startChar . '\\.\\d\\x{B7}\\x{300}-\\x{36F}\\x{203F}-\\x{2040}';
+
+		$key = trim($key);
+		$key = preg_replace("/[^{$validName}-]+/u", '', $key);
+		$key = preg_replace("/^[^{$startChar}]+/u", 'item$0', $key);
+
+		return preg_replace('/^(xml).*/iu', 'item$0', $key); // XML is a reserved starting word
+	}
+}
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
new file mode 100644
index 0000000..0cf3bce
--- /dev/null
+++ b/system/HTTP/CLIRequest.php
@@ -0,0 +1,237 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use Config\App;
+use RuntimeException;
+
+/**
+ * Class CLIRequest
+ *
+ * Represents a request from the command-line. Provides additional
+ * tools to interact with that request since CLI requests are not
+ * static like HTTP requests might be.
+ *
+ * Portions of this code were initially from the FuelPHP Framework,
+ * version 1.7.x, and used here under the MIT license they were
+ * originally made available under.
+ *
+ * http://fuelphp.com
+ */
+class CLIRequest extends Request
+{
+	/**
+	 * Stores the segments of our cli "URI" command.
+	 *
+	 * @var array
+	 */
+	protected $segments = [];
+
+	/**
+	 * Command line options and their values.
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	/**
+	 * Set the expected HTTP verb
+	 *
+	 * @var string
+	 */
+	protected $method = 'cli';
+
+	/**
+	 * Constructor
+	 *
+	 * @param App $config
+	 */
+	public function __construct(App $config)
+	{
+		if (! is_cli())
+		{
+			throw new RuntimeException(static::class . ' needs to run from the command line.'); // @codeCoverageIgnore
+		}
+
+		parent::__construct($config);
+
+		// Don't terminate the script when the cli's tty goes away
+		ignore_user_abort(true);
+
+		$this->parseCommand();
+	}
+
+	/**
+	 * Returns the "path" of the request script so that it can be used
+	 * in routing to the appropriate controller/method.
+	 *
+	 * The path is determined by treating the command line arguments
+	 * as if it were a URL - up until we hit our first option.
+	 *
+	 * Example:
+	 *      php index.php users 21 profile -foo bar
+	 *
+	 *      // Routes to /users/21/profile (index is removed for routing sake)
+	 *      // with the option foo = bar.
+	 *
+	 * @return string
+	 */
+	public function getPath(): string
+	{
+		$path = implode('/', $this->segments);
+
+		return empty($path) ? '' : $path;
+	}
+
+	/**
+	 * Returns an associative array of all CLI options found, with
+	 * their values.
+	 *
+	 * @return array
+	 */
+	public function getOptions(): array
+	{
+		return $this->options;
+	}
+
+	/**
+	 * Returns the path segments.
+	 *
+	 * @return array
+	 */
+	public function getSegments(): array
+	{
+		return $this->segments;
+	}
+
+	/**
+	 * Returns the value for a single CLI option that was passed in.
+	 *
+	 * @param string $key
+	 *
+	 * @return string|null
+	 */
+	public function getOption(string $key)
+	{
+		return $this->options[$key] ?? null;
+	}
+
+	/**
+	 * Returns the options as a string, suitable for passing along on
+	 * the CLI to other commands.
+	 *
+	 * Example:
+	 *      $options = [
+	 *          'foo' => 'bar',
+	 *          'baz' => 'queue some stuff'
+	 *      ];
+	 *
+	 *      getOptionString() = '-foo bar -baz "queue some stuff"'
+	 *
+	 * @param boolean $useLongOpts
+	 *
+	 * @return string
+	 */
+	public function getOptionString(bool $useLongOpts = false): string
+	{
+		if (empty($this->options))
+		{
+			return '';
+		}
+
+		$out = '';
+
+		foreach ($this->options as $name => $value)
+		{
+			if ($useLongOpts && mb_strlen($name) > 1)
+			{
+				$out .= "--{$name} ";
+			}
+			else
+			{
+				$out .= "-{$name} ";
+			}
+
+			// If there's a space, we need to group
+			// so it will pass correctly.
+			if (mb_strpos($value, ' ') !== false)
+			{
+				$out .= '"' . $value . '" ';
+			}
+			elseif ($value !== null)
+			{
+				$out .= "{$value} ";
+			}
+		}
+
+		return trim($out);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the command line it was called from and collects all options
+	 * and valid segments.
+	 *
+	 * NOTE: I tried to use getopt but had it fail occasionally to find
+	 * any options, where argv has always had our back.
+	 */
+	protected function parseCommand()
+	{
+		$args = $this->getServer('argv');
+		array_shift($args); // Scrap index.php
+
+		$optionValue = false;
+
+		foreach ($args as $i => $arg)
+		{
+			if (mb_strpos($arg, '-') !== 0)
+			{
+				if ($optionValue)
+				{
+					$optionValue = false;
+				}
+				else
+				{
+					$this->segments[] = filter_var($arg, FILTER_SANITIZE_STRING);
+				}
+
+				continue;
+			}
+
+			$arg   = filter_var(ltrim($arg, '-'), FILTER_SANITIZE_STRING);
+			$value = null;
+
+			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
+			{
+				$value       = filter_var($args[$i + 1], FILTER_SANITIZE_STRING);
+				$optionValue = true;
+			}
+
+			$this->options[$arg] = $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if this request was made from the command line (CLI).
+	 *
+	 * @return boolean
+	 */
+	public function isCLI(): bool
+	{
+		return is_cli();
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
new file mode 100644
index 0000000..55797e0
--- /dev/null
+++ b/system/HTTP/CURLRequest.php
@@ -0,0 +1,805 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use Config\App;
+use InvalidArgumentException;
+
+/**
+ * Class OutgoingRequest
+ *
+ * A lightweight HTTP client for sending synchronous HTTP requests
+ * via cURL.
+ */
+class CURLRequest extends Request
+{
+	/**
+	 * The response object associated with this request
+	 *
+	 * @var ResponseInterface|null
+	 */
+	protected $response;
+
+	/**
+	 * The URI associated with this request
+	 *
+	 * @var URI
+	 */
+	protected $baseURI;
+
+	/**
+	 * The setting values
+	 *
+	 * @var array
+	 */
+	protected $config = [
+		'timeout'         => 0.0,
+		'connect_timeout' => 150,
+		'debug'           => false,
+		'verify'          => true,
+	];
+
+	/**
+	 * Default values for when 'allow_redirects'
+	 * option is true.
+	 *
+	 * @var array
+	 */
+	protected $redirectDefaults = [
+		'max'       => 5,
+		'strict'    => true,
+		'protocols' => [
+			'http',
+			'https',
+		],
+	];
+
+	/**
+	 * The number of milliseconds to delay before
+	 * sending the request.
+	 *
+	 * @var float
+	 */
+	protected $delay = 0.0;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Takes an array of options to set the following possible class properties:
+	 *
+	 *  - baseURI
+	 *  - timeout
+	 *  - any other request options to use as defaults.
+	 *
+	 * @param App               $config
+	 * @param URI               $uri
+	 * @param ResponseInterface $response
+	 * @param array             $options
+	 */
+	public function __construct(App $config, URI $uri, ResponseInterface $response = null, array $options = [])
+	{
+		if (! function_exists('curl_version'))
+		{
+			// we won't see this during travis-CI
+			// @codeCoverageIgnoreStart
+			throw HTTPException::forMissingCurl();
+			// @codeCoverageIgnoreEnd
+		}
+
+		parent::__construct($config);
+
+		$this->response = $response;
+		$this->baseURI  = $uri->useRawQueryString();
+
+		$this->parseOptions($options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sends an HTTP request to the specified $url. If this is a relative
+	 * URL, it will be merged with $this->baseURI to form a complete URL.
+	 *
+	 * @param string $method
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function request($method, string $url, array $options = []): ResponseInterface
+	{
+		$this->parseOptions($options);
+
+		$url = $this->prepareURL($url);
+
+		$method = filter_var($method, FILTER_SANITIZE_STRING);
+
+		$this->send($method, $url);
+
+		return $this->response;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending a GET request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function get(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('get', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending a DELETE request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function delete(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('delete', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending a HEAD request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function head(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('head', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending an OPTIONS request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function options(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('options', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending a PATCH request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function patch(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('patch', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending a POST request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function post(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('post', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Convenience method for sending a PUT request.
+	 *
+	 * @param string $url
+	 * @param array  $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function put(string $url, array $options = []): ResponseInterface
+	{
+		return $this->request('put', $url, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set the HTTP Authentication.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 * @param string $type     basic or digest
+	 *
+	 * @return $this
+	 */
+	public function setAuth(string $username, string $password, string $type = 'basic')
+	{
+		$this->config['auth'] = [
+			$username,
+			$password,
+			$type,
+		];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set form data to be sent.
+	 *
+	 * @param array   $params
+	 * @param boolean $multipart Set TRUE if you are sending CURLFiles
+	 *
+	 * @return $this
+	 */
+	public function setForm(array $params, bool $multipart = false)
+	{
+		if ($multipart)
+		{
+			$this->config['multipart'] = $params;
+		}
+		else
+		{
+			$this->config['form_params'] = $params;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set JSON data to be sent.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return $this
+	 */
+	public function setJSON($data)
+	{
+		$this->config['json'] = $data;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the correct settings based on the options array
+	 * passed in.
+	 *
+	 * @param array $options
+	 */
+	protected function parseOptions(array $options)
+	{
+		if (array_key_exists('baseURI', $options))
+		{
+			$this->baseURI = $this->baseURI->setURI($options['baseURI']);
+			unset($options['baseURI']);
+		}
+
+		if (array_key_exists('headers', $options) && is_array($options['headers']))
+		{
+			foreach ($options['headers'] as $name => $value)
+			{
+				$this->setHeader($name, $value);
+			}
+
+			unset($options['headers']);
+		}
+
+		if (array_key_exists('delay', $options))
+		{
+			// Convert from the milliseconds passed in
+			// to the seconds that sleep requires.
+			$this->delay = (float) $options['delay'] / 1000;
+			unset($options['delay']);
+		}
+
+		foreach ($options as $key => $value)
+		{
+			$this->config[$key] = $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If the $url is a relative URL, will attempt to create
+	 * a full URL by prepending $this->baseURI to it.
+	 *
+	 * @param string $url
+	 *
+	 * @return string
+	 */
+	protected function prepareURL(string $url): string
+	{
+		// If it's a full URI, then we have nothing to do here...
+		if (strpos($url, '://') !== false)
+		{
+			return $url;
+		}
+
+		$uri = $this->baseURI->resolveRelativeURI($url);
+
+		// Create the string instead of casting to prevent baseURL muddling
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the request method. Overrides the Request class' method
+	 * since users expect a different answer here.
+	 *
+	 * @param boolean|false $upper Whether to return in upper or lower case.
+	 *
+	 * @return string
+	 */
+	public function getMethod(bool $upper = false): string
+	{
+		return ($upper) ? strtoupper($this->method) : strtolower($this->method);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Fires the actual cURL request.
+	 *
+	 * @param string $method
+	 * @param string $url
+	 *
+	 * @return ResponseInterface
+	 */
+	public function send(string $method, string $url)
+	{
+		// Reset our curl options so we're on a fresh slate.
+		$curlOptions = [];
+
+		if (! empty($this->config['query']) && is_array($this->config['query']))
+		{
+			// This is likely too naive a solution.
+			// Should look into handling when $url already
+			// has query vars on it.
+			$url .= '?' . http_build_query($this->config['query']);
+			unset($this->config['query']);
+		}
+
+		$curlOptions[CURLOPT_URL]            = $url;
+		$curlOptions[CURLOPT_RETURNTRANSFER] = true;
+		$curlOptions[CURLOPT_HEADER]         = true;
+		$curlOptions[CURLOPT_FRESH_CONNECT]  = true;
+		// Disable @file uploads in post data.
+		$curlOptions[CURLOPT_SAFE_UPLOAD] = true;
+
+		$curlOptions = $this->setCURLOptions($curlOptions, $this->config);
+		$curlOptions = $this->applyMethod($method, $curlOptions);
+		$curlOptions = $this->applyRequestHeaders($curlOptions);
+
+		// Do we need to delay this request?
+		if ($this->delay > 0)
+		{
+			sleep($this->delay); // @phpstan-ignore-line
+		}
+
+		$output = $this->sendRequest($curlOptions);
+
+		// Set the string we want to break our response from
+		$breakString = "\r\n\r\n";
+
+		if (strpos($output, 'HTTP/1.1 100 Continue') === 0)
+		{
+			$output = substr($output, strpos($output, $breakString) + 4);
+		}
+
+		 // If request and response have Digest
+		if (isset($this->config['auth'][2]) && $this->config['auth'][2] === 'digest' && strpos($output, 'WWW-Authenticate: Digest') !== false)
+		{
+				$output = substr($output, strpos($output, $breakString) + 4);
+		}
+
+		// Split out our headers and body
+		$break = strpos($output, $breakString);
+
+		if ($break !== false)
+		{
+			// Our headers
+			$headers = explode("\n", substr($output, 0, $break));
+
+			$this->setResponseHeaders($headers);
+
+			// Our body
+			$body = substr($output, $break + 4);
+			$this->response->setBody($body);
+		}
+		else
+		{
+			$this->response->setBody($output);
+		}
+
+		return $this->response;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes all headers current part of this request and adds them
+	 * to the cURL request.
+	 *
+	 * @param array $curlOptions
+	 *
+	 * @return array
+	 */
+	protected function applyRequestHeaders(array $curlOptions = []): array
+	{
+		if (empty($this->headers))
+		{
+			$this->populateHeaders();
+			// Otherwise, it will corrupt the request
+			$this->removeHeader('Host');
+			$this->removeHeader('Accept-Encoding');
+		}
+
+		$headers = $this->headers();
+
+		if (empty($headers))
+		{
+			return $curlOptions;
+		}
+
+		$set = [];
+
+		foreach (array_keys($headers) as $name)
+		{
+			$set[] = $name . ': ' . $this->getHeaderLine($name);
+		}
+
+		$curlOptions[CURLOPT_HTTPHEADER] = $set;
+
+		return $curlOptions;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Apply method
+	 *
+	 * @param string $method
+	 * @param array  $curlOptions
+	 *
+	 * @return array
+	 */
+	protected function applyMethod(string $method, array $curlOptions): array
+	{
+		$method = strtoupper($method);
+
+		$this->method                       = $method;
+		$curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
+
+		$size = strlen($this->body);
+
+		// Have content?
+		if ($size > 0)
+		{
+			return $this->applyBody($curlOptions);
+		}
+
+		if ($method === 'PUT' || $method === 'POST')
+		{
+			// See http://tools.ietf.org/html/rfc7230#section-3.3.2
+			if (is_null($this->header('content-length')) && ! isset($this->config['multipart']))
+			{
+				$this->setHeader('Content-Length', '0');
+			}
+		}
+		elseif ($method === 'HEAD')
+		{
+			$curlOptions[CURLOPT_NOBODY] = 1;
+		}
+
+		return $curlOptions;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Apply body
+	 *
+	 * @param array $curlOptions
+	 *
+	 * @return array
+	 */
+	protected function applyBody(array $curlOptions = []): array
+	{
+		if (! empty($this->body))
+		{
+			$curlOptions[CURLOPT_POSTFIELDS] = (string) $this->getBody();
+		}
+
+		return $curlOptions;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the header retrieved from the cURL response into
+	 * our Response object.
+	 *
+	 * @param array $headers
+	 */
+	protected function setResponseHeaders(array $headers = [])
+	{
+		foreach ($headers as $header)
+		{
+			if (($pos = strpos($header, ':')) !== false)
+			{
+				$title = substr($header, 0, $pos);
+				$value = substr($header, $pos + 1);
+
+				$this->response->setHeader($title, $value);
+			}
+			elseif (strpos($header, 'HTTP') === 0)
+			{
+				preg_match('#^HTTP\/([12](?:\.[01])?) ([0-9]+) (.+)#', $header, $matches);
+
+				if (isset($matches[1]))
+				{
+					$this->response->setProtocolVersion($matches[1]);
+				}
+
+				if (isset($matches[2]))
+				{
+					$this->response->setStatusCode($matches[2], $matches[3] ?? null);
+				}
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set CURL options
+	 *
+	 * @param  array $curlOptions
+	 * @param  array $config
+	 * @return array
+	 * @throws InvalidArgumentException
+	 */
+	protected function setCURLOptions(array $curlOptions = [], array $config = [])
+	{
+		// Auth Headers
+		if (! empty($config['auth']))
+		{
+			$curlOptions[CURLOPT_USERPWD] = $config['auth'][0] . ':' . $config['auth'][1];
+
+			if (! empty($config['auth'][2]) && strtolower($config['auth'][2]) === 'digest')
+			{
+				$curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
+			}
+			else
+			{
+				$curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
+			}
+		}
+
+		// Certificate
+		if (! empty($config['cert']))
+		{
+			$cert = $config['cert'];
+
+			if (is_array($cert))
+			{
+				$curlOptions[CURLOPT_SSLCERTPASSWD] = $cert[1];
+				$cert                               = $cert[0];
+			}
+
+			if (! is_file($cert))
+			{
+				throw HTTPException::forSSLCertNotFound($cert);
+			}
+
+			$curlOptions[CURLOPT_SSLCERT] = $cert;
+		}
+
+		// SSL Verification
+		if (isset($config['verify']))
+		{
+			if (is_string($config['verify']))
+			{
+				$file = realpath($config['ssl_key']) ?: $config['ssl_key'];
+
+				if (! is_file($file))
+				{
+					throw HTTPException::forInvalidSSLKey($config['ssl_key']);
+				}
+
+				$curlOptions[CURLOPT_CAINFO]         = $file;
+				$curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
+			}
+			elseif (is_bool($config['verify']))
+			{
+				$curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
+			}
+		}
+
+		// Debug
+		if ($config['debug'])
+		{
+			$curlOptions[CURLOPT_VERBOSE] = 1;
+			$curlOptions[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://stderr', 'w');
+		}
+
+		// Decode Content
+		if (! empty($config['decode_content']))
+		{
+			$accept = $this->getHeaderLine('Accept-Encoding');
+
+			if ($accept)
+			{
+				$curlOptions[CURLOPT_ENCODING] = $accept;
+			}
+			else
+			{
+				$curlOptions[CURLOPT_ENCODING]   = '';
+				$curlOptions[CURLOPT_HTTPHEADER] = 'Accept-Encoding';
+			}
+		}
+
+		// Allow Redirects
+		if (array_key_exists('allow_redirects', $config))
+		{
+			$settings = $this->redirectDefaults;
+
+			if (is_array($config['allow_redirects']))
+			{
+				$settings = array_merge($settings, $config['allow_redirects']);
+			}
+
+			if ($config['allow_redirects'] === false)
+			{
+				$curlOptions[CURLOPT_FOLLOWLOCATION] = 0;
+			}
+			else
+			{
+				$curlOptions[CURLOPT_FOLLOWLOCATION] = 1;
+				$curlOptions[CURLOPT_MAXREDIRS]      = $settings['max'];
+
+				if ($settings['strict'] === true)
+				{
+					$curlOptions[CURLOPT_POSTREDIR] = 1 | 2 | 4;
+				}
+
+				$protocols = 0;
+				foreach ($settings['protocols'] as $proto)
+				{
+					$protocols += constant('CURLPROTO_' . strtoupper($proto));
+				}
+
+				$curlOptions[CURLOPT_REDIR_PROTOCOLS] = $protocols;
+			}
+		}
+
+		// Timeout
+		$curlOptions[CURLOPT_TIMEOUT_MS] = (float) $config['timeout'] * 1000;
+
+		// Connection Timeout
+		$curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = (float) $config['connect_timeout'] * 1000;
+
+		// Post Data - application/x-www-form-urlencoded
+		if (! empty($config['form_params']) && is_array($config['form_params']))
+		{
+			$postFields                      = http_build_query($config['form_params']);
+			$curlOptions[CURLOPT_POSTFIELDS] = $postFields;
+
+			// Ensure content-length is set, since CURL doesn't seem to
+			// calculate it when HTTPHEADER is set.
+			$this->setHeader('Content-Length', (string) strlen($postFields));
+			$this->setHeader('Content-Type', 'application/x-www-form-urlencoded');
+		}
+
+		// Post Data - multipart/form-data
+		if (! empty($config['multipart']) && is_array($config['multipart']))
+		{
+			// setting the POSTFIELDS option automatically sets multipart
+			$curlOptions[CURLOPT_POSTFIELDS] = $config['multipart'];
+		}
+
+		// HTTP Errors
+		$curlOptions[CURLOPT_FAILONERROR] = array_key_exists('http_errors', $config) ? (bool) $config['http_errors'] : true;
+
+		// JSON
+		if (isset($config['json']))
+		{
+			// Will be set as the body in `applyBody()`
+			$json = json_encode($config['json']);
+			$this->setBody($json);
+			$this->setHeader('Content-Type', 'application/json');
+			$this->setHeader('Content-Length', (string) strlen($json));
+		}
+
+		// version
+		if (! empty($config['version']))
+		{
+			if ($config['version'] === 1.0)
+			{
+				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
+			}
+			elseif ($config['version'] === 1.1)
+			{
+				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
+			}
+		}
+
+		// Cookie
+		if (isset($config['cookie']))
+		{
+			$curlOptions[CURLOPT_COOKIEJAR]  = $config['cookie'];
+			$curlOptions[CURLOPT_COOKIEFILE] = $config['cookie'];
+		}
+
+		// User Agent
+		if (isset($config['user_agent']))
+		{
+			$curlOptions[CURLOPT_USERAGENT] = $config['user_agent'];
+		}
+
+		return $curlOptions;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the actual work of initializing cURL, setting the options,
+	 * and grabbing the output.
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @param array $curlOptions
+	 *
+	 * @return string
+	 */
+	protected function sendRequest(array $curlOptions = []): string
+	{
+		$ch = curl_init();
+
+		curl_setopt_array($ch, $curlOptions);
+
+		// Send the request and wait for a response.
+		$output = curl_exec($ch);
+
+		if ($output === false)
+		{
+			throw HTTPException::forCurlError((string) curl_errno($ch), curl_error($ch));
+		}
+
+		curl_close($ch);
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
new file mode 100644
index 0000000..89538c4
--- /dev/null
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -0,0 +1,810 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use Config\ContentSecurityPolicy as ContentSecurityPolicyConfig;
+
+/**
+ * Provides tools for working with the Content-Security-Policy header
+ * to help defeat XSS attacks.
+ *
+ * @see http://www.w3.org/TR/CSP/
+ * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
+ * @see http://content-security-policy.com/
+ * @see https://www.owasp.org/index.php/Content_Security_Policy
+ */
+class ContentSecurityPolicy
+{
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $baseURI = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $childSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array
+	 */
+	protected $connectSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $defaultSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $fontSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $formAction = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $frameAncestors = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $frameSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $imageSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $mediaSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $objectSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $pluginTypes = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var string
+	 */
+	protected $reportURI;
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $sandbox = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $scriptSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $styleSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array|string
+	 */
+	protected $manifestSrc = [];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var boolean
+	 */
+	protected $upgradeInsecureRequests = false;
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var boolean
+	 */
+	protected $reportOnly = false;
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array
+	 */
+	protected $validSources = [
+		'self',
+		'none',
+		'unsafe-inline',
+		'unsafe-eval',
+	];
+
+	/**
+	 * Used for security enforcement
+	 *
+	 * @var array
+	 */
+	protected $nonces = [];
+
+	/**
+	 * An array of header info since we have
+	 * to build ourself before passing to Response.
+	 *
+	 * @var array
+	 */
+	protected $tempHeaders = [];
+
+	/**
+	 * An array of header info to build
+	 * that should only be reported.
+	 *
+	 * @var array
+	 */
+	protected $reportOnlyHeaders = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * Stores our default values from the Config file.
+	 *
+	 * @param ContentSecurityPolicyConfig $config
+	 */
+	public function __construct(ContentSecurityPolicyConfig $config)
+	{
+		foreach (get_object_vars($config) as $setting => $value)
+		{
+			if (property_exists($this, $setting))
+			{
+				$this->{$setting} = $value;
+			}
+		}
+	}
+
+	/**
+	 * Compiles and sets the appropriate headers in the request.
+	 *
+	 * Should be called just prior to sending the response to the user agent.
+	 *
+	 * @param ResponseInterface $response
+	 *
+	 * @return void
+	 */
+	public function finalize(ResponseInterface &$response)
+	{
+		$this->generateNonces($response);
+		$this->buildHeaders($response);
+	}
+
+	/**
+	 * If TRUE, nothing will be restricted. Instead all violations will
+	 * be reported to the reportURI for monitoring. This is useful when
+	 * you are just starting to implement the policy, and will help
+	 * determine what errors need to be addressed before you turn on
+	 * all filtering.
+	 *
+	 * @param boolean $value
+	 *
+	 * @return $this
+	 */
+	public function reportOnly(bool $value = true)
+	{
+		$this->reportOnly = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new base_uri value. Can be either a URI class or a simple string.
+	 *
+	 * base_uri restricts the URLs that can appear in a pageā€™s <base> element.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-base-uri
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addBaseURI($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'baseURI', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for a form's action. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * child-src lists the URLs for workers and embedded frame contents.
+	 * For example: child-src https://youtube.com would enable embedding
+	 * videos from YouTube but not from other origins.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-child-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addChildSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'childSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for a form's action. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * connect-src limits the origins to which you can connect
+	 * (via XHR, WebSockets, and EventSource).
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-connect-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addConnectSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'connectSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for a form's action. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * default_src is the URI that is used for many of the settings when
+	 * no other source has been set.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-default-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function setDefaultSrc($uri, bool $explicitReporting = null)
+	{
+		$this->defaultSrc = [(string) $uri => $explicitReporting ?? $this->reportOnly];
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for a form's action. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * font-src specifies the origins that can serve web fonts.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-font-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addFontSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'fontSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for a form's action. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-form-action
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addFormAction($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'formAction', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new resource that should allow embedding the resource using
+	 * <frame>, <iframe>, <object>, <embed>, or <applet>
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-frame-ancestors
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addFrameAncestor($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'frameAncestors', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for valid frame sources. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-frame-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addFrameSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'frameSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new valid endpoint for valid image sources. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-img-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addImageSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'imageSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for valid video and audio. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-media-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addMediaSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'mediaSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for manifest sources. Can be either
+	 * a URI class or simple string.
+	 *
+	 * @see https://www.w3.org/TR/CSP/#directive-manifest-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addManifestSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'manifestSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for Flash and other plugin sources. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-object-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addObjectSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'objectSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Limits the types of plugins that can be used. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-plugin-types
+	 *
+	 * @param string|array $mime              One or more plugin mime types, separate by spaces
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addPluginType($mime, bool $explicitReporting = null)
+	{
+		$this->addOption($mime, 'pluginTypes', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Specifies a URL where a browser will send reports when a content
+	 * security policy is violated. Can be either a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-report-uri
+	 *
+	 * @param string $uri
+	 *
+	 * @return $this
+	 */
+	public function setReportURI(string $uri)
+	{
+		$this->reportURI = $uri;
+
+		return $this;
+	}
+
+	/**
+	 * specifies an HTML sandbox policy that the user agent applies to
+	 * the protected resource.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-sandbox
+	 *
+	 * @param string|array $flags             An array of sandbox flags that can be added to the directive.
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addSandbox($flags, bool $explicitReporting = null)
+	{
+		$this->addOption($flags, 'sandbox', $explicitReporting ?? $this->reportOnly);
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for javascript file sources. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-connect-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addScriptSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'scriptSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new valid endpoint for CSS file sources. Can be either
+	 * a URI class or a simple string.
+	 *
+	 * @see http://www.w3.org/TR/CSP/#directive-connect-src
+	 *
+	 * @param string|array $uri
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return $this
+	 */
+	public function addStyleSrc($uri, bool $explicitReporting = null)
+	{
+		$this->addOption($uri, 'styleSrc', $explicitReporting ?? $this->reportOnly);
+
+		return $this;
+	}
+
+	/**
+	 * Sets whether the user agents should rewrite URL schemes, changing
+	 * HTTP to HTTPS.
+	 *
+	 * @param boolean $value
+	 *
+	 * @return $this
+	 */
+	public function upgradeInsecureRequests(bool $value = true)
+	{
+		$this->upgradeInsecureRequests = $value;
+
+		return $this;
+	}
+
+	//-------------------------------------------------------------------------
+	// Utility
+	//-------------------------------------------------------------------------
+
+	/**
+	 * DRY method to add an string or array to a class property.
+	 *
+	 * @param string|array $options
+	 * @param string       $target
+	 * @param boolean|null $explicitReporting
+	 *
+	 * @return void
+	 */
+	protected function addOption($options, string $target, bool $explicitReporting = null)
+	{
+		// Ensure we have an array to work with...
+		if (is_string($this->{$target}))
+		{
+			$this->{$target} = [$this->{$target}];
+		}
+
+		if (is_array($options))
+		{
+			foreach ($options as $opt)
+			{
+				$this->{$target}[$opt] = $explicitReporting ?? $this->reportOnly;
+			}
+		}
+		else
+		{
+			$this->{$target}[$options] = $explicitReporting ?? $this->reportOnly;
+		}
+	}
+
+	/**
+	 * Scans the body of the request message and replaces any nonce
+	 * placeholders with actual nonces, that we'll then add to our
+	 * headers.
+	 *
+	 * @param ResponseInterface $response
+	 *
+	 * @return void
+	 */
+	protected function generateNonces(ResponseInterface &$response)
+	{
+		$body = $response->getBody();
+
+		if (empty($body))
+		{
+			return;
+		}
+
+		if (! is_array($this->styleSrc))
+		{
+			$this->styleSrc = [$this->styleSrc];
+		}
+
+		if (! is_array($this->scriptSrc))
+		{
+			$this->scriptSrc = [$this->scriptSrc];
+		}
+
+		// Replace style placeholders with nonces
+		$body = preg_replace_callback('/{csp-style-nonce}/', function ($matches) {
+			$nonce = bin2hex(random_bytes(12));
+
+			$this->styleSrc[] = 'nonce-' . $nonce;
+
+			return "nonce=\"{$nonce}\"";
+		}, $body);
+
+		// Replace script placeholders with nonces
+		$body = preg_replace_callback('/{csp-script-nonce}/', function ($matches) {
+			$nonce = bin2hex(random_bytes(12));
+
+			$this->scriptSrc[] = 'nonce-' . $nonce;
+
+			return "nonce=\"{$nonce}\"";
+		}, $body);
+
+		$response->setBody($body);
+	}
+
+	/**
+	 * Based on the current state of the elements, will add the appropriate
+	 * Content-Security-Policy and Content-Security-Policy-Report-Only headers
+	 * with their values to the response object.
+	 *
+	 * @param ResponseInterface $response
+	 *
+	 * @return void
+	 */
+	protected function buildHeaders(ResponseInterface &$response)
+	{
+		/**
+		 * Ensure both headers are available and arrays...
+		 *
+		 * @var Response $response
+		 */
+		$response->setHeader('Content-Security-Policy', []);
+		$response->setHeader('Content-Security-Policy-Report-Only', []);
+
+		$directives = [
+			'base-uri'        => 'baseURI',
+			'child-src'       => 'childSrc',
+			'connect-src'     => 'connectSrc',
+			'default-src'     => 'defaultSrc',
+			'font-src'        => 'fontSrc',
+			'form-action'     => 'formAction',
+			'frame-ancestors' => 'frameAncestors',
+			'frame-src'       => 'frameSrc',
+			'img-src'         => 'imageSrc',
+			'media-src'       => 'mediaSrc',
+			'object-src'      => 'objectSrc',
+			'plugin-types'    => 'pluginTypes',
+			'script-src'      => 'scriptSrc',
+			'style-src'       => 'styleSrc',
+			'manifest-src'    => 'manifestSrc',
+			'sandbox'         => 'sandbox',
+			'report-uri'      => 'reportURI',
+		];
+
+		// inject default base & default URIs if needed
+		if (empty($this->baseURI))
+		{
+			$this->baseURI = 'self';
+		}
+
+		if (empty($this->defaultSrc))
+		{
+			$this->defaultSrc = 'self';
+		}
+
+		foreach ($directives as $name => $property)
+		{
+			if (! empty($this->{$property}))
+			{
+				$this->addToHeader($name, $this->{$property});
+			}
+		}
+
+		// Compile our own header strings here since if we just
+		// append it to the response, it will be joined with
+		// commas, not semi-colons as we need.
+		if (! empty($this->tempHeaders))
+		{
+			$header = '';
+
+			foreach ($this->tempHeaders as $name => $value)
+			{
+				$header .= " {$name} {$value};";
+			}
+
+			// add token only if needed
+			if ($this->upgradeInsecureRequests)
+			{
+				$header .= ' upgrade-insecure-requests;';
+			}
+
+			$response->appendHeader('Content-Security-Policy', $header);
+		}
+
+		if (! empty($this->reportOnlyHeaders))
+		{
+			$header = '';
+
+			foreach ($this->reportOnlyHeaders as $name => $value)
+			{
+				$header .= " {$name} {$value};";
+			}
+
+			$response->appendHeader('Content-Security-Policy-Report-Only', $header);
+		}
+
+		$this->tempHeaders       = [];
+		$this->reportOnlyHeaders = [];
+	}
+
+	/**
+	 * Adds a directive and it's options to the appropriate header. The $values
+	 * array might have options that are geared toward either the regular or the
+	 * reportOnly header, since it's viable to have both simultaneously.
+	 *
+	 * @param string            $name
+	 * @param array|string|null $values
+	 *
+	 * @return void
+	 */
+	protected function addToHeader(string $name, $values = null)
+	{
+		if (is_string($values))
+		{
+			$values = [$values => 0];
+		}
+
+		$sources       = [];
+		$reportSources = [];
+
+		foreach ($values as $value => $reportOnly)
+		{
+			if (is_numeric($value) && is_string($reportOnly) && ! empty($reportOnly))
+			{
+				$value      = $reportOnly;
+				$reportOnly = 0;
+			}
+
+			if ($reportOnly === true)
+			{
+				$reportSources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
+			}
+			elseif (strpos($value, 'nonce-') === 0)
+			{
+				$sources[] = "'{$value}'";
+			}
+			else
+				{
+					$sources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
+			}
+		}
+
+		if (! empty($sources))
+		{
+			$this->tempHeaders[$name] = implode(' ', $sources);
+		}
+
+		if (! empty($reportSources))
+		{
+			$this->reportOnlyHeaders[$name] = implode(' ', $reportSources);
+		}
+	}
+}
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
new file mode 100644
index 0000000..97f0bb9
--- /dev/null
+++ b/system/HTTP/DownloadResponse.php
@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Exceptions\DownloadException;
+use CodeIgniter\Files\File;
+use Config\Mimes;
+
+/**
+ * HTTP response when a download is requested.
+ */
+class DownloadResponse extends Response
+{
+	/**
+	 * Download file name
+	 *
+	 * @var string
+	 */
+	private $filename;
+
+	/**
+	 * Download for file
+	 *
+	 * @var File|null
+	 */
+	private $file;
+
+	/**
+	 * mime set flag
+	 *
+	 * @var boolean
+	 */
+	private $setMime;
+
+	/**
+	 * Download for binary
+	 *
+	 * @var string|null
+	 */
+	private $binary;
+
+	/**
+	 * Download charset
+	 *
+	 * @var string
+	 */
+	private $charset = 'UTF-8';
+
+	/**
+	 * Download reason
+	 *
+	 * @var string
+	 */
+	protected $reason = 'OK';
+
+	/**
+	 * The current status code for this response.
+	 *
+	 * @var integer
+	 */
+	protected $statusCode = 200;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string  $filename
+	 * @param boolean $setMime
+	 */
+	public function __construct(string $filename, bool $setMime)
+	{
+		parent::__construct(config('App'));
+
+		$this->filename = $filename;
+		$this->setMime  = $setMime;
+
+		// Make sure the content type is either specified or detected
+		$this->removeHeader('Content-Type');
+	}
+
+	/**
+	 * set download for binary string.
+	 *
+	 * @param string $binary
+	 */
+	public function setBinary(string $binary)
+	{
+		if ($this->file !== null)
+		{
+			throw DownloadException::forCannotSetBinary();
+		}
+
+		$this->binary = $binary;
+	}
+
+	/**
+	 * set download for file.
+	 *
+	 * @param string $filepath
+	 */
+	public function setFilePath(string $filepath)
+	{
+		if ($this->binary !== null)
+		{
+			throw DownloadException::forCannotSetFilePath($filepath);
+		}
+
+		$this->file = new File($filepath, true);
+	}
+
+	/**
+	 * set name for the download.
+	 *
+	 * @param string $filename
+	 *
+	 * @return $this
+	 */
+	public function setFileName(string $filename)
+	{
+		$this->filename = $filename;
+		return $this;
+	}
+
+	/**
+	 * get content length.
+	 *
+	 * @return integer
+	 */
+	public function getContentLength() : int
+	{
+		if (is_string($this->binary))
+		{
+			return strlen($this->binary);
+		}
+
+		if ($this->file instanceof File)
+		{
+			return $this->file->getSize();
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Set content type by guessing mime type from file extension
+	 */
+	private function setContentTypeByMimeType()
+	{
+		$mime    = null;
+		$charset = '';
+
+		if ($this->setMime === true && ($lastDotPosition = strrpos($this->filename, '.')) !== false)
+		{
+			$mime    = Mimes::guessTypeFromExtension(substr($this->filename, $lastDotPosition + 1));
+			$charset = $this->charset;
+		}
+
+		if (! is_string($mime))
+		{
+			// Set the default MIME type to send
+			$mime    = 'application/octet-stream';
+			$charset = '';
+		}
+
+		$this->setContentType($mime, $charset);
+	}
+
+	/**
+	 * get download filename.
+	 *
+	 * @return string
+	 */
+	private function getDownloadFileName(): string
+	{
+		$filename  = $this->filename;
+		$x         = explode('.', $this->filename);
+		$extension = end($x);
+
+		/* It was reported that browsers on Android 2.1 (and possibly older as well)
+		 * need to have the filename extension upper-cased in order to be able to
+		 * download it.
+		 *
+		 * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
+		 */
+		// @todo: depend super global
+		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT'])
+				&& preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT']))
+		{
+			$x[count($x) - 1] = strtoupper($extension);
+			$filename         = implode('.', $x);
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * get Content-Disposition Header string.
+	 *
+	 * @return string
+	 */
+	private function getContentDisposition() : string
+	{
+		$downloadFilename = $this->getDownloadFileName();
+
+		$utf8Filename = $downloadFilename;
+
+		if (strtoupper($this->charset) !== 'UTF-8')
+		{
+			$utf8Filename = mb_convert_encoding($downloadFilename, 'UTF-8', $this->charset);
+		}
+
+		$result = sprintf('attachment; filename="%s"', $downloadFilename);
+
+		if ($utf8Filename)
+		{
+			$result .= '; filename*=UTF-8\'\'' . rawurlencode($utf8Filename);
+		}
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disallows status changing.
+	 *
+	 * @param integer $code
+	 * @param string  $reason
+	 *
+	 * @throws DownloadException
+	 */
+	public function setStatusCode(int $code, string $reason = '')
+	{
+		throw DownloadException::forCannotSetStatusCode($code, $reason);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets the Content Type header for this response with the mime type
+	 * and, optionally, the charset.
+	 *
+	 * @param string $mime
+	 * @param string $charset
+	 *
+	 * @return ResponseInterface
+	 */
+	public function setContentType(string $mime, string $charset = 'UTF-8')
+	{
+		parent::setContentType($mime, $charset);
+
+		if ($charset !== '')
+		{
+			$this->charset = $charset;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the appropriate headers to ensure this response
+	 * is not cached by the browsers.
+	 */
+	public function noCache(): self
+	{
+		$this->removeHeader('Cache-control');
+
+		$this->setHeader('Cache-control', ['private', 'no-transform', 'no-store', 'must-revalidate']);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disables cache configuration.
+	 *
+	 * @param array $options
+	 *
+	 * @throws DownloadException
+	 */
+	public function setCache(array $options = [])
+	{
+		throw DownloadException::forCannotSetCache();
+	}
+
+	//--------------------------------------------------------------------
+	// Output Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @todo Do downloads need CSP or Cookies? Compare with ResponseTrait::send()
+	 */
+	public function send()
+	{
+		$this->buildHeaders();
+		$this->sendHeaders();
+		$this->sendBody();
+
+		return $this;
+	}
+
+	/**
+	 * set header for file download.
+	 */
+	public function buildHeaders()
+	{
+		if (! $this->hasHeader('Content-Type'))
+		{
+			$this->setContentTypeByMimeType();
+		}
+
+		$this->setHeader('Content-Disposition', $this->getContentDisposition());
+		$this->setHeader('Expires-Disposition', '0');
+		$this->setHeader('Content-Transfer-Encoding', 'binary');
+		$this->setHeader('Content-Length', (string) $this->getContentLength());
+		$this->noCache();
+	}
+
+	/**
+	 * output download file text.
+	 *
+	 * @throws DownloadException
+	 *
+	 * @return DownloadResponse
+	 */
+	public function sendBody()
+	{
+		if ($this->binary !== null)
+		{
+			return $this->sendBodyByBinary();
+		}
+
+		if ($this->file !== null)
+		{
+			return $this->sendBodyByFilePath();
+		}
+
+		throw DownloadException::forNotFoundDownloadSource();
+	}
+
+	/**
+	 * output download text by file.
+	 *
+	 * @return DownloadResponse
+	 */
+	private function sendBodyByFilePath()
+	{
+		$splFileObject = $this->file->openFile('rb');
+
+		// Flush 1MB chunks of data
+		while (! $splFileObject->eof() && ($data = $splFileObject->fread(1048576)) !== false)
+		{
+			echo $data;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * output download text by binary
+	 *
+	 * @return DownloadResponse
+	 */
+	private function sendBodyByBinary()
+	{
+		echo $this->binary;
+
+		return $this;
+	}
+}
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
new file mode 100644
index 0000000..d2d12ab
--- /dev/null
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -0,0 +1,249 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+/**
+ * Things that can go wrong with HTTP
+ */
+class HTTPException extends FrameworkException
+{
+	/**
+	 * For CurlRequest
+	 *
+	 * @return HTTPException
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function forMissingCurl()
+	{
+		return new static(lang('HTTP.missingCurl'));
+	}
+
+	/**
+	 * For CurlRequest
+	 *
+	 * @param string $cert
+	 *
+	 * @return HTTPException
+	 */
+	public static function forSSLCertNotFound(string $cert)
+	{
+		return new static(lang('HTTP.sslCertNotFound', [$cert]));
+	}
+
+	/**
+	 * For CurlRequest
+	 *
+	 * @param string $key
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidSSLKey(string $key)
+	{
+		return new static(lang('HTTP.invalidSSLKey', [$key]));
+	}
+
+	/**
+	 * For CurlRequest
+	 *
+	 * @param string $errorNum
+	 * @param string $error
+	 *
+	 * @return HTTPException
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function forCurlError(string $errorNum, string $error)
+	{
+		return new static(lang('HTTP.curlError', [$errorNum, $error]));
+	}
+
+	/**
+	 * For IncomingRequest
+	 *
+	 * @param string $type
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidNegotiationType(string $type)
+	{
+		return new static(lang('HTTP.invalidNegotiationType', [$type]));
+	}
+
+	/**
+	 * For Message
+	 *
+	 * @param string $protocols
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidHTTPProtocol(string $protocols)
+	{
+		return new static(lang('HTTP.invalidHTTPProtocol', [$protocols]));
+	}
+
+	/**
+	 * For Negotiate
+	 *
+	 * @return HTTPException
+	 */
+	public static function forEmptySupportedNegotiations()
+	{
+		return new static(lang('HTTP.emptySupportedNegotiations'));
+	}
+
+	/**
+	 * For RedirectResponse
+	 *
+	 * @param string $route
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidRedirectRoute(string $route)
+	{
+		return new static(lang('HTTP.invalidRoute', [$route]));
+	}
+
+	/**
+	 * For Response
+	 *
+	 * @return HTTPException
+	 */
+	public static function forMissingResponseStatus()
+	{
+		return new static(lang('HTTP.missingResponseStatus'));
+	}
+
+	/**
+	 * For Response
+	 *
+	 * @param integer $code
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidStatusCode(int $code)
+	{
+		return new static(lang('HTTP.invalidStatusCode', [$code]));
+	}
+
+	/**
+	 * For Response
+	 *
+	 * @param integer $code
+	 *
+	 * @return HTTPException
+	 */
+	public static function forUnkownStatusCode(int $code)
+	{
+		return new static(lang('HTTP.unknownStatusCode', [$code]));
+	}
+
+	/**
+	 * For URI
+	 *
+	 * @param string $uri
+	 *
+	 * @return HTTPException
+	 */
+	public static function forUnableToParseURI(string $uri)
+	{
+		return new static(lang('HTTP.cannotParseURI', [$uri]));
+	}
+
+	/**
+	 * For URI
+	 *
+	 * @param integer $segment
+	 *
+	 * @return HTTPException
+	 */
+	public static function forURISegmentOutOfRange(int $segment)
+	{
+		return new static(lang('HTTP.segmentOutOfRange', [$segment]));
+	}
+
+	/**
+	 * For URI
+	 *
+	 * @param integer $port
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidPort(int $port)
+	{
+		return new static(lang('HTTP.invalidPort', [$port]));
+	}
+
+	/**
+	 * For URI
+	 *
+	 * @return HTTPException
+	 */
+	public static function forMalformedQueryString()
+	{
+		return new static(lang('HTTP.malformedQueryString'));
+	}
+
+	/**
+	 * For Uploaded file move
+	 *
+	 * @return HTTPException
+	 */
+	public static function forAlreadyMoved()
+	{
+		return new static(lang('HTTP.alreadyMoved'));
+	}
+
+	/**
+	 * For Uploaded file move
+	 *
+	 * @param string|null $path
+	 *
+	 * @return HTTPException
+	 */
+	public static function forInvalidFile(string $path = null)
+	{
+		return new static(lang('HTTP.invalidFile'));
+	}
+
+	/**
+	 * For Uploaded file move
+	 *
+	 * @param string $source
+	 * @param string $target
+	 * @param string $error
+	 *
+	 * @return HTTPException
+	 */
+	public static function forMoveFailed(string $source, string $target, string $error)
+	{
+		return new static(lang('HTTP.moveFailed', [$source, $target, $error]));
+	}
+
+	/**
+	 * For Invalid SameSite attribute setting
+	 *
+	 * @param string $samesite
+	 *
+	 * @return HTTPException
+	 *
+	 * @deprecated Use `CookieException::forInvalidSameSite()` instead.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function forInvalidSameSiteSetting(string $samesite)
+	{
+		return new static(lang('Security.invalidSameSiteSetting', [$samesite]));
+	}
+}
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
new file mode 100644
index 0000000..717d32a
--- /dev/null
+++ b/system/HTTP/Files/FileCollection.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP\Files;
+
+use RecursiveArrayIterator;
+use RecursiveIteratorIterator;
+
+/**
+ * Class FileCollection
+ *
+ * Provides easy access to uploaded files for a request.
+ */
+class FileCollection
+{
+	/**
+	 * An array of UploadedFile instances for any files
+	 * uploaded as part of this request.
+	 * Populated the first time either files(), file(), or hasFile()
+	 * is called.
+	 *
+	 * @var array|null
+	 */
+	protected $files;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of all uploaded files that were found.
+	 * Each element in the array will be an instance of UploadedFile.
+	 * The key of each element will be the client filename.
+	 *
+	 * @return array|null
+	 */
+	public function all()
+	{
+		$this->populateFiles();
+
+		return $this->files;
+	}
+
+	/**
+	 * Attempts to get a single file from the collection of uploaded files.
+	 *
+	 * @param string $name
+	 *
+	 * @return UploadedFile|null
+	 */
+	public function getFile(string $name)
+	{
+		$this->populateFiles();
+
+		if ($this->hasFile($name))
+		{
+			if (strpos($name, '.') !== false)
+			{
+				$name         = explode('.', $name);
+				$uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
+				return ($uploadedFile instanceof UploadedFile) ?
+					 $uploadedFile : null;
+			}
+
+			if (array_key_exists($name, $this->files))
+			{
+				$uploadedFile = $this->files[$name];
+				return  ($uploadedFile instanceof UploadedFile) ?
+					$uploadedFile : null;
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verify if a file exist in the collection of uploaded files and is have been uploaded with multiple option.
+	 *
+	 * @param string $name
+	 *
+	 * @return array|null
+	 */
+	public function getFileMultiple(string $name)
+	{
+		$this->populateFiles();
+
+		if ($this->hasFile($name))
+		{
+			if (strpos($name, '.') !== false)
+			{
+				$name         = explode('.', $name);
+				$uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
+
+				return (is_array($uploadedFile) && ($uploadedFile[array_key_first($uploadedFile)] instanceof UploadedFile)) ?
+					$uploadedFile : null;
+			}
+
+			if (array_key_exists($name, $this->files))
+			{
+				$uploadedFile = $this->files[$name];
+				return (is_array($uploadedFile) && ($uploadedFile[array_key_first($uploadedFile)] instanceof UploadedFile)) ?
+					$uploadedFile : null;
+			}
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks whether an uploaded file with name $fileID exists in
+	 * this request.
+	 *
+	 * @param string $fileID The name of the uploaded file (from the input)
+	 *
+	 * @return boolean
+	 */
+	public function hasFile(string $fileID): bool
+	{
+		$this->populateFiles();
+
+		if (strpos($fileID, '.') !== false)
+		{
+			$segments = explode('.', $fileID);
+
+			$el = $this->files;
+
+			foreach ($segments as $segment)
+			{
+				if (! array_key_exists($segment, $el))
+				{
+					return false;
+				}
+
+				$el = $el[$segment];
+			}
+
+			return true;
+		}
+
+		return isset($this->files[$fileID]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Taking information from the $_FILES array, it creates an instance
+	 * of UploadedFile for each one, saving the results to this->files.
+	 *
+	 * Called by files(), file(), and hasFile()
+	 */
+	protected function populateFiles()
+	{
+		if (is_array($this->files))
+		{
+			return;
+		}
+
+		$this->files = [];
+
+		if (empty($_FILES))
+		{
+			return;
+		}
+
+		$files = $this->fixFilesArray($_FILES);
+
+		foreach ($files as $name => $file)
+		{
+			$this->files[$name] = $this->createFileObject($file);
+		}
+	}
+
+	/**
+	 * Given a file array, will create UploadedFile instances. Will
+	 * loop over an array and create objects for each.
+	 *
+	 * @param array $array
+	 *
+	 * @return array|UploadedFile
+	 */
+	protected function createFileObject(array $array)
+	{
+		if (! isset($array['name']))
+		{
+			$output = [];
+
+			foreach ($array as $key => $values)
+			{
+				if (! is_array($values))
+				{
+					continue;
+				}
+
+				$output[$key] = $this->createFileObject($values);
+			}
+
+			return $output;
+		}
+
+		return new UploadedFile(
+				$array['tmp_name'] ?? null, $array['name'] ?? null, $array['type'] ?? null, $array['size'] ?? null, $array['error'] ?? null
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reformats the odd $_FILES array into something much more like
+	 * we would expect, with each object having its own array.
+	 *
+	 * Thanks to Jack Sleight on the PHP Manual page for the basis
+	 * of this method.
+	 *
+	 * @see http://php.net/manual/en/reserved.variables.files.php#118294
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	protected function fixFilesArray(array $data): array
+	{
+		$output = [];
+
+		foreach ($data as $name => $array)
+		{
+			foreach ($array as $field => $value)
+			{
+				$pointer = &$output[$name];
+
+				if (! is_array($value))
+				{
+					$pointer[$field] = $value;
+					continue;
+				}
+
+				$stack    = [&$pointer];
+				$iterator = new RecursiveIteratorIterator(
+						new RecursiveArrayIterator($value), RecursiveIteratorIterator::SELF_FIRST
+				);
+
+				foreach ($iterator as $key => $val)
+				{
+					array_splice($stack, $iterator->getDepth() + 1);
+					$pointer = &$stack[count($stack) - 1];
+					$pointer = &$pointer[$key];
+					$stack[] = &$pointer;
+					if (! $iterator->hasChildren())
+					{
+						$pointer[$field] = $val;
+					}
+				}
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Navigate through a array looking for a particular index
+	 *
+	 * @param array $index The index sequence we are navigating down
+	 * @param array $value The portion of the array to process
+	 *
+	 * @return mixed
+	 */
+	protected function getValueDotNotationSyntax(array $index, array $value)
+	{
+		if (! empty($index))
+		{
+			$currentIndex = array_shift($index);
+		}
+		if (isset($currentIndex) && is_array($index) && $index && is_array($value[$currentIndex]) && $value[$currentIndex])
+		{
+			return $this->getValueDotNotationSyntax($index, $value[$currentIndex]);
+		}
+
+		return (isset($currentIndex) && isset($value[$currentIndex])) ? $value[$currentIndex] : null;
+	}
+}
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
new file mode 100644
index 0000000..38926f6
--- /dev/null
+++ b/system/HTTP/Files/UploadedFile.php
@@ -0,0 +1,385 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP\Files;
+
+use CodeIgniter\Files\File;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use Config\Mimes;
+use Exception;
+use InvalidArgumentException;
+use RuntimeException;
+
+/**
+ * Value object representing a single file uploaded through an
+ * HTTP request. Used by the IncomingRequest class to
+ * provide files.
+ *
+ * Typically, implementors will extend the SplFileInfo class.
+ */
+class UploadedFile extends File implements UploadedFileInterface
+{
+	/**
+	 * The path to the temporary file.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * The original filename as provided by the client.
+	 *
+	 * @var string
+	 */
+	protected $originalName;
+
+	/**
+	 * The filename given to a file during a move.
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * The type of file as provided by PHP
+	 *
+	 * @var string
+	 */
+	protected $originalMimeType;
+
+	/**
+	 * The error constant of the upload
+	 * (one of PHP's UPLOADERRXXX constants)
+	 *
+	 * @var integer
+	 */
+	protected $error;
+
+	/**
+	 * Whether the file has been moved already or not.
+	 *
+	 * @var boolean
+	 */
+	protected $hasMoved = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Accepts the file information as would be filled in from the $_FILES array.
+	 *
+	 * @param string  $path         The temporary location of the uploaded file.
+	 * @param string  $originalName The client-provided filename.
+	 * @param string  $mimeType     The type of file as provided by PHP
+	 * @param integer $size         The size of the file, in bytes
+	 * @param integer $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
+	 */
+	public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null)
+	{
+		$this->path             = $path;
+		$this->name             = $originalName;
+		$this->originalName     = $originalName;
+		$this->originalMimeType = $mimeType;
+		$this->size             = $size;
+		$this->error            = $error;
+
+		parent::__construct($path, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Move the uploaded file to a new location.
+	 *
+	 * $targetPath may be an absolute path, or a relative path. If it is a
+	 * relative path, resolution should be the same as used by PHP's rename()
+	 * function.
+	 *
+	 * The original file MUST be removed on completion.
+	 *
+	 * If this method is called more than once, any subsequent calls MUST raise
+	 * an exception.
+	 *
+	 * When used in an SAPI environment where $_FILES is populated, when writing
+	 * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+	 * used to ensure permissions and upload status are verified correctly.
+	 *
+	 * If you wish to move to a stream, use getStream(), as SAPI operations
+	 * cannot guarantee writing to stream destinations.
+	 *
+	 * @see http://php.net/is_uploaded_file
+	 * @see http://php.net/move_uploaded_file
+	 *
+	 * @param string  $targetPath Path to which to move the uploaded file.
+	 * @param string  $name       the name to rename the file to.
+	 * @param boolean $overwrite  State for indicating whether to overwrite the previously generated file with the same
+	 *                            name or not.
+	 *
+	 * @return boolean
+	 *
+	 * @throws InvalidArgumentException if the $path specified is invalid.
+	 * @throws RuntimeException on any error during the move operation.
+	 * @throws RuntimeException on the second or subsequent call to the method.
+	 */
+	public function move(string $targetPath, string $name = null, bool $overwrite = false)
+	{
+		$targetPath = rtrim($targetPath, '/') . '/';
+		$targetPath = $this->setPath($targetPath); //set the target path
+
+		if ($this->hasMoved)
+		{
+			throw HTTPException::forAlreadyMoved();
+		}
+
+		if (! $this->isValid())
+		{
+			throw HTTPException::forInvalidFile();
+		}
+
+		$name        = is_null($name) ? $this->getName() : $name;
+		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
+
+		try
+		{
+			move_uploaded_file($this->path, $destination);
+		}
+		catch (Exception $e)
+		{
+			$error   = error_get_last();
+			$message = isset($error['message']) ? strip_tags($error['message']) : '';
+			throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
+		}
+
+		@chmod($targetPath, 0777 & ~umask());
+
+		// Success, so store our new information
+		$this->path     = $targetPath;
+		$this->name     = basename($destination);
+		$this->hasMoved = true;
+
+		return true;
+	}
+
+	/**
+	 * create file target path if
+	 * the set path does not exist
+	 *
+	 * @param string $path
+	 *
+	 * @return string The path set or created.
+	 */
+	protected function setPath(string $path): string
+	{
+		if (! is_dir($path))
+		{
+			mkdir($path, 0777, true);
+			//create the index.html file
+			if (! is_file($path . 'index.html'))
+			{
+				$file = fopen($path . 'index.html', 'x+');
+				fclose($file);
+			}
+		}
+		return $path;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether the file has been moved or not. If it has,
+	 * the move() method will not work and certain properties, like
+	 * the tempName, will no longer be available.
+	 *
+	 * @return boolean
+	 */
+	public function hasMoved(): bool
+	{
+		return $this->hasMoved;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the error associated with the uploaded file.
+	 *
+	 * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+	 *
+	 * If the file was uploaded successfully, this method MUST return
+	 * UPLOAD_ERR_OK.
+	 *
+	 * Implementations SHOULD return the value stored in the "error" key of
+	 * the file in the $_FILES array.
+	 *
+	 * @see    http://php.net/manual/en/features.file-upload.errors.php
+	 * @return integer One of PHP's UPLOAD_ERR_XXX constants.
+	 */
+	public function getError(): int
+	{
+		return $this->error ?? UPLOAD_ERR_OK;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get error string
+	 *
+	 * @return string
+	 */
+	public function getErrorString(): string
+	{
+		$errors = [
+			UPLOAD_ERR_OK         => lang('HTTP.uploadErrOk'),
+			UPLOAD_ERR_INI_SIZE   => lang('HTTP.uploadErrIniSize'),
+			UPLOAD_ERR_FORM_SIZE  => lang('HTTP.uploadErrFormSize'),
+			UPLOAD_ERR_PARTIAL    => lang('HTTP.uploadErrPartial'),
+			UPLOAD_ERR_NO_FILE    => lang('HTTP.uploadErrNoFile'),
+			UPLOAD_ERR_CANT_WRITE => lang('HTTP.uploadErrCantWrite'),
+			UPLOAD_ERR_NO_TMP_DIR => lang('HTTP.uploadErrNoTmpDir'),
+			UPLOAD_ERR_EXTENSION  => lang('HTTP.uploadErrExtension'),
+		];
+
+		$error = $this->error ?? UPLOAD_ERR_OK;
+
+		return sprintf($errors[$error] ?? lang('HTTP.uploadErrUnknown'), $this->getName());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the mime type as provided by the client.
+	 * This is NOT a trusted value.
+	 * For a trusted version, use getMimeType() instead.
+	 *
+	 * @return string The media type sent by the client or null if none was provided.
+	 */
+	public function getClientMimeType(): string
+	{
+		return $this->originalMimeType;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the filename. This will typically be the filename sent
+	 * by the client, and should not be trusted. If the file has been
+	 * moved, this will return the final name of the moved file.
+	 *
+	 * @return string The filename sent by the client or null if none was provided.
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the file as provided by the client during upload.
+	 *
+	 * @return string
+	 */
+	public function getClientName(): string
+	{
+		return $this->originalName;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the temporary filename where the file was uploaded to.
+	 *
+	 * @return string
+	 */
+	public function getTempName(): string
+	{
+		return $this->path;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overrides SPLFileInfo's to work with uploaded files, since
+	 * the temp file that's been uploaded doesn't have an extension.
+	 *
+	 * This method tries to guess the extension from the files mime
+	 * type but will return the clientExtension if it fails to do so.
+	 *
+	 * This method will always return a more or less helpfull extension
+	 * but might be insecure if the mime type is not machted. Consider
+	 * using guessExtension for a more safe version.
+	 */
+	public function getExtension(): string
+	{
+		return $this->guessExtension() ?: $this->getClientExtension();
+	}
+
+	/**
+	 * Attempts to determine the best file extension from the file's
+	 * mime type. In contrast to getExtension, this method will return
+	 * an empty string if it fails to determine an extension instead of
+	 * falling back to the unsecure clientExtension.
+	 *
+	 * @return string
+	 */
+	public function guessExtension(): string
+	{
+		return Mimes::guessExtensionFromType($this->getMimeType(), $this->getClientExtension()) ?? '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the original file extension, based on the file name that
+	 * was uploaded. This is NOT a trusted source.
+	 * For a trusted version, use guessExtension() instead.
+	 *
+	 * @return string
+	 */
+	public function getClientExtension(): string
+	{
+		return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether the file was uploaded successfully, based on whether
+	 * it was uploaded via HTTP and has no errors.
+	 *
+	 * @return boolean
+	 */
+	public function isValid(): bool
+	{
+		return is_uploaded_file($this->path) && $this->error === UPLOAD_ERR_OK;
+	}
+
+	/**
+	 * Save the uploaded file to a new location.
+	 *
+	 * By default, upload files are saved in writable/uploads directory. The YYYYMMDD folder
+	 * and random file name will be created.
+	 *
+	 * @param  string $folderName the folder name to writable/uploads directory.
+	 * @param  string $fileName   the name to rename the file to.
+	 * @return string file full path
+	 */
+	public function store(string $folderName = null, string $fileName = null): string
+	{
+		$folderName = rtrim($folderName ?? date('Ymd'), '/') . '/';
+		$fileName   = $fileName ?? $this->getRandomName();
+
+		// Move the uploaded file to a new location.
+		$this->move(WRITEPATH . 'uploads/' . $folderName, $fileName);
+
+		return $folderName . $this->name;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php
new file mode 100644
index 0000000..8ad7eaa
--- /dev/null
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP\Files;
+
+use InvalidArgumentException;
+use RuntimeException;
+
+/**
+ * Value object representing a single file uploaded through an
+ * HTTP request. Used by the IncomingRequest class to
+ * provide files.
+ *
+ * Typically, implementors will extend the SplFileInfo class.
+ */
+interface UploadedFileInterface
+{
+	/**
+	 * Accepts the file information as would be filled in from the $_FILES array.
+	 *
+	 * @param string  $path         The temporary location of the uploaded file.
+	 * @param string  $originalName The client-provided filename.
+	 * @param string  $mimeType     The type of file as provided by PHP
+	 * @param integer $size         The size of the file, in bytes
+	 * @param integer $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
+	 */
+	public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Move the uploaded file to a new location.
+	 *
+	 * $targetPath may be an absolute path, or a relative path. If it is a
+	 * relative path, resolution should be the same as used by PHP's rename()
+	 * function.
+	 *
+	 * The original file MUST be removed on completion.
+	 *
+	 * If this method is called more than once, any subsequent calls MUST raise
+	 * an exception.
+	 *
+	 * When used in an SAPI environment where $_FILES is populated, when writing
+	 * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+	 * used to ensure permissions and upload status are verified correctly.
+	 *
+	 * If you wish to move to a stream, use getStream(), as SAPI operations
+	 * cannot guarantee writing to stream destinations.
+	 *
+	 * @see http://php.net/is_uploaded_file
+	 * @see http://php.net/move_uploaded_file
+	 *
+	 * @param string $targetPath Path to which to move the uploaded file.
+	 * @param string $name       the name to rename the file to.
+	 *
+	 * @throws InvalidArgumentException if the $path specified is invalid.
+	 * @throws RuntimeException on any error during the move operation.
+	 * @throws RuntimeException on the second or subsequent call to the method.
+	 */
+	public function move(string $targetPath, string $name = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether the file has been moved or not. If it has,
+	 * the move() method will not work and certain properties, like
+	 * the tempName, will no longer be available.
+	 *
+	 * @return boolean
+	 */
+	public function hasMoved(): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the error associated with the uploaded file.
+	 *
+	 * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+	 *
+	 * If the file was uploaded successfully, this method MUST return
+	 * UPLOAD_ERR_OK.
+	 *
+	 * Implementations SHOULD return the value stored in the "error" key of
+	 * the file in the $_FILES array.
+	 *
+	 * @see    http://php.net/manual/en/features.file-upload.errors.php
+	 * @return integer One of PHP's UPLOAD_ERR_XXX constants.
+	 */
+	public function getError(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the filename sent by the client.
+	 *
+	 * Do not trust the value returned by this method. A client could send
+	 * a malicious filename with the intention to corrupt or hack your
+	 * application.
+	 *
+	 * Implementations SHOULD return the value stored in the "name" key of
+	 * the file in the $_FILES array.
+	 *
+	 * @return string The filename sent by the client or null if none
+	 *     was provided.
+	 */
+	public function getName(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the temporary filename where the file was uploaded to.
+	 *
+	 * @return string
+	 */
+	public function getTempName(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the original file extension, based on the file name that
+	 * was uploaded. This is NOT a trusted source.
+	 * For a trusted version, use guessExtension() instead.
+	 *
+	 * @return string
+	 */
+	public function getClientExtension(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the mime type as provided by the client.
+	 * This is NOT a trusted value.
+	 * For a trusted version, use getMimeType() instead.
+	 *
+	 * @return string
+	 */
+	public function getClientMimeType(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether the file was uploaded successfully, based on whether
+	 * it was uploaded via HTTP and has no errors.
+	 *
+	 * @return boolean
+	 */
+	public function isValid(): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the destination path for the move operation where overwriting is not expected.
+	 *
+	 * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
+	 * last element is an integer as there may be cases that the delimiter may be present in the filename.
+	 * For the all other cases, it appends an integer starting from zero before the file's extension.
+	 *
+	 * @param string  $destination
+	 * @param string  $delimiter
+	 * @param integer $i
+	 *
+	 * @return string
+	 */
+	public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
new file mode 100644
index 0000000..2f5ce01
--- /dev/null
+++ b/system/HTTP/Header.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+/**
+ * Class Header
+ *
+ * Represents a single HTTP header.
+ */
+class Header
+{
+	/**
+	 * The name of the header.
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * The value of the header. May have more than one
+	 * value. If so, will be an array of strings.
+	 *
+	 * @var string|array
+	 */
+	protected $value;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Header constructor. name is mandatory, if a value is provided, it will be set.
+	 *
+	 * @param string            $name
+	 * @param string|array|null $value
+	 */
+	public function __construct(string $name, $value = null)
+	{
+		$this->name = $name;
+		$this->setValue($value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the header, in the same case it was set.
+	 *
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the raw value of the header. This may return either a string
+	 * of an array, depending on whether the header has multiple values or not.
+	 *
+	 * @return array|string
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the name of the header, overwriting any previous value.
+	 *
+	 * @param string $name
+	 *
+	 * @return $this
+	 */
+	public function setName(string $name)
+	{
+		$this->name = $name;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the value of the header, overwriting any previous value(s).
+	 *
+	 * @param string|array|null $value
+	 *
+	 * @return $this
+	 */
+	public function setValue($value = null)
+	{
+		$this->value = $value ?? '';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Appends a value to the list of values for this header. If the
+	 * header is a single value string, it will be converted to an array.
+	 *
+	 * @param string|array|null $value
+	 *
+	 * @return $this
+	 */
+	public function appendValue($value = null)
+	{
+		if ($value === null)
+		{
+			return $this;
+		}
+
+		if (! is_array($this->value))
+		{
+			$this->value = [$this->value];
+		}
+
+		if (! in_array($value, $this->value, true))
+		{
+			$this->value[] = $value;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepends a value to the list of values for this header. If the
+	 * header is a single value string, it will be converted to an array.
+	 *
+	 * @param string|array|null $value
+	 *
+	 * @return $this
+	 */
+	public function prependValue($value = null)
+	{
+		if ($value === null)
+		{
+			return $this;
+		}
+
+		if (! is_array($this->value))
+		{
+			$this->value = [$this->value];
+		}
+
+		array_unshift($this->value, $value);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a comma-separated string of the values for a single header.
+	 *
+	 * NOTE: Not all header values may be appropriately represented using
+	 * comma concatenation. For such headers, use getHeader() instead
+	 * and supply your own delimiter when concatenating.
+	 *
+	 * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
+	 */
+	public function getValueLine(): string
+	{
+		if (is_string($this->value))
+		{
+			return $this->value;
+		}
+		if (! is_array($this->value))
+		{
+			return '';
+		}
+
+		$options = [];
+
+		foreach ($this->value as $key => $value)
+		{
+			if (is_string($key) && ! is_array($value))
+			{
+				$options[] = $key . '=' . $value;
+			}
+			elseif (is_array($value))
+			{
+				$key       = key($value);
+				$options[] = $key . '=' . $value[$key];
+			}
+			elseif (is_numeric($key))
+			{
+				$options[] = $value;
+			}
+		}
+
+		return implode(', ', $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a representation of the entire header string, including
+	 * the header name and all values converted to the proper format.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->name . ': ' . $this->getValueLine();
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
new file mode 100644
index 0000000..9d3e722
--- /dev/null
+++ b/system/HTTP/IncomingRequest.php
@@ -0,0 +1,860 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\Files\FileCollection;
+use CodeIgniter\HTTP\Files\UploadedFile;
+use Config\App;
+use Config\Services;
+use InvalidArgumentException;
+use Locale;
+
+/**
+ * Class IncomingRequest
+ *
+ * Represents an incoming, getServer-side HTTP request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * Additionally, it encapsulates all data as it has arrived to the
+ * application from the CGI and/or PHP environment, including:
+ *
+ * - The values represented in $_SERVER.
+ * - Any cookies provided (generally via $_COOKIE)
+ * - Query string arguments (generally via $_GET, or as parsed via parse_str())
+ * - Upload files, if any (as represented by $_FILES)
+ * - Deserialized body binds (generally from $_POST)
+ */
+class IncomingRequest extends Request
+{
+	/**
+	 * Enable CSRF flag
+	 *
+	 * Enables a CSRF cookie token to be set.
+	 * Set automatically based on Config setting.
+	 *
+	 * @var boolean
+	 */
+	protected $enableCSRF = false;
+
+	/**
+	 * The URI for this request.
+	 *
+	 * Note: This WILL NOT match the actual URL in the browser since for
+	 * everything this cares about (and the router, etc) is the portion
+	 * AFTER the script name. So, if hosted in a sub-folder this will
+	 * appear different than actual URL. If you need that use getPath().
+	 *
+	 * @var URI
+	 */
+	public $uri;
+
+	/**
+	 * The detected path (relative to SCRIPT_NAME).
+	 *
+	 * Note: current_url() uses this to build its URI,
+	 * so this becomes the source for the "current URL"
+	 * when working with the share request instance.
+	 *
+	 * @var string|null
+	 */
+	protected $path;
+
+	/**
+	 * File collection
+	 *
+	 * @var FileCollection|null
+	 */
+	protected $files;
+
+	/**
+	 * Negotiator
+	 *
+	 * @var Negotiate|null
+	 */
+	protected $negotiator;
+
+	/**
+	 * The default Locale this request
+	 * should operate under.
+	 *
+	 * @var string
+	 */
+	protected $defaultLocale;
+
+	/**
+	 * The current locale of the application.
+	 * Default value is set in Config\App.php
+	 *
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
+	 * Stores the valid locale codes.
+	 *
+	 * @var array
+	 */
+	protected $validLocales = [];
+
+	/**
+	 * Configuration settings.
+	 *
+	 * @var App
+	 */
+	public $config;
+
+	/**
+	 * Holds the old data from a redirect.
+	 *
+	 * @var array
+	 */
+	protected $oldInput = [];
+
+	/**
+	 * The user agent this request is from.
+	 *
+	 * @var UserAgent
+	 */
+	protected $userAgent;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Constructor
+	 *
+	 * @param App         $config
+	 * @param URI         $uri
+	 * @param string|null $body
+	 * @param UserAgent   $userAgent
+	 */
+	public function __construct($config, URI $uri = null, $body = 'php://input', UserAgent $userAgent = null)
+	{
+		if (empty($uri) || empty($userAgent))
+		{
+			throw new InvalidArgumentException('You must supply the parameters: uri, userAgent.');
+		}
+
+		// Get our body from php://input
+		if ($body === 'php://input')
+		{
+			$body = file_get_contents('php://input');
+		}
+
+		$this->config       = $config;
+		$this->uri          = $uri;
+		$this->body         = ! empty($body) ? $body : null;
+		$this->userAgent    = $userAgent;
+		$this->validLocales = $config->supportedLocales;
+
+		parent::__construct($config);
+
+		$this->populateHeaders();
+		$this->detectURI($config->uriProtocol, $config->baseURL);
+		$this->detectLocale($config);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles setting up the locale, perhaps auto-detecting through
+	 * content negotiation.
+	 *
+	 * @param App $config
+	 */
+	public function detectLocale($config)
+	{
+		$this->locale = $this->defaultLocale = $config->defaultLocale;
+
+		if (! $config->negotiateLocale)
+		{
+			return;
+		}
+
+		$this->setLocale($this->negotiate('language', $config->supportedLocales));
+	}
+
+	/**
+	 * Sets up our URI object based on the information we have. This is
+	 * either provided by the user in the baseURL Config setting, or
+	 * determined from the environment as needed.
+	 *
+	 * @param string $protocol
+	 * @param string $baseURL
+	 */
+	protected function detectURI(string $protocol, string $baseURL)
+	{
+		// Passing the config is unnecessary but left for legacy purposes
+		$config          = clone $this->config;
+		$config->baseURL = $baseURL;
+
+		$this->setPath($this->detectPath($protocol), $config);
+	}
+
+	/**
+	 * Detects the relative path based on
+	 * the URIProtocol Config setting.
+	 *
+	 * @param string $protocol
+	 *
+	 * @return string
+	 */
+	public function detectPath(string $protocol = ''): string
+	{
+		if (empty($protocol))
+		{
+			$protocol = 'REQUEST_URI';
+		}
+
+		switch ($protocol)
+		{
+			case 'REQUEST_URI':
+				$this->path = $this->parseRequestURI();
+				break;
+			case 'QUERY_STRING':
+				$this->path = $this->parseQueryString();
+				break;
+			case 'PATH_INFO':
+			default:
+				$this->path = $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI();
+				break;
+		}
+
+		return $this->path;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will parse the REQUEST_URI and automatically detect the URI from it,
+	 * fixing the query string if necessary.
+	 *
+	 * @return string The URI it found.
+	 */
+	protected function parseRequestURI(): string
+	{
+		if (! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']))
+		{
+			return '';
+		}
+
+		// parse_url() returns false if no host is present, but the path or query string
+		// contains a colon followed by a number. So we attach a dummy host since
+		// REQUEST_URI does not include the host. This allows us to parse out the query string and path.
+		$parts = parse_url('http://dummy' . $_SERVER['REQUEST_URI']);
+		$query = $parts['query'] ?? '';
+		$uri   = $parts['path'] ?? '';
+
+		// Strip the SCRIPT_NAME path from the URI
+		if ($uri !== '' && isset($_SERVER['SCRIPT_NAME'][0]) && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php')
+		{
+			// Compare each segment, dropping them until there is no match
+			$segments = $keep = explode('/', $uri);
+			foreach (explode('/', $_SERVER['SCRIPT_NAME']) as $i => $segment)
+			{
+				// If these segments are not the same then we're done
+				if (! isset($segments[$i]) || $segment !== $segments[$i])
+				{
+					break;
+				}
+
+				array_shift($keep);
+			}
+
+			$uri = implode('/', $keep);
+		}
+
+		// This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct
+		// URI is found, and also fixes the QUERY_STRING getServer var and $_GET array.
+		if (trim($uri, '/') === '' && strncmp($query, '/', 1) === 0)
+		{
+			$query                   = explode('?', $query, 2);
+			$uri                     = $query[0];
+			$_SERVER['QUERY_STRING'] = $query[1] ?? '';
+		}
+		else
+		{
+			$_SERVER['QUERY_STRING'] = $query;
+		}
+
+		// Update our globals for values likely to been have changed
+		parse_str($_SERVER['QUERY_STRING'], $_GET);
+		$this->populateGlobals('server');
+		$this->populateGlobals('get');
+
+		$uri = URI::removeDotSegments($uri);
+
+		return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
+	}
+
+	/**
+	 * Parse QUERY_STRING
+	 *
+	 * Will parse QUERY_STRING and automatically detect the URI from it.
+	 *
+	 * @return string
+	 */
+	protected function parseQueryString(): string
+	{
+		$uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
+
+		if (trim($uri, '/') === '')
+		{
+			return '';
+		}
+
+		if (strncmp($uri, '/', 1) === 0)
+		{
+			$uri                     = explode('?', $uri, 2);
+			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
+			$uri                     = $uri[0];
+		}
+
+		// Update our globals for values likely to been have changed
+		parse_str($_SERVER['QUERY_STRING'], $_GET);
+		$this->populateGlobals('server');
+		$this->populateGlobals('get');
+
+		$uri = URI::removeDotSegments($uri);
+
+		return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a convenient way to work with the Negotiate class
+	 * for content negotiation.
+	 *
+	 * @param string  $type
+	 * @param array   $supported
+	 * @param boolean $strictMatch
+	 *
+	 * @return string
+	 */
+	public function negotiate(string $type, array $supported, bool $strictMatch = false): string
+	{
+		if (is_null($this->negotiator))
+		{
+			$this->negotiator = Services::negotiator($this, true);
+		}
+
+		switch (strtolower($type))
+		{
+			case 'media':
+				return $this->negotiator->media($supported, $strictMatch);
+			case 'charset':
+				return $this->negotiator->charset($supported);
+			case 'encoding':
+				return $this->negotiator->encoding($supported);
+			case 'language':
+				return $this->negotiator->language($supported);
+		}
+
+		throw HTTPException::forInvalidNegotiationType($type);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if this request was made from the command line (CLI).
+	 *
+	 * @return boolean
+	 */
+	public function isCLI(): bool
+	{
+		return is_cli();
+	}
+
+	/**
+	 * Test to see if a request contains the HTTP_X_REQUESTED_WITH header.
+	 *
+	 * @return boolean
+	 */
+	public function isAJAX(): bool
+	{
+		return $this->hasHeader('X-Requested-With') && strtolower($this->header('X-Requested-With')->getValue()) === 'xmlhttprequest';
+	}
+
+	/**
+	 * Attempts to detect if the current connection is secure through
+	 * a few different methods.
+	 *
+	 * @return boolean
+	 */
+	public function isSecure(): bool
+	{
+		if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
+		{
+			return true;
+		}
+
+		if ($this->hasHeader('X-Forwarded-Proto') && $this->header('X-Forwarded-Proto')->getValue() === 'https')
+		{
+			return true;
+		}
+		return $this->hasHeader('Front-End-Https') && ! empty($this->header('Front-End-Https')->getValue()) && strtolower($this->header('Front-End-Https')->getValue()) !== 'off';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the relative path and updates the URI object.
+	 * Note: Since current_url() accesses the shared request
+	 * instance, this can be used to change the "current URL"
+	 * for testing.
+	 *
+	 * @param string $path   URI path relative to SCRIPT_NAME
+	 * @param App    $config Optional alternate config to use
+	 *
+	 * @return $this
+	 */
+	public function setPath(string $path, App $config = null)
+	{
+		$this->path = $path;
+		$this->uri->setPath($path);
+
+		$config = $config ?? $this->config;
+
+		// It's possible the user forgot a trailing slash on their
+		// baseURL, so let's help them out.
+		$baseURL = $config->baseURL === '' ? $config->baseURL : rtrim($config->baseURL, '/ ') . '/';
+
+		// Based on our baseURL provided by the developer
+		// set our current domain name, scheme
+		if ($baseURL !== '')
+		{
+			$this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
+			$this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
+			$this->uri->setPort(parse_url($baseURL, PHP_URL_PORT));
+
+			// Ensure we have any query vars
+			$this->uri->setQuery($_SERVER['QUERY_STRING'] ?? '');
+
+			// Check if the baseURL scheme needs to be coerced into its secure version
+			if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
+			{
+				$this->uri->setScheme('https');
+			}
+		}
+		// @codeCoverageIgnoreStart
+		elseif (! is_cli())
+		{
+			die('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.');
+		}
+		// @codeCoverageIgnoreEnd
+
+		return $this;
+	}
+
+	/**
+	 * Returns the path relative to SCRIPT_NAME,
+	 * running detection as necessary.
+	 *
+	 * @return string
+	 */
+	public function getPath(): string
+	{
+		if (is_null($this->path))
+		{
+			$this->detectPath($this->config->uriProtocol);
+		}
+
+		return $this->path;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the locale string for this request.
+	 *
+	 * @param string $locale
+	 *
+	 * @return IncomingRequest
+	 */
+	public function setLocale(string $locale)
+	{
+		// If it's not a valid locale, set it
+		// to the default locale for the site.
+		if (! in_array($locale, $this->validLocales, true))
+		{
+			$locale = $this->defaultLocale;
+		}
+
+		$this->locale = $locale;
+		Locale::setDefault($locale);
+
+		return $this;
+	}
+
+	/**
+	 * Gets the current locale, with a fallback to the default
+	 * locale if none is set.
+	 *
+	 * @return string
+	 */
+	public function getLocale(): string
+	{
+		return $this->locale ?? $this->defaultLocale;
+	}
+
+	/**
+	 * Returns the default locale as set in Config\App.php
+	 *
+	 * @return string
+	 */
+	public function getDefaultLocale(): string
+	{
+		return $this->defaultLocale;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from JSON input stream with fallback to $_REQUEST object. This is the simplest way
+	 * to grab data from the request object and can be used in lieu of the
+	 * other get* methods in most cases.
+	 *
+	 * @param string|array|null $index
+	 * @param integer|null      $filter Filter constant
+	 * @param mixed             $flags
+	 *
+	 * @return mixed
+	 */
+	public function getVar($index = null, $filter = null, $flags = null)
+	{
+		if (strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false && ! is_null($this->body))
+		{
+			if (is_null($index))
+			{
+				return $this->getJSON();
+			}
+
+			if (is_array($index))
+			{
+				$output = [];
+				foreach ($index as $key)
+				{
+					$output[$key] = $this->getJsonVar($key, false, $filter, $flags);
+				}
+				return $output;
+			}
+
+			return $this->getJsonVar($index, false, $filter, $flags);
+		}
+		return $this->fetchGlobal('request', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A convenience method that grabs the raw input stream and decodes
+	 * the JSON into an array.
+	 *
+	 * If $assoc == true, then all objects in the response will be converted
+	 * to associative arrays.
+	 *
+	 * @param boolean $assoc   Whether to return objects as associative arrays
+	 * @param integer $depth   How many levels deep to decode
+	 * @param integer $options Bitmask of options
+	 *
+	 * @see http://php.net/manual/en/function.json-decode.php
+	 *
+	 * @return mixed
+	 */
+	public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
+	{
+		return json_decode($this->body, $assoc, $depth, $options);
+	}
+
+	/**
+	 * Get a specific variable from a JSON input stream
+	 *
+	 * @param  string             $index  The variable that you want which can use dot syntax for getting specific values.
+	 * @param  boolean            $assoc  If true, return the result as an associative array.
+	 * @param  integer|null       $filter Filter Constant
+	 * @param  array|integer|null $flags  Option
+	 * @return mixed
+	 */
+	public function getJsonVar(string $index, bool $assoc = false, ?int $filter = null, $flags = null)
+	{
+		helper('array');
+
+		$data = dot_array_search($index, $this->getJSON(true));
+
+		if (! is_array($data))
+		{
+			$filter = $filter ?? FILTER_DEFAULT;
+			$flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
+
+			return filter_var($data, $filter, $flags);
+		}
+
+		if (! $assoc)
+		{
+			return json_decode(json_encode($data));
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A convenience method that grabs the raw input stream(send method in PUT, PATCH, DELETE) and decodes
+	 * the String into an array.
+	 *
+	 * @return mixed
+	 */
+	public function getRawInput()
+	{
+		parse_str($this->body, $output);
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from GET data.
+	 *
+	 * @param string|array|null $index  Index for item to fetch from $_GET.
+	 * @param integer|null      $filter A filter name to apply.
+	 * @param mixed|null        $flags
+	 *
+	 * @return mixed
+	 */
+	public function getGet($index = null, $filter = null, $flags = null)
+	{
+		return $this->fetchGlobal('get', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from POST.
+	 *
+	 * @param string|array|null $index  Index for item to fetch from $_POST.
+	 * @param integer|null      $filter A filter name to apply
+	 * @param mixed             $flags
+	 *
+	 * @return mixed
+	 */
+	public function getPost($index = null, $filter = null, $flags = null)
+	{
+		return $this->fetchGlobal('post', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from POST data with fallback to GET.
+	 *
+	 * @param string|array|null $index  Index for item to fetch from $_POST or $_GET
+	 * @param integer|null      $filter A filter name to apply
+	 * @param mixed             $flags
+	 *
+	 * @return mixed
+	 */
+	public function getPostGet($index = null, $filter = null, $flags = null)
+	{
+		// Use $_POST directly here, since filter_has_var only
+		// checks the initial POST data, not anything that might
+		// have been added since.
+		return isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from GET data with fallback to POST.
+	 *
+	 * @param string|array|null $index  Index for item to be fetched from $_GET or $_POST
+	 * @param integer|null      $filter A filter name to apply
+	 * @param mixed             $flags
+	 *
+	 * @return mixed
+	 */
+	public function getGetPost($index = null, $filter = null, $flags = null)
+	{
+		// Use $_GET directly here, since filter_has_var only
+		// checks the initial GET data, not anything that might
+		// have been added since.
+		return isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from the COOKIE array.
+	 *
+	 * @param string|array|null $index  Index for item to be fetched from $_COOKIE
+	 * @param integer|null      $filter A filter name to be applied
+	 * @param mixed             $flags
+	 *
+	 * @return mixed
+	 */
+	public function getCookie($index = null, $filter = null, $flags = null)
+	{
+		return $this->fetchGlobal('cookie', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Fetch the user agent string
+	 *
+	 * @return UserAgent
+	 */
+	public function getUserAgent()
+	{
+		return $this->userAgent;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to get old Input data that has been flashed to the session
+	 * with redirect_with_input(). It first checks for the data in the old
+	 * POST data, then the old GET data and finally check for dot arrays
+	 *
+	 * @param string $key
+	 *
+	 * @return mixed
+	 */
+	public function getOldInput(string $key)
+	{
+		// If the session hasn't been started, or no
+		// data was previously saved, we're done.
+		if (empty($_SESSION['_ci_old_input']))
+		{
+			return null;
+		}
+
+		// Check for the value in the POST array first.
+		if (isset($_SESSION['_ci_old_input']['post'][$key]))
+		{
+			return $_SESSION['_ci_old_input']['post'][$key];
+		}
+
+		// Next check in the GET array.
+		if (isset($_SESSION['_ci_old_input']['get'][$key]))
+		{
+			return $_SESSION['_ci_old_input']['get'][$key];
+		}
+
+		helper('array');
+
+		// Check for an array value in POST.
+		if (isset($_SESSION['_ci_old_input']['post']))
+		{
+			$value = dot_array_search($key, $_SESSION['_ci_old_input']['post']);
+			if (! is_null($value))
+			{
+				return $value;
+			}
+		}
+
+		// Check for an array value in GET.
+		if (isset($_SESSION['_ci_old_input']['get']))
+		{
+			$value = dot_array_search($key, $_SESSION['_ci_old_input']['get']);
+			if (! is_null($value))
+			{
+				return $value;
+			}
+		}
+
+		// requested session key not found
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of all files that have been uploaded with this
+	 * request. Each file is represented by an UploadedFile instance.
+	 *
+	 * @return array
+	 */
+	public function getFiles(): array
+	{
+		if (is_null($this->files))
+		{
+			$this->files = new FileCollection();
+		}
+
+		return $this->files->all(); // return all files
+	}
+
+	/**
+	 * Verify if a file exist, by the name of the input field used to upload it, in the collection
+	 * of uploaded files and if is have been uploaded with multiple option.
+	 *
+	 * @param string $fileID
+	 *
+	 * @return array|null
+	 */
+	public function getFileMultiple(string $fileID)
+	{
+		if (is_null($this->files))
+		{
+			$this->files = new FileCollection();
+		}
+
+		return $this->files->getFileMultiple($fileID);
+	}
+
+	/**
+	 * Retrieves a single file by the name of the input field used
+	 * to upload it.
+	 *
+	 * @param string $fileID
+	 *
+	 * @return UploadedFile|null
+	 */
+	public function getFile(string $fileID)
+	{
+		if (is_null($this->files))
+		{
+			$this->files = new FileCollection();
+		}
+
+		return $this->files->getFile($fileID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Remove relative directory (../) and multi slashes (///)
+	 *
+	 * Do some final cleaning of the URI and return it, currently only used in static::_parse_request_uri()
+	 *
+	 * @param string $uri
+	 *
+	 * @return string
+	 *
+	 * @deprecated Use URI::removeDotSegments() directly
+	 */
+	protected function removeRelativeDirectory(string $uri): string
+	{
+		$uri = URI::removeDotSegments($uri);
+
+		return $uri === '/' ? $uri : ltrim($uri, '/');
+	}
+}
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
new file mode 100644
index 0000000..91c472c
--- /dev/null
+++ b/system/HTTP/Message.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+/**
+ * An HTTP message
+ */
+class Message implements MessageInterface
+{
+	use MessageTrait;
+
+	/**
+	 * Protocol version
+	 *
+	 * @var string
+	 */
+	protected $protocolVersion;
+
+	/**
+	 * List of valid protocol versions
+	 *
+	 * @var array
+	 */
+	protected $validProtocolVersions = [
+		'1.0',
+		'1.1',
+		'2.0',
+	];
+
+	/**
+	 * Message body
+	 *
+	 * @var mixed
+	 */
+	protected $body;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the Message's body.
+	 *
+	 * @return mixed
+	 */
+	public function getBody()
+	{
+		return $this->body;
+	}
+
+	/**
+	 * Returns an array containing all headers.
+	 *
+	 * @return array<string, Header> An array of the request headers
+	 *
+	 * @deprecated Use Message::headers() to make room for PSR-7
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getHeaders(): array
+	{
+		return $this->headers();
+	}
+
+	/**
+	 * Returns a single header object. If multiple headers with the same
+	 * name exist, then will return an array of header objects.
+	 *
+	 * @param string $name
+	 *
+	 * @return array|Header|null
+	 *
+	 * @deprecated Use Message::header() to make room for PSR-7
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getHeader(string $name)
+	{
+		return $this->header($name);
+	}
+
+	/**
+	 * Determines whether a header exists.
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean
+	 */
+	public function hasHeader(string $name): bool
+	{
+		$origName = $this->getHeaderName($name);
+
+		return isset($this->headers[$origName]);
+	}
+
+	/**
+	 * Retrieves a comma-separated string of the values for a single header.
+	 *
+	 * This method returns all of the header values of the given
+	 * case-insensitive header name as a string concatenated together using
+	 * a comma.
+	 *
+	 * NOTE: Not all header values may be appropriately represented using
+	 * comma concatenation. For such headers, use getHeader() instead
+	 * and supply your own delimiter when concatenating.
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	public function getHeaderLine(string $name): string
+	{
+		$origName = $this->getHeaderName($name);
+
+		if (! array_key_exists($origName, $this->headers))
+		{
+			return '';
+		}
+
+		return $this->headers[$origName]->getValueLine();
+	}
+
+	/**
+	 * Returns the HTTP Protocol Version.
+	 *
+	 * @return string
+	 */
+	public function getProtocolVersion(): string
+	{
+		return $this->protocolVersion ?? '1.1';
+	}
+}
diff --git a/system/HTTP/MessageInterface.php b/system/HTTP/MessageInterface.php
new file mode 100644
index 0000000..982e3ca
--- /dev/null
+++ b/system/HTTP/MessageInterface.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+
+/**
+ * Expected behavior of an HTTP request
+ */
+interface MessageInterface
+{
+	/**
+	 * Sets the body of the current message.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return $this
+	 */
+	public function setBody($data);
+
+	/**
+	 * Appends data to the body of the current message.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return $this
+	 */
+	public function appendBody($data);
+
+	/**
+	 * Populates the $headers array with any headers the getServer knows about.
+	 */
+	public function populateHeaders(): void;
+
+	/**
+	 * Returns an array containing all Headers.
+	 *
+	 * @return array<string, Header> An array of the Header objects
+	 */
+	public function headers(): array;
+
+	/**
+	 * Returns a single Header object. If multiple headers with the same
+	 * name exist, then will return an array of header objects.
+	 *
+	 * @param string $name
+	 *
+	 * @return array|Header|null
+	 */
+	public function header($name);
+
+	/**
+	 * Sets a header and it's value.
+	 *
+	 * @param string            $name
+	 * @param array|null|string $value
+	 *
+	 * @return $this
+	 */
+	public function setHeader(string $name, $value);
+
+	/**
+	 * Removes a header from the list of headers we track.
+	 *
+	 * @param string $name
+	 *
+	 * @return $this
+	 */
+	public function removeHeader(string $name);
+
+	/**
+	 * Adds an additional header value to any headers that accept
+	 * multiple values (i.e. are an array or implement ArrayAccess)
+	 *
+	 * @param string      $name
+	 * @param string|null $value
+	 *
+	 * @return $this
+	 */
+	public function appendHeader(string $name, ?string $value);
+
+	/**
+	 * Adds an additional header value to any headers that accept
+	 * multiple values (i.e. are an array or implement ArrayAccess)
+	 *
+	 * @param string $name
+	 * @param string $value
+	 *
+	 * @return $this
+	 */
+	public function prependHeader(string $name, string $value);
+
+	/**
+	 * Sets the HTTP protocol version.
+	 *
+	 * @param string $version
+	 *
+	 * @return $this
+	 *
+	 * @throws HTTPException For invalid protocols
+	 */
+	public function setProtocolVersion(string $version);
+}
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
new file mode 100644
index 0000000..aea8fe2
--- /dev/null
+++ b/system/HTTP/MessageTrait.php
@@ -0,0 +1,269 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+
+/**
+ * Message Trait
+ * Additional methods to make a PSR-7 Message class
+ * compliant with the framework's own MessageInterface.
+ *
+ * @see https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
+ */
+trait MessageTrait
+{
+	/**
+	 * List of all HTTP request headers.
+	 *
+	 * @var array<string, Header>
+	 */
+	protected $headers = [];
+
+	/**
+	 * Holds a map of lower-case header names
+	 * and their normal-case key as it is in $headers.
+	 * Used for case-insensitive header access.
+	 *
+	 * @var array
+	 */
+	protected $headerMap = [];
+
+	//--------------------------------------------------------------------
+	// Body
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the body of the current message.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return $this
+	 */
+	public function setBody($data): self
+	{
+		$this->body = $data;
+
+		return $this;
+	}
+
+	/**
+	 * Appends data to the body of the current message.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return $this
+	 */
+	public function appendBody($data): self
+	{
+		$this->body .= (string) $data;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	// Headers
+	//--------------------------------------------------------------------
+
+	/**
+	 * Populates the $headers array with any headers the getServer knows about.
+	 */
+	public function populateHeaders(): void
+	{
+		$contentType = $_SERVER['CONTENT_TYPE'] ?? getenv('CONTENT_TYPE');
+		if (! empty($contentType))
+		{
+			$this->setHeader('Content-Type', $contentType);
+		}
+		unset($contentType);
+
+		foreach (array_keys($_SERVER) as $key)
+		{
+			if (sscanf($key, 'HTTP_%s', $header) === 1)
+			{
+				// take SOME_HEADER and turn it into Some-Header
+				$header = str_replace('_', ' ', strtolower($header));
+				$header = str_replace(' ', '-', ucwords($header));
+
+				$this->setHeader($header, $_SERVER[$key]);
+
+				// Add us to the header map so we can find them case-insensitively
+				$this->headerMap[strtolower($header)] = $header;
+			}
+		}
+	}
+
+	/**
+	 * Returns an array containing all Headers.
+	 *
+	 * @return array<string, Header> An array of the Header objects
+	 */
+	public function headers(): array
+	{
+		// If no headers are defined, but the user is
+		// requesting it, then it's likely they want
+		// it to be populated so do that...
+		if (empty($this->headers))
+		{
+			$this->populateHeaders();
+		}
+
+		return $this->headers;
+	}
+
+	/**
+	 * Returns a single Header object. If multiple headers with the same
+	 * name exist, then will return an array of header objects.
+	 *
+	 * @param string $name
+	 *
+	 * @return array|Header|null
+	 */
+	public function header($name)
+	{
+		$origName = $this->getHeaderName($name);
+
+		return $this->headers[$origName] ?? null;
+	}
+
+	/**
+	 * Sets a header and it's value.
+	 *
+	 * @param string            $name
+	 * @param array|null|string $value
+	 *
+	 * @return $this
+	 */
+	public function setHeader(string $name, $value): self
+	{
+		$origName = $this->getHeaderName($name);
+
+		if (isset($this->headers[$origName]) && is_array($this->headers[$origName]->getValue()))
+		{
+			if (! is_array($value))
+			{
+				$value = [$value];
+			}
+
+			foreach ($value as $v)
+			{
+				$this->appendHeader($origName, $v);
+			}
+		}
+		else
+		{
+			$this->headers[$origName]               = new Header($origName, $value);
+			$this->headerMap[strtolower($origName)] = $origName;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Removes a header from the list of headers we track.
+	 *
+	 * @param string $name
+	 *
+	 * @return $this
+	 */
+	public function removeHeader(string $name): self
+	{
+		$origName = $this->getHeaderName($name);
+
+		unset($this->headers[$origName]);
+		unset($this->headerMap[strtolower($name)]);
+
+		return $this;
+	}
+
+	/**
+	 * Adds an additional header value to any headers that accept
+	 * multiple values (i.e. are an array or implement ArrayAccess)
+	 *
+	 * @param string      $name
+	 * @param string|null $value
+	 *
+	 * @return $this
+	 */
+	public function appendHeader(string $name, ?string $value): self
+	{
+		$origName = $this->getHeaderName($name);
+
+		array_key_exists($origName, $this->headers)
+			? $this->headers[$origName]->appendValue($value)
+			: $this->setHeader($name, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Adds an additional header value to any headers that accept
+	 * multiple values (i.e. are an array or implement ArrayAccess)
+	 *
+	 * @param string $name
+	 * @param string $value
+	 *
+	 * @return $this
+	 */
+	public function prependHeader(string $name, string $value): self
+	{
+		$origName = $this->getHeaderName($name);
+
+		$this->headers[$origName]->prependValue($value);
+
+		return $this;
+	}
+
+	/**
+	 * Takes a header name in any case, and returns the
+	 * normal-case version of the header.
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	protected function getHeaderName(string $name): string
+	{
+		return $this->headerMap[strtolower($name)] ?? $name;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the HTTP protocol version.
+	 *
+	 * @param string $version
+	 *
+	 * @return $this
+	 *
+	 * @throws HTTPException For invalid protocols
+	 */
+	public function setProtocolVersion(string $version): self
+	{
+		if (! is_numeric($version))
+		{
+			$version = substr($version, strpos($version, '/') + 1);
+		}
+
+		// Make sure that version is in the correct format
+		$version = number_format((float) $version, 1);
+
+		if (! in_array($version, $this->validProtocolVersions, true))
+		{
+			throw HTTPException::forInvalidHTTPProtocol(implode(', ', $this->validProtocolVersions));
+		}
+
+		$this->protocolVersion = $version;
+
+		return $this;
+	}
+}
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
new file mode 100644
index 0000000..fb2608f
--- /dev/null
+++ b/system/HTTP/Negotiate.php
@@ -0,0 +1,435 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+
+/**
+ * Class Negotiate
+ *
+ * Provides methods to negotiate with the HTTP headers to determine the best
+ * type match between what the application supports and what the requesting
+ * getServer wants.
+ *
+ * @see http://tools.ietf.org/html/rfc7231#section-5.3
+ */
+class Negotiate
+{
+	/**
+	 * Request
+	 *
+	 * @var RequestInterface|IncomingRequest
+	 */
+	protected $request;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Constructor
+	 *
+	 * @param RequestInterface|null $request
+	 */
+	public function __construct(RequestInterface $request = null)
+	{
+		if (! is_null($request))
+		{
+			$this->request = $request;
+		}
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Stores the request instance to grab the headers from.
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return $this
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the best content-type to use based on the $supported
+	 * types the application says it supports, and the types requested
+	 * by the client.
+	 *
+	 * If no match is found, the first, highest-ranking client requested
+	 * type is returned.
+	 *
+	 * @param array   $supported
+	 * @param boolean $strictMatch If TRUE, will return an empty string when no match found.
+	 *                             If FALSE, will return the first supported element.
+	 *
+	 * @return string
+	 */
+	public function media(array $supported, bool $strictMatch = false): string
+	{
+		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept'), true, $strictMatch);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the best charset to use based on the $supported
+	 * types the application says it supports, and the types requested
+	 * by the client.
+	 *
+	 * If no match is found, the first, highest-ranking client requested
+	 * type is returned.
+	 *
+	 * @param array $supported
+	 *
+	 * @return string
+	 */
+	public function charset(array $supported): string
+	{
+		$match = $this->getBestMatch($supported, $this->request->getHeaderLine('accept-charset'), false, true);
+
+		// If no charset is shown as a match, ignore the directive
+		// as allowed by the RFC, and tell it a default value.
+		if (empty($match))
+		{
+			return 'utf-8';
+		}
+
+		return $match;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the best encoding type to use based on the $supported
+	 * types the application says it supports, and the types requested
+	 * by the client.
+	 *
+	 * If no match is found, the first, highest-ranking client requested
+	 * type is returned.
+	 *
+	 * @param array $supported
+	 *
+	 * @return string
+	 */
+	public function encoding(array $supported = []): string
+	{
+		$supported[] = 'identity';
+
+		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-encoding'));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the best language to use based on the $supported
+	 * types the application says it supports, and the types requested
+	 * by the client.
+	 *
+	 * If no match is found, the first, highest-ranking client requested
+	 * type is returned.
+	 *
+	 * @param array $supported
+	 *
+	 * @return string
+	 */
+	public function language(array $supported): string
+	{
+		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-language'), false, false, true);
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the grunt work of comparing any of the app-supported values
+	 * against a given Accept* header string.
+	 *
+	 * Portions of this code base on Aura.Accept library.
+	 *
+	 * @param array   $supported    App-supported values
+	 * @param string  $header       header string
+	 * @param boolean $enforceTypes If TRUE, will compare media types and sub-types.
+	 * @param boolean $strictMatch  If TRUE, will return empty string on no match.
+	 *                              If FALSE, will return the first supported element.
+	 * @param boolean $matchLocales If TRUE, will match locale sub-types to a broad type (fr-FR = fr)
+	 *
+	 * @return string Best match
+	 */
+	protected function getBestMatch(array $supported, string $header = null, bool $enforceTypes = false, bool $strictMatch = false, bool $matchLocales = false): string
+	{
+		if (empty($supported))
+		{
+			throw HTTPException::forEmptySupportedNegotiations();
+		}
+
+		if (empty($header))
+		{
+			return $strictMatch ? '' : $supported[0];
+		}
+
+		$acceptable = $this->parseHeader($header);
+
+		foreach ($acceptable as $accept)
+		{
+			// if acceptable quality is zero, skip it.
+			if ($accept['q'] === 0.0)
+			{
+				continue;
+			}
+
+			// if acceptable value is "anything", return the first available
+			if ($accept['value'] === '*' || $accept['value'] === '*/*')
+			{
+				return $supported[0];
+			}
+
+			// If an acceptable value is supported, return it
+			foreach ($supported as $available)
+			{
+				if ($this->match($accept, $available, $enforceTypes, $matchLocales))
+				{
+					return $available;
+				}
+			}
+		}
+
+		// No matches? Return the first supported element.
+		return $strictMatch ? '' : $supported[0];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses an Accept* header into it's multiple values.
+	 *
+	 * This is based on code from Aura.Accept library.
+	 *
+	 * @param string $header
+	 *
+	 * @return array
+	 */
+	public function parseHeader(string $header): array
+	{
+		$results    = [];
+		$acceptable = explode(',', $header);
+
+		foreach ($acceptable as $value)
+		{
+			$pairs = explode(';', $value);
+
+			$value = $pairs[0];
+
+			unset($pairs[0]);
+
+			$parameters = [];
+
+			foreach ($pairs as $pair)
+			{
+				if (preg_match(
+					'/^(?P<name>.+?)=(?P<quoted>"|\')?(?P<value>.*?)(?:\k<quoted>)?$/',
+					$pair,
+					$param
+				))
+				{
+					$parameters[trim($param['name'])] = trim($param['value']);
+				}
+			}
+
+			$quality = 1.0;
+
+			if (array_key_exists('q', $parameters))
+			{
+				$quality = $parameters['q'];
+				unset($parameters['q']);
+			}
+
+			$results[] = [
+				'value'  => trim($value),
+				'q'      => (float) $quality,
+				'params' => $parameters,
+			];
+		}
+
+		// Sort to get the highest results first
+		usort($results, function ($a, $b) {
+			if ($a['q'] === $b['q'])
+			{
+				$aAst = substr_count($a['value'], '*');
+				$bAst = substr_count($b['value'], '*');
+
+				// '*/*' has lower precedence than 'text/*',
+				// and 'text/*' has lower priority than 'text/plain'
+				//
+				// This seems backwards, but needs to be that way
+				// due to the way PHP7 handles ordering or array
+				// elements created by reference.
+				if ($aAst > $bAst)
+				{
+					return 1;
+				}
+
+				// If the counts are the same, but one element
+				// has more params than another, it has higher precedence.
+				//
+				// This seems backwards, but needs to be that way
+				// due to the way PHP7 handles ordering or array
+				// elements created by reference.
+				if ($aAst === $bAst)
+				{
+					return count($b['params']) - count($a['params']);
+				}
+
+				return 0;
+			}
+
+			// Still here? Higher q values have precedence.
+			return ($a['q'] > $b['q']) ? -1 : 1;
+		});
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Match-maker
+	 *
+	 * @param array   $acceptable
+	 * @param string  $supported
+	 * @param boolean $enforceTypes
+	 * @param boolean $matchLocales
+	 *
+	 * @return boolean
+	 */
+	protected function match(array $acceptable, string $supported, bool $enforceTypes = false, $matchLocales = false): bool
+	{
+		$supported = $this->parseHeader($supported);
+		if (is_array($supported) && count($supported) === 1)
+		{
+			$supported = $supported[0];
+		}
+
+		// Is it an exact match?
+		if ($acceptable['value'] === $supported['value'])
+		{
+			return $this->matchParameters($acceptable, $supported);
+		}
+
+		// Do we need to compare types/sub-types? Only used
+		// by negotiateMedia().
+		if ($enforceTypes)
+		{
+			return $this->matchTypes($acceptable, $supported);
+		}
+
+		// Do we need to match locales against broader locales?
+		if ($matchLocales)
+		{
+			return $this->matchLocales($acceptable, $supported);
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks two Accept values with matching 'values' to see if their
+	 * 'params' are the same.
+	 *
+	 * @param array $acceptable
+	 * @param array $supported
+	 *
+	 * @return boolean
+	 */
+	protected function matchParameters(array $acceptable, array $supported): bool
+	{
+		if (count($acceptable['params']) !== count($supported['params']))
+		{
+			return false;
+		}
+
+		foreach ($supported['params'] as $label => $value)
+		{
+			if (! isset($acceptable['params'][$label])
+				|| $acceptable['params'][$label] !== $value
+			)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compares the types/subtypes of an acceptable Media type and
+	 * the supported string.
+	 *
+	 * @param array $acceptable
+	 * @param array $supported
+	 *
+	 * @return boolean
+	 */
+	public function matchTypes(array $acceptable, array $supported): bool
+	{
+		// PHPDocumentor v2 cannot parse yet the shorter list syntax,
+		// causing no API generation for the file.
+		[$aType, $aSubType] = explode('/', $acceptable['value']);
+		[$sType, $sSubType] = explode('/', $supported['value']);
+
+		// If the types don't match, we're done.
+		if ($aType !== $sType)
+		{
+			return false;
+		}
+
+		// If there's an asterisk, we're cool
+		if ($aSubType === '*')
+		{
+			return true;
+		}
+
+		// Otherwise, subtypes must match also.
+		return $aSubType === $sSubType;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will match locales against their broader pairs, so that fr-FR would
+	 * match a supported localed of fr
+	 *
+	 * @param array $acceptable
+	 * @param array $supported
+	 *
+	 * @return boolean
+	 */
+	public function matchLocales(array $acceptable, array $supported): bool
+	{
+		$aBroad = mb_strpos($acceptable['value'], '-') > 0
+			? mb_substr($acceptable['value'], 0, mb_strpos($acceptable['value'], '-'))
+			: $acceptable['value'];
+		$sBroad = mb_strpos($supported['value'], '-') > 0
+			? mb_substr($supported['value'], 0, mb_strpos($supported['value'], '-'))
+			: $supported['value'];
+
+		return strtolower($aBroad) === strtolower($sBroad);
+	}
+}
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
new file mode 100644
index 0000000..4f31e90
--- /dev/null
+++ b/system/HTTP/RedirectResponse.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Cookie\CookieStore;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use Config\Services;
+
+/**
+ * Handle a redirect response
+ */
+class RedirectResponse extends Response
+{
+	/**
+	 * Sets the URI to redirect to and, optionally, the HTTP status code to use.
+	 * If no code is provided it will be automatically determined.
+	 *
+	 * @param string       $uri    The URI to redirect to
+	 * @param integer|null $code   HTTP status code
+	 * @param string       $method
+	 *
+	 * @return $this
+	 */
+	public function to(string $uri, int $code = null, string $method = 'auto')
+	{
+		// If it appears to be a relative URL, then convert to full URL
+		// for better security.
+		if (strpos($uri, 'http') !== 0)
+		{
+			$uri = site_url($uri);
+		}
+
+		return $this->redirect($uri, $method, $code);
+	}
+
+	/**
+	 * Sets the URI to redirect to but as a reverse-routed or named route
+	 * instead of a raw URI.
+	 *
+	 * @param string  $route
+	 * @param array   $params
+	 * @param integer $code
+	 * @param string  $method
+	 *
+	 * @throws HTTPException
+	 *
+	 * @return $this
+	 */
+	public function route(string $route, array $params = [], int $code = 302, string $method = 'auto')
+	{
+		$route = Services::routes()->reverseRoute($route, ...$params);
+
+		if (! $route)
+		{
+			throw HTTPException::forInvalidRedirectRoute($route);
+		}
+
+		return $this->redirect(site_url($route), $method, $code);
+	}
+
+	/**
+	 * Helper function to return to previous page.
+	 *
+	 * Example:
+	 *  return redirect()->back();
+	 *
+	 * @param integer|null $code
+	 * @param string       $method
+	 *
+	 * @return $this
+	 */
+	public function back(int $code = null, string $method = 'auto')
+	{
+		Services::session();
+
+		return $this->redirect(previous_url(), $method, $code);
+	}
+
+	/**
+	 * Specifies that the current $_GET and $_POST arrays should be
+	 * packaged up with the response.
+	 *
+	 * It will then be available via the 'old()' helper function.
+	 *
+	 * @return $this
+	 */
+	public function withInput()
+	{
+		$session = Services::session();
+
+		$session->setFlashdata('_ci_old_input', [
+			'get'  => $_GET ?? [],
+			'post' => $_POST ?? [],
+		]);
+
+		// If the validation has any errors, transmit those back
+		// so they can be displayed when the validation is handled
+		// within a method different than displaying the form.
+		$validation = Services::validation();
+
+		if ($validation->getErrors())
+		{
+			$session->setFlashdata('_ci_validation_errors', serialize($validation->getErrors()));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds a key and message to the session as Flashdata.
+	 *
+	 * @param string       $key
+	 * @param string|array $message
+	 *
+	 * @return $this
+	 */
+	public function with(string $key, $message)
+	{
+		Services::session()->setFlashdata($key, $message);
+
+		return $this;
+	}
+
+	/**
+	 * Copies any cookies from the global Response instance
+	 * into this RedirectResponse. Useful when you've just
+	 * set a cookie but need ensure that's actually sent
+	 * with the response instead of lost.
+	 *
+	 * @return $this|RedirectResponse
+	 */
+	public function withCookies()
+	{
+		$this->cookieStore = new CookieStore(Services::response()->getCookies());
+
+		return $this;
+	}
+
+	/**
+	 * Copies any headers from the global Response instance
+	 * into this RedirectResponse. Useful when you've just
+	 * set a header be need to ensure its actually sent
+	 * with the redirect response.
+	 *
+	 * @return $this|RedirectResponse
+	 */
+	public function withHeaders()
+	{
+		foreach (Services::response()->headers() as $name => $header)
+		{
+			$this->setHeader($name, $header->getValue());
+		}
+
+		return $this;
+	}
+}
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
new file mode 100644
index 0000000..d0d4009
--- /dev/null
+++ b/system/HTTP/Request.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Validation\FormatRules;
+
+/**
+ * Representation of an HTTP request.
+ */
+class Request extends Message implements MessageInterface, RequestInterface
+{
+	use RequestTrait;
+
+	/**
+	 * Proxy IPs
+	 *
+	 * @var string|array
+	 *
+	 * @deprecated Check the App config directly
+	 */
+	protected $proxyIPs;
+
+	/**
+	 * Request method.
+	 *
+	 * @var string
+	 */
+	protected $method;
+
+	/**
+	 * A URI instance.
+	 *
+	 * @var URI
+	 */
+	protected $uri;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param object $config
+	 *
+	 * @deprecated The $config is no longer needed and will be removed in a future version
+	 */
+	public function __construct($config = null)
+	{
+		/**
+		 * @deprecated $this->proxyIps property will be removed in the future
+		 */
+		$this->proxyIPs = $config->proxyIPs;
+
+		if (empty($this->method))
+		{
+			$this->method = $this->getServer('REQUEST_METHOD') ?? 'GET';
+		}
+
+		if (empty($this->uri))
+		{
+			$this->uri = new URI();
+		}
+	}
+
+	/**
+	 * Validate an IP address
+	 *
+	 * @param string $ip    IP Address
+	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
+	 *
+	 * @return boolean
+	 *
+	 * @deprecated Use Validation instead
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function isValidIP(string $ip = null, string $which = null): bool
+	{
+		return (new FormatRules())->valid_ip($ip, $which);
+	}
+
+	/**
+	 * Get the request method.
+	 *
+	 * @param boolean $upper Whether to return in upper or lower case.
+	 *
+	 * @return string
+	 *
+	 * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getMethod(bool $upper = false): string
+	{
+		return ($upper) ? strtoupper($this->method) : strtolower($this->method);
+	}
+
+	/**
+	 * Sets the request method. Used when spoofing the request.
+	 *
+	 * @param string $method
+	 *
+	 * @return Request
+	 *
+	 * @deprecated Use withMethod() instead for immutability
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function setMethod(string $method)
+	{
+		$this->method = $method;
+
+		return $this;
+	}
+
+	/**
+	 * Returns an instance with the specified method.
+	 *
+	 * @param string $method
+	 *
+	 * @return static
+	 */
+	public function withMethod($method)
+	{
+		$request = clone $this;
+
+		$request->method = $method;
+
+		return $request;
+	}
+
+	/**
+	 * Retrieves the URI instance.
+	 *
+	 * @return URI
+	 */
+	public function getUri()
+	{
+		return $this->uri;
+	}
+}
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
new file mode 100644
index 0000000..6f10dd4
--- /dev/null
+++ b/system/HTTP/RequestInterface.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+/**
+ * Expected behavior of an HTTP request
+ *
+ * @mixin IncomingRequest
+ * @mixin CLIRequest
+ * @mixin CURLRequest
+ */
+interface RequestInterface
+{
+	/**
+	 * Gets the user's IP address.
+	 * Supplied by RequestTrait.
+	 *
+	 * @return string IP address
+	 */
+	public function getIPAddress(): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Validate an IP address
+	 *
+	 * @param string $ip    IP Address
+	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
+	 *
+	 * @return boolean
+	 *
+	 * @deprecated Use Validation instead
+	 */
+	public function isValidIP(string $ip, string $which = null): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the request method.
+	 * An extension of PSR-7's getMethod to allow casing.
+	 *
+	 * @param boolean $upper Whether to return in upper or lower case.
+	 *
+	 * @return string
+	 *
+	 * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
+	 */
+	public function getMethod(bool $upper = false): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from the $_SERVER array.
+	 * Supplied by RequestTrait.
+	 *
+	 * @param  string $index  Index for item to be fetched from $_SERVER
+	 * @param  null   $filter A filter name to be applied
+	 * @return mixed
+	 */
+	public function getServer($index = null, $filter = null);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
new file mode 100644
index 0000000..2c9a0f9
--- /dev/null
+++ b/system/HTTP/RequestTrait.php
@@ -0,0 +1,381 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Validation\FormatRules;
+
+/**
+ * Request Trait
+ *
+ * Additional methods to make a PSR-7 Request class
+ * compliant with the framework's own RequestInterface.
+ *
+ * @see https://github.com/php-fig/http-message/blob/master/src/RequestInterface.php
+ */
+trait RequestTrait
+{
+	/**
+	 * IP address of the current user.
+	 *
+	 * @var string
+	 *
+	 * @deprecated Will become private in a future release
+	 */
+	protected $ipAddress = '';
+
+	/**
+	 * Stores values we've retrieved from
+	 * PHP globals.
+	 *
+	 * @var array
+	 */
+	protected $globals = [];
+
+	/**
+	 * Gets the user's IP address.
+	 *
+	 * @return string IP address
+	 */
+	public function getIPAddress(): string
+	{
+		if ($this->ipAddress)
+		{
+			return $this->ipAddress;
+		}
+
+		$ipValidator = [
+			new FormatRules(),
+			'valid_ip',
+		];
+
+		/**
+		 * @deprecated $this->proxyIPs property will be removed in the future
+		 */
+		$proxyIPs = $this->proxyIPs ?? config('App')->proxyIPs;
+		if (! empty($proxyIPs) && ! is_array($proxyIPs))
+		{
+			$proxyIPs = explode(',', str_replace(' ', '', $proxyIPs));
+		}
+
+		$this->ipAddress = $this->getServer('REMOTE_ADDR');
+
+		if ($proxyIPs)
+		{
+			foreach (['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_X_CLIENT_IP', 'HTTP_X_CLUSTER_CLIENT_IP'] as $header)
+			{
+				if (($spoof = $this->getServer($header)) !== null)
+				{
+					// Some proxies typically list the whole chain of IP
+					// addresses through which the client has reached us.
+					// e.g. client_ip, proxy_ip1, proxy_ip2, etc.
+					sscanf($spoof, '%[^,]', $spoof);
+
+					if (! $ipValidator($spoof))
+					{
+						$spoof = null;
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+
+			if ($spoof)
+			{
+				foreach ($proxyIPs as $proxyIP)
+				{
+					// Check if we have an IP address or a subnet
+					if (strpos($proxyIP, '/') === false)
+					{
+						// An IP address (and not a subnet) is specified.
+						// We can compare right away.
+						if ($proxyIP === $this->ipAddress)
+						{
+							$this->ipAddress = $spoof;
+							break;
+						}
+
+						continue;
+					}
+
+					// We have a subnet ... now the heavy lifting begins
+					if (! isset($separator))
+					{
+						$separator = $ipValidator($this->ipAddress, 'ipv6') ? ':' : '.';
+					}
+
+					// If the proxy entry doesn't match the IP protocol - skip it
+					if (strpos($proxyIP, $separator) === false)
+					{
+						continue;
+					}
+
+					// Convert the REMOTE_ADDR IP address to binary, if needed
+					if (! isset($ip, $sprintf))
+					{
+						if ($separator === ':')
+						{
+							// Make sure we're have the "full" IPv6 format
+							$ip = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($this->ipAddress, ':')), $this->ipAddress));
+
+							for ($j = 0; $j < 8; $j ++)
+							{
+								$ip[$j] = intval($ip[$j], 16);
+							}
+
+							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
+						}
+						else
+						{
+							$ip      = explode('.', $this->ipAddress);
+							$sprintf = '%08b%08b%08b%08b';
+						}
+
+						$ip = vsprintf($sprintf, $ip);
+					}
+
+					// Split the netmask length off the network address
+					sscanf($proxyIP, '%[^/]/%d', $netaddr, $masklen);
+
+					// Again, an IPv6 address is most likely in a compressed form
+					if ($separator === ':')
+					{
+						$netaddr = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($netaddr, ':')), $netaddr));
+						for ($i = 0; $i < 8; $i++)
+						{
+							$netaddr[$i] = intval($netaddr[$i], 16);
+						}
+					}
+					else
+					{
+						$netaddr = explode('.', $netaddr);
+					}
+
+					// Convert to binary and finally compare
+					if (strncmp($ip, vsprintf($sprintf, $netaddr), $masklen) === 0)
+					{
+						$this->ipAddress = $spoof;
+						break;
+					}
+				}
+			}
+		}
+
+		if (! $ipValidator($this->ipAddress))
+		{
+			return $this->ipAddress = '0.0.0.0';
+		}
+
+		return empty($this->ipAddress) ? '' : $this->ipAddress;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from the $_SERVER array.
+	 *
+	 * @param string|array|null $index  Index for item to be fetched from $_SERVER
+	 * @param integer|null      $filter A filter name to be applied
+	 * @param null              $flags
+	 *
+	 * @return mixed
+	 */
+	public function getServer($index = null, $filter = null, $flags = null)
+	{
+		return $this->fetchGlobal('server', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetch an item from the $_ENV array.
+	 *
+	 * @param null $index  Index for item to be fetched from $_ENV
+	 * @param null $filter A filter name to be applied
+	 * @param null $flags
+	 *
+	 * @return mixed
+	 */
+	public function getEnv($index = null, $filter = null, $flags = null)
+	{
+		return $this->fetchGlobal('env', $index, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
+	 *
+	 * @param string $method
+	 * @param mixed  $value
+	 *
+	 * @return $this
+	 */
+	public function setGlobal(string $method, $value)
+	{
+		$this->globals[$method] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fetches one or more items from a global, like cookies, get, post, etc.
+	 * Can optionally filter the input when you retrieve it by passing in
+	 * a filter.
+	 *
+	 * If $type is an array, it must conform to the input allowed by the
+	 * filter_input_array method.
+	 *
+	 * http://php.net/manual/en/filter.filters.sanitize.php
+	 *
+	 * @param string             $method Input filter constant
+	 * @param string|array|null  $index
+	 * @param integer|null       $filter Filter constant
+	 * @param array|integer|null $flags  Options
+	 *
+	 * @return mixed
+	 */
+	public function fetchGlobal(string $method, $index = null, ?int $filter = null, $flags = null)
+	{
+		$method = strtolower($method);
+
+		if (! isset($this->globals[$method]))
+		{
+			$this->populateGlobals($method);
+		}
+
+		// Null filters cause null values to return.
+		$filter = $filter ?? FILTER_DEFAULT;
+		$flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
+
+		// Return all values when $index is null
+		if (is_null($index))
+		{
+			$values = [];
+			foreach ($this->globals[$method] as $key => $value)
+			{
+				$values[$key] = is_array($value)
+					? $this->fetchGlobal($method, $key, $filter, $flags)
+					: filter_var($value, $filter, $flags);
+			}
+
+			return $values;
+		}
+
+		// allow fetching multiple keys at once
+		if (is_array($index))
+		{
+			$output = [];
+
+			foreach ($index as $key)
+			{
+				$output[$key] = $this->fetchGlobal($method, $key, $filter, $flags);
+			}
+
+			return $output;
+		}
+
+		// Does the index contain array notation?
+		if (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1)
+		{
+			$value = $this->globals[$method];
+			for ($i = 0; $i < $count; $i++)
+			{
+				$key = trim($matches[0][$i], '[]');
+
+				if ($key === '') // Empty notation will return the value as array
+				{
+					break;
+				}
+
+				if (isset($value[$key]))
+				{
+					$value = $value[$key];
+				}
+				else
+				{
+					return null;
+				}
+			}
+		}
+
+		if (! isset($value))
+		{
+			$value = $this->globals[$method][$index] ?? null;
+		}
+
+		// @phpstan-ignore-next-line
+		if (is_array($value)
+			&& ($filter !== FILTER_DEFAULT
+				|| ((is_numeric($flags) && $flags !== 0)
+					|| is_array($flags) && count($flags) > 0
+				)
+			)
+		)
+		{
+			// Iterate over array and append filter and flags
+			array_walk_recursive($value, function (&$val) use ($filter, $flags) {
+				$val = filter_var($val, $filter, $flags);
+			});
+
+			return $value;
+		}
+
+		// Cannot filter these types of data automatically...
+		if (is_array($value) || is_object($value) || is_null($value))
+		{
+			return $value;
+		}
+
+		return filter_var($value, $filter, $flags);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves a copy of the current state of one of several PHP globals
+	 * so we can retrieve them later.
+	 *
+	 * @param string $method
+	 */
+	protected function populateGlobals(string $method)
+	{
+		if (! isset($this->globals[$method]))
+		{
+			$this->globals[$method] = [];
+		}
+
+		// Don't populate ENV as it might contain
+		// sensitive data that we don't want to get logged.
+		switch($method)
+		{
+			case 'get':
+				$this->globals['get'] = $_GET;
+				break;
+			case 'post':
+				$this->globals['post'] = $_POST;
+				break;
+			case 'request':
+				$this->globals['request'] = $_REQUEST;
+				break;
+			case 'cookie':
+				$this->globals['cookie'] = $_COOKIE;
+				break;
+			case 'server':
+				$this->globals['server'] = $_SERVER;
+				break;
+		}
+	}
+}
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
new file mode 100644
index 0000000..c2c1d4d
--- /dev/null
+++ b/system/HTTP/Response.php
@@ -0,0 +1,265 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+use CodeIgniter\Cookie\Exceptions\CookieException;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use Config\App;
+use Config\ContentSecurityPolicy as CSPConfig;
+
+/**
+ * Representation of an outgoing, getServer-side response.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - Status code and reason phrase
+ * - Headers
+ * - Message body
+ */
+class Response extends Message implements MessageInterface, ResponseInterface
+{
+	use ResponseTrait;
+
+	/**
+	 * HTTP status codes
+	 *
+	 * @var array
+	 */
+	protected static $statusCodes = [
+		// 1xx: Informational
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		102 => 'Processing', // http://www.iana.org/go/rfc2518
+		103 => 'Early Hints', // http://www.ietf.org/rfc/rfc8297.txt
+		// 2xx: Success
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information', // 1.1
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		207 => 'Multi-Status', // http://www.iana.org/go/rfc4918
+		208 => 'Already Reported', // http://www.iana.org/go/rfc5842
+		226 => 'IM Used', // 1.1; http://www.ietf.org/rfc/rfc3229.txt
+		// 3xx: Redirection
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found', // Formerly 'Moved Temporarily'
+		303 => 'See Other', // 1.1
+		304 => 'Not Modified',
+		305 => 'Use Proxy', // 1.1
+		306 => 'Switch Proxy', // No longer used
+		307 => 'Temporary Redirect', // 1.1
+		308 => 'Permanent Redirect', // 1.1; Experimental; http://www.ietf.org/rfc/rfc7238.txt
+		// 4xx: Client error
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		418 => "I'm a teapot", // April's Fools joke; http://www.ietf.org/rfc/rfc2324.txt
+		// 419 (Authentication Timeout) is a non-standard status code with unknown origin
+		421 => 'Misdirected Request', // http://www.iana.org/go/rfc7540 Section 9.1.2
+		422 => 'Unprocessable Entity', // http://www.iana.org/go/rfc4918
+		423 => 'Locked', // http://www.iana.org/go/rfc4918
+		424 => 'Failed Dependency', // http://www.iana.org/go/rfc4918
+		425 => 'Too Early', // https://datatracker.ietf.org/doc/draft-ietf-httpbis-replay/
+		426 => 'Upgrade Required',
+		428 => 'Precondition Required', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+		429 => 'Too Many Requests', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+		431 => 'Request Header Fields Too Large', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+		451 => 'Unavailable For Legal Reasons', // http://tools.ietf.org/html/rfc7725
+		499 => 'Client Closed Request', // http://lxr.nginx.org/source/src/http/ngx_http_request.h#0133
+		// 5xx: Server error
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		506 => 'Variant Also Negotiates', // 1.1; http://www.ietf.org/rfc/rfc2295.txt
+		507 => 'Insufficient Storage', // http://www.iana.org/go/rfc4918
+		508 => 'Loop Detected', // http://www.iana.org/go/rfc5842
+		510 => 'Not Extended', // http://www.ietf.org/rfc/rfc2774.txt
+		511 => 'Network Authentication Required', // http://www.ietf.org/rfc/rfc6585.txt
+		599 => 'Network Connect Timeout Error', // https://httpstatuses.com/599
+	];
+
+	/**
+	 * The current reason phrase for this response.
+	 * If empty string, will use the default provided for the status code.
+	 *
+	 * @var string
+	 */
+	protected $reason = '';
+
+	/**
+	 * The current status code for this response.
+	 * The status code is a 3-digit integer result code of the server's attempt
+	 * to understand and satisfy the request.
+	 *
+	 * @var integer
+	 */
+	protected $statusCode = 200;
+
+	/**
+	 * If true, will not write output. Useful during testing.
+	 *
+	 * @var boolean
+	 *
+	 * @internal Used for framework testing, should not be relied on otherwise
+	 */
+	protected $pretend = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param App $config
+	 *
+	 * @todo Recommend removing reliance on config injection
+	 */
+	public function __construct($config)
+	{
+		// Default to a non-caching page.
+		// Also ensures that a Cache-control header exists.
+		$this->noCache();
+
+		// We need CSP object even if not enabled to avoid calls to non existing methods
+		$this->CSP = new ContentSecurityPolicy(new CSPConfig());
+
+		$this->CSPEnabled = $config->CSPEnabled;
+
+		//---------------------------------------------------------------------
+		// DEPRECATED COOKIE MANAGEMENT
+		//---------------------------------------------------------------------
+		$this->cookiePrefix   = $config->cookiePrefix;
+		$this->cookieDomain   = $config->cookieDomain;
+		$this->cookiePath     = $config->cookiePath;
+		$this->cookieSecure   = $config->cookieSecure;
+		$this->cookieHTTPOnly = $config->cookieHTTPOnly;
+		$this->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
+
+		$config->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
+
+		if (! in_array(strtolower($config->cookieSameSite ?: Cookie::SAMESITE_LAX), Cookie::ALLOWED_SAMESITE_VALUES, true))
+		{
+			throw CookieException::forInvalidSameSite($config->cookieSameSite);
+		}
+
+		$this->cookieStore = new CookieStore([]);
+		Cookie::setDefaults(config('Cookie') ?? [
+			// @todo Remove this fallback when deprecated `App` members are removed
+			'prefix'   => $config->cookiePrefix,
+			'path'     => $config->cookiePath,
+			'domain'   => $config->cookieDomain,
+			'secure'   => $config->cookieSecure,
+			'httponly' => $config->cookieHTTPOnly,
+			'samesite' => $config->cookieSameSite ?? Cookie::SAMESITE_LAX,
+		]);
+
+		// Default to an HTML Content-Type. Devs can override if needed.
+		$this->setContentType('text/html');
+	}
+
+	/**
+	 * Turns "pretend" mode on or off to aid in testing.
+	 * Note that this is not a part of the interface so
+	 * should not be relied on outside of internal testing.
+	 *
+	 * @param boolean $pretend
+	 *
+	 * @return $this
+	 */
+	public function pretend(bool $pretend = true)
+	{
+		$this->pretend = $pretend;
+
+		return $this;
+	}
+
+	/**
+	 * Gets the response status code.
+	 *
+	 * The status code is a 3-digit integer result code of the getServer's attempt
+	 * to understand and satisfy the request.
+	 *
+	 * @return integer Status code.
+	 */
+	public function getStatusCode(): int
+	{
+		if (empty($this->statusCode))
+		{
+			throw HTTPException::forMissingResponseStatus();
+		}
+
+		return $this->statusCode;
+	}
+
+	/**
+	 * Gets the response response phrase associated with the status code.
+	 *
+	 * @see http://tools.ietf.org/html/rfc7231#section-6
+	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @return string
+	 *
+	 * @deprecated Use getReasonPhrase()
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getReason(): string
+	{
+		return $this->getReasonPhrase();
+	}
+
+	/**
+	 * Gets the response reason phrase associated with the status code.
+	 *
+	 * Because a reason phrase is not a required element in a response
+	 * status line, the reason phrase value MAY be null. Implementations MAY
+	 * choose to return the default RFC 7231 recommended reason phrase (or those
+	 * listed in the IANA HTTP Status Code Registry) for the response's
+	 * status code.
+	 *
+	 * @link http://tools.ietf.org/html/rfc7231#section-6
+	 * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @return string Reason phrase; must return an empty string if none present.
+	 */
+	public function getReasonPhrase()
+	{
+		if ($this->reason === '')
+		{
+			return ! empty($this->statusCode) ? static::$statusCodes[$this->statusCode] : '';
+		}
+
+		return $this->reason;
+	}
+}
diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
new file mode 100644
index 0000000..c1f2ed0
--- /dev/null
+++ b/system/HTTP/ResponseInterface.php
@@ -0,0 +1,411 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Pager\PagerInterface;
+use DateTime;
+use InvalidArgumentException;
+
+/**
+ * Representation of an outgoing, getServer-side response.
+ * Most of these methods are supplied by ResponseTrait.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - Status code and reason phrase
+ * - Headers
+ * - Message body
+ *
+ * @mixin RedirectResponse
+ */
+interface ResponseInterface
+{
+	/**
+	 * Constants for status codes.
+	 * From  https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+	 */
+	// Informational
+	const HTTP_CONTINUE                        = 100;
+	const HTTP_SWITCHING_PROTOCOLS             = 101;
+	const HTTP_PROCESSING                      = 102;
+	const HTTP_EARLY_HINTS                     = 103;
+	const HTTP_OK                              = 200;
+	const HTTP_CREATED                         = 201;
+	const HTTP_ACCEPTED                        = 202;
+	const HTTP_NONAUTHORITATIVE_INFORMATION    = 203;
+	const HTTP_NO_CONTENT                      = 204;
+	const HTTP_RESET_CONTENT                   = 205;
+	const HTTP_PARTIAL_CONTENT                 = 206;
+	const HTTP_MULTI_STATUS                    = 207;
+	const HTTP_ALREADY_REPORTED                = 208;
+	const HTTP_IM_USED                         = 226;
+	const HTTP_MULTIPLE_CHOICES                = 300;
+	const HTTP_MOVED_PERMANENTLY               = 301;
+	const HTTP_FOUND                           = 302;
+	const HTTP_SEE_OTHER                       = 303;
+	const HTTP_NOT_MODIFIED                    = 304;
+	const HTTP_USE_PROXY                       = 305;
+	const HTTP_SWITCH_PROXY                    = 306;
+	const HTTP_TEMPORARY_REDIRECT              = 307;
+	const HTTP_PERMANENT_REDIRECT              = 308;
+	const HTTP_BAD_REQUEST                     = 400;
+	const HTTP_UNAUTHORIZED                    = 401;
+	const HTTP_PAYMENT_REQUIRED                = 402;
+	const HTTP_FORBIDDEN                       = 403;
+	const HTTP_NOT_FOUND                       = 404;
+	const HTTP_METHOD_NOT_ALLOWED              = 405;
+	const HTTP_NOT_ACCEPTABLE                  = 406;
+	const HTTP_PROXY_AUTHENTICATION_REQUIRED   = 407;
+	const HTTP_REQUEST_TIMEOUT                 = 408;
+	const HTTP_CONFLICT                        = 409;
+	const HTTP_GONE                            = 410;
+	const HTTP_LENGTH_REQUIRED                 = 411;
+	const HTTP_PRECONDITION_FAILED             = 412;
+	const HTTP_PAYLOAD_TOO_LARGE               = 413;
+	const HTTP_URI_TOO_LONG                    = 414;
+	const HTTP_UNSUPPORTED_MEDIA_TYPE          = 415;
+	const HTTP_RANGE_NOT_SATISFIABLE           = 416;
+	const HTTP_EXPECTATION_FAILED              = 417;
+	const HTTP_IM_A_TEAPOT                     = 418;
+	const HTTP_MISDIRECTED_REQUEST             = 421;
+	const HTTP_UNPROCESSABLE_ENTITY            = 422;
+	const HTTP_LOCKED                          = 423;
+	const HTTP_FAILED_DEPENDENCY               = 424;
+	const HTTP_TOO_EARLY                       = 425;
+	const HTTP_UPGRADE_REQUIRED                = 426;
+	const HTTP_PRECONDITION_REQUIRED           = 428;
+	const HTTP_TOO_MANY_REQUESTS               = 429;
+	const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+	const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS   = 451;
+	const HTTP_CLIENT_CLOSED_REQUEST           = 499;
+	const HTTP_INTERNAL_SERVER_ERROR           = 500;
+	const HTTP_NOT_IMPLEMENTED                 = 501;
+	const HTTP_BAD_GATEWAY                     = 502;
+	const HTTP_SERVICE_UNAVAILABLE             = 503;
+	const HTTP_GATEWAY_TIMEOUT                 = 504;
+	const HTTP_HTTP_VERSION_NOT_SUPPORTED      = 505;
+	const HTTP_VARIANT_ALSO_NEGOTIATES         = 506;
+	const HTTP_INSUFFICIENT_STORAGE            = 507;
+	const HTTP_LOOP_DETECTED                   = 508;
+	const HTTP_NOT_EXTENDED                    = 510;
+	const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
+	const HTTP_NETWORK_CONNECT_TIMEOUT_ERROR   = 599;
+
+	/**
+	 * Gets the response status code.
+	 *
+	 * The status code is a 3-digit integer result code of the getServer's attempt
+	 * to understand and satisfy the request.
+	 *
+	 * @return integer Status code.
+	 *
+	 * @deprecated To be replaced by the PSR-7 version (compatible)
+	 */
+	public function getStatusCode(): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return an instance with the specified status code and, optionally, reason phrase.
+	 *
+	 * If no reason phrase is specified, will default recommended reason phrase for
+	 * the response's status code.
+	 *
+	 * @see http://tools.ietf.org/html/rfc7231#section-6
+	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @param integer $code   The 3-digit integer result code to set.
+	 * @param string  $reason The reason phrase to use with the
+	 *                        provided status code; if none is provided, will
+	 *                        default to the IANA name.
+	 *
+	 * @return self
+	 * @throws InvalidArgumentException For invalid status code arguments.
+	 */
+	public function setStatusCode(int $code, string $reason = '');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the response response phrase associated with the status code.
+	 *
+	 * @see http://tools.ietf.org/html/rfc7231#section-6
+	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @return string
+	 *
+	 * @deprecated Use getReasonPhrase()
+	 */
+	public function getReason(): string;
+
+	//--------------------------------------------------------------------
+	// Convenience Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the date header
+	 *
+	 * @param DateTime $date
+	 *
+	 * @return ResponseInterface
+	 */
+	public function setDate(DateTime $date);
+
+	/**
+	 * Sets the Last-Modified date header.
+	 *
+	 * $date can be either a string representation of the date or,
+	 * preferably, an instance of DateTime.
+	 *
+	 * @param string|DateTime $date
+	 */
+	public function setLastModified($date);
+
+	/**
+	 * Set the Link Header
+	 *
+	 * @param PagerInterface $pager
+	 *
+	 * @see http://tools.ietf.org/html/rfc5988
+	 *
+	 * @return Response
+	 *
+	 * @todo Recommend moving to Pager
+	 */
+	public function setLink(PagerInterface $pager);
+
+	/**
+	 * Sets the Content Type header for this response with the mime type
+	 * and, optionally, the charset.
+	 *
+	 * @param string $mime
+	 * @param string $charset
+	 *
+	 * @return ResponseInterface
+	 */
+	public function setContentType(string $mime, string $charset = 'UTF-8');
+
+	//--------------------------------------------------------------------
+	// Formatter Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Converts the $body into JSON and sets the Content Type header.
+	 *
+	 * @param array|string $body
+	 * @param boolean      $unencoded
+	 *
+	 * @return $this
+	 */
+	public function setJSON($body, bool $unencoded = false);
+
+	/**
+	 * Returns the current body, converted to JSON is it isn't already.
+	 *
+	 * @return mixed|string
+	 *
+	 * @throws InvalidArgumentException If the body property is not array.
+	 */
+	public function getJSON();
+
+	/**
+	 * Converts $body into XML, and sets the correct Content-Type.
+	 *
+	 * @param array|string $body
+	 *
+	 * @return $this
+	 */
+	public function setXML($body);
+
+	/**
+	 * Retrieves the current body into XML and returns it.
+	 *
+	 * @return mixed|string
+	 * @throws InvalidArgumentException If the body property is not array.
+	 */
+	public function getXML();
+
+	//--------------------------------------------------------------------
+	// Cache Control Methods
+	//
+	// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the appropriate headers to ensure this response
+	 * is not cached by the browsers.
+	 */
+	public function noCache();
+
+	/**
+	 * A shortcut method that allows the developer to set all of the
+	 * cache-control headers in one method call.
+	 *
+	 * The options array is used to provide the cache-control directives
+	 * for the header. It might look something like:
+	 *
+	 *      $options = [
+	 *          'max-age'  => 300,
+	 *          's-maxage' => 900
+	 *          'etag'     => 'abcde',
+	 *      ];
+	 *
+	 * Typical options are:
+	 *  - etag
+	 *  - last-modified
+	 *  - max-age
+	 *  - s-maxage
+	 *  - private
+	 *  - public
+	 *  - must-revalidate
+	 *  - proxy-revalidate
+	 *  - no-transform
+	 *
+	 * @param array $options
+	 *
+	 * @return ResponseInterface
+	 */
+	public function setCache(array $options = []);
+
+	//--------------------------------------------------------------------
+	// Output Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sends the output to the browser.
+	 *
+	 * @return ResponseInterface
+	 */
+	public function send();
+
+	/**
+	 * Sends the headers of this HTTP request to the browser.
+	 *
+	 * @return Response
+	 */
+	public function sendHeaders();
+
+	/**
+	 * Sends the Body of the message to the browser.
+	 *
+	 * @return Response
+	 */
+	public function sendBody();
+
+	//--------------------------------------------------------------------
+	// Cookie Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set a cookie
+	 *
+	 * Accepts an arbitrary number of binds (up to 7) or an associative
+	 * array in the first parameter containing all the values.
+	 *
+	 * @param string|array $name     Cookie name or array containing binds
+	 * @param string       $value    Cookie value
+	 * @param string       $expire   Cookie expiration time in seconds
+	 * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
+	 * @param string       $path     Cookie path (default: '/')
+	 * @param string       $prefix   Cookie name prefix
+	 * @param boolean      $secure   Whether to only transfer cookies via SSL
+	 * @param boolean      $httponly Whether only make the cookie accessible via HTTP (no javascript)
+	 * @param string|null  $samesite
+	 *
+	 * @return $this
+	 */
+	public function setCookie(
+		$name,
+		$value = '',
+		$expire = '',
+		$domain = '',
+		$path = '/',
+		$prefix = '',
+		$secure = false,
+		$httponly = false,
+		$samesite = null
+	);
+
+	/**
+	 * Checks to see if the Response has a specified cookie or not.
+	 *
+	 * @param string      $name
+	 * @param string|null $value
+	 * @param string      $prefix
+	 *
+	 * @return boolean
+	 */
+	public function hasCookie(string $name, string $value = null, string $prefix = ''): bool;
+
+	/**
+	 * Returns the cookie
+	 *
+	 * @param string|null $name
+	 * @param string      $prefix
+	 *
+	 * @return Cookie[]|Cookie|null
+	 */
+	public function getCookie(string $name = null, string $prefix = '');
+
+	/**
+	 * Sets a cookie to be deleted when the response is sent.
+	 *
+	 * @param string $name
+	 * @param string $domain
+	 * @param string $path
+	 * @param string $prefix
+	 *
+	 * @return $this
+	 */
+	public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '');
+
+	/**
+	 * Returns all cookies currently set.
+	 *
+	 * @return Cookie[]
+	 */
+	public function getCookies();
+
+	//--------------------------------------------------------------------
+	// Response Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Perform a redirect to a new URL, in two flavors: header or location.
+	 *
+	 * @param string  $uri    The URI to redirect to
+	 * @param string  $method
+	 * @param integer $code   The type of redirection, defaults to 302
+	 *
+	 * @return $this
+	 * @throws HTTPException For invalid status code.
+	 */
+	public function redirect(string $uri, string $method = 'auto', int $code = null);
+
+	/**
+	 * Force a download.
+	 *
+	 * Generates the headers that force a download to happen. And
+	 * sends the file to the browser.
+	 *
+	 * @param string      $filename The path to the file to send
+	 * @param string|null $data     The data to be downloaded
+	 * @param boolean     $setMime  Whether to try and send the actual MIME type
+	 *
+	 * @return DownloadResponse|null
+	 */
+	public function download(string $filename = '', $data = '', bool $setMime = false);
+}
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
new file mode 100644
index 0000000..0938c59
--- /dev/null
+++ b/system/HTTP/ResponseTrait.php
@@ -0,0 +1,795 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+use CodeIgniter\Cookie\Exceptions\CookieException;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Pager\PagerInterface;
+use Config\Services;
+use DateTime;
+use DateTimeZone;
+use InvalidArgumentException;
+
+/**
+ * Request Trait
+ *
+ * Additional methods to make a PSR-7 Response class
+ * compliant with the framework's own ResponseInterface.
+ *
+ * @property array $statusCodes
+ *
+ * @see https://github.com/php-fig/http-message/blob/master/src/ResponseInterface.php
+ */
+trait ResponseTrait
+{
+	/**
+	 * Whether Content Security Policy is being enforced.
+	 *
+	 * @var boolean
+	 */
+	protected $CSPEnabled = false;
+
+	/**
+	 * Content security policy handler
+	 *
+	 * @var ContentSecurityPolicy
+	 */
+	public $CSP;
+
+	/**
+	 * CookieStore instance.
+	 *
+	 * @var CookieStore
+	 */
+	protected $cookieStore;
+
+	/**
+	 * Set a cookie name prefix if you need to avoid collisions
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookiePrefix = '';
+
+	/**
+	 * Set to .your-domain.com for site-wide cookies
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookieDomain = '';
+
+	/**
+	 * Typically will be a forward slash
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookiePath = '/';
+
+	/**
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookieSecure = false;
+
+	/**
+	 * Cookie will only be accessible via HTTP(S) (no javascript)
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookieHTTPOnly = false;
+
+	/**
+	 * Cookie SameSite setting
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookieSameSite = Cookie::SAMESITE_LAX;
+
+	/**
+	 * Stores all cookies that were set in the response.
+	 *
+	 * @var array
+	 *
+	 * @deprecated Use the dedicated Cookie class instead.
+	 */
+	protected $cookies = [];
+
+	/**
+	 * Type of format the body is in.
+	 * Valid: html, json, xml
+	 *
+	 * @var string
+	 */
+	protected $bodyFormat = 'html';
+
+	/**
+	 * Return an instance with the specified status code and, optionally, reason phrase.
+	 *
+	 * If no reason phrase is specified, will default recommended reason phrase for
+	 * the response's status code.
+	 *
+	 * @see http://tools.ietf.org/html/rfc7231#section-6
+	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @param integer $code   The 3-digit integer result code to set.
+	 * @param string  $reason The reason phrase to use with the
+	 *                        provided status code; if none is provided, will
+	 *                        default to the IANA name.
+	 *
+	 * @return $this
+	 * @throws HTTPException For invalid status code arguments.
+	 */
+	public function setStatusCode(int $code, string $reason = '')
+	{
+		// Valid range?
+		if ($code < 100 || $code > 599)
+		{
+			throw HTTPException::forInvalidStatusCode($code);
+		}
+
+		// Unknown and no message?
+		if (! array_key_exists($code, static::$statusCodes) && empty($reason))
+		{
+			throw HTTPException::forUnkownStatusCode($code);
+		}
+
+		$this->statusCode = $code;
+
+		$this->reason = ! empty($reason) ? $reason : static::$statusCodes[$code];
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	// Convenience Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the date header
+	 *
+	 * @param DateTime $date
+	 *
+	 * @return Response
+	 */
+	public function setDate(DateTime $date)
+	{
+		$date->setTimezone(new DateTimeZone('UTC'));
+
+		$this->setHeader('Date', $date->format('D, d M Y H:i:s') . ' GMT');
+
+		return $this;
+	}
+
+	/**
+	 * Set the Link Header
+	 *
+	 * @param PagerInterface $pager
+	 *
+	 * @see http://tools.ietf.org/html/rfc5988
+	 *
+	 * @return Response
+	 *
+	 * @todo Recommend moving to Pager
+	 */
+	public function setLink(PagerInterface $pager)
+	{
+		$links = '';
+
+		if ($previous = $pager->getPreviousPageURI())
+		{
+			$links .= '<' . $pager->getPageURI($pager->getFirstPage()) . '>; rel="first",';
+			$links .= '<' . $previous . '>; rel="prev"';
+		}
+
+		if (($next = $pager->getNextPageURI()) && $previous)
+		{
+			$links .= ',';
+		}
+
+		if ($next)
+		{
+			$links .= '<' . $next . '>; rel="next",';
+			$links .= '<' . $pager->getPageURI($pager->getLastPage()) . '>; rel="last"';
+		}
+
+		$this->setHeader('Link', $links);
+
+		return $this;
+	}
+
+	/**
+	 * Sets the Content Type header for this response with the mime type
+	 * and, optionally, the charset.
+	 *
+	 * @param string $mime
+	 * @param string $charset
+	 *
+	 * @return Response
+	 */
+	public function setContentType(string $mime, string $charset = 'UTF-8')
+	{
+		// add charset attribute if not already there and provided as parm
+		if ((strpos($mime, 'charset=') < 1) && ! empty($charset))
+		{
+			$mime .= '; charset=' . $charset;
+		}
+
+		$this->removeHeader('Content-Type'); // replace existing content type
+		$this->setHeader('Content-Type', $mime);
+
+		return $this;
+	}
+
+	/**
+	 * Converts the $body into JSON and sets the Content Type header.
+	 *
+	 * @param array|string $body
+	 * @param boolean      $unencoded
+	 *
+	 * @return $this
+	 */
+	public function setJSON($body, bool $unencoded = false)
+	{
+		$this->body = $this->formatBody($body, 'json' . ($unencoded ? '-unencoded' : ''));
+
+		return $this;
+	}
+
+	/**
+	 * Returns the current body, converted to JSON is it isn't already.
+	 *
+	 * @return mixed|string
+	 *
+	 * @throws InvalidArgumentException If the body property is not array.
+	 */
+	public function getJSON()
+	{
+		$body = $this->body;
+
+		if ($this->bodyFormat !== 'json')
+		{
+			$body = Services::format()->getFormatter('application/json')->format($body);
+		}
+
+		return $body ?: null;
+	}
+
+	/**
+	 * Converts $body into XML, and sets the correct Content-Type.
+	 *
+	 * @param array|string $body
+	 *
+	 * @return $this
+	 */
+	public function setXML($body)
+	{
+		$this->body = $this->formatBody($body, 'xml');
+
+		return $this;
+	}
+
+	/**
+	 * Retrieves the current body into XML and returns it.
+	 *
+	 * @return mixed|string
+	 * @throws InvalidArgumentException If the body property is not array.
+	 */
+	public function getXML()
+	{
+		$body = $this->body;
+
+		if ($this->bodyFormat !== 'xml')
+		{
+			$body = Services::format()->getFormatter('application/xml')->format($body);
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Handles conversion of the of the data into the appropriate format,
+	 * and sets the correct Content-Type header for our response.
+	 *
+	 * @param string|array $body
+	 * @param string       $format Valid: json, xml
+	 *
+	 * @return mixed
+	 * @throws InvalidArgumentException If the body property is not string or array.
+	 */
+	protected function formatBody($body, string $format)
+	{
+		$this->bodyFormat = ($format === 'json-unencoded' ? 'json' : $format);
+		$mime             = "application/{$this->bodyFormat}";
+		$this->setContentType($mime);
+
+		// Nothing much to do for a string...
+		if (! is_string($body) || $format === 'json-unencoded')
+		{
+			$body = Services::format()->getFormatter($mime)->format($body);
+		}
+
+		return $body;
+	}
+
+	//--------------------------------------------------------------------
+	// Cache Control Methods
+	//
+	// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the appropriate headers to ensure this response
+	 * is not cached by the browsers.
+	 *
+	 * @return Response
+	 *
+	 * @todo Recommend researching these directives, might need: 'private', 'no-transform', 'no-store', 'must-revalidate'
+	 *
+	 * @see DownloadResponse::noCache()
+	 */
+	public function noCache()
+	{
+		$this->removeHeader('Cache-control');
+		$this->setHeader('Cache-control', ['no-store', 'max-age=0', 'no-cache']);
+
+		return $this;
+	}
+
+	/**
+	 * A shortcut method that allows the developer to set all of the
+	 * cache-control headers in one method call.
+	 *
+	 * The options array is used to provide the cache-control directives
+	 * for the header. It might look something like:
+	 *
+	 *      $options = [
+	 *          'max-age'  => 300,
+	 *          's-maxage' => 900
+	 *          'etag'     => 'abcde',
+	 *      ];
+	 *
+	 * Typical options are:
+	 *  - etag
+	 *  - last-modified
+	 *  - max-age
+	 *  - s-maxage
+	 *  - private
+	 *  - public
+	 *  - must-revalidate
+	 *  - proxy-revalidate
+	 *  - no-transform
+	 *
+	 * @param array $options
+	 *
+	 * @return Response
+	 */
+	public function setCache(array $options = [])
+	{
+		if (empty($options))
+		{
+			return $this;
+		}
+
+		$this->removeHeader('Cache-Control');
+		$this->removeHeader('ETag');
+
+		// ETag
+		if (isset($options['etag']))
+		{
+			$this->setHeader('ETag', $options['etag']);
+			unset($options['etag']);
+		}
+
+		// Last Modified
+		if (isset($options['last-modified']))
+		{
+			$this->setLastModified($options['last-modified']);
+
+			unset($options['last-modified']);
+		}
+
+		$this->setHeader('Cache-control', $options);
+
+		return $this;
+	}
+
+	/**
+	 * Sets the Last-Modified date header.
+	 *
+	 * $date can be either a string representation of the date or,
+	 * preferably, an instance of DateTime.
+	 *
+	 * @param DateTime|string $date
+	 *
+	 * @return Response
+	 */
+	public function setLastModified($date)
+	{
+		if ($date instanceof DateTime)
+		{
+			$date->setTimezone(new DateTimeZone('UTC'));
+			$this->setHeader('Last-Modified', $date->format('D, d M Y H:i:s') . ' GMT');
+		}
+		elseif (is_string($date))
+		{
+			$this->setHeader('Last-Modified', $date);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	// Output Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sends the output to the browser.
+	 *
+	 * @return Response
+	 */
+	public function send()
+	{
+		// If we're enforcing a Content Security Policy,
+		// we need to give it a chance to build out it's headers.
+		if ($this->CSPEnabled === true)
+		{
+			$this->CSP->finalize($this);
+		}
+		else
+		{
+			$this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
+		}
+
+		$this->sendHeaders();
+		$this->sendCookies();
+		$this->sendBody();
+
+		return $this;
+	}
+
+	/**
+	 * Sends the headers of this HTTP request to the browser.
+	 *
+	 * @return Response
+	 */
+	public function sendHeaders()
+	{
+		// Have the headers already been sent?
+		if ($this->pretend || headers_sent())
+		{
+			return $this;
+		}
+
+		// Per spec, MUST be sent with each request, if possible.
+		// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html
+		if (! isset($this->headers['Date']) && php_sapi_name() !== 'cli-server')
+		{
+			$this->setDate(DateTime::createFromFormat('U', (string) time()));
+		}
+
+		// HTTP Status
+		header(sprintf('HTTP/%s %s %s', $this->getProtocolVersion(), $this->getStatusCode(), $this->getReason()), true, $this->getStatusCode());
+
+		// Send all of our headers
+		foreach (array_keys($this->getHeaders()) as $name)
+		{
+			header($name . ': ' . $this->getHeaderLine($name), false, $this->getStatusCode());
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sends the Body of the message to the browser.
+	 *
+	 * @return Response
+	 */
+	public function sendBody()
+	{
+		echo $this->body;
+
+		return $this;
+	}
+
+	/**
+	 * Perform a redirect to a new URL, in two flavors: header or location.
+	 *
+	 * @param string  $uri    The URI to redirect to
+	 * @param string  $method
+	 * @param integer $code   The type of redirection, defaults to 302
+	 *
+	 * @return $this
+	 * @throws HTTPException For invalid status code.
+	 */
+	public function redirect(string $uri, string $method = 'auto', int $code = null)
+	{
+		// Assume 302 status code response; override if needed
+		if (empty($code))
+		{
+			$code = 302;
+		}
+
+		// IIS environment likely? Use 'refresh' for better compatibility
+		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false)
+		{
+			$method = 'refresh';
+		}
+
+		// override status code for HTTP/1.1 & higher
+		// reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
+		if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $this->getProtocolVersion() >= 1.1 && $method !== 'refresh')
+		{
+			$code = ($_SERVER['REQUEST_METHOD'] !== 'GET') ? 303 : ($code === 302 ? 307 : $code);
+		}
+
+		switch ($method)
+		{
+			case 'refresh':
+				$this->setHeader('Refresh', '0;url=' . $uri);
+				break;
+			default:
+				$this->setHeader('Location', $uri);
+				break;
+		}
+
+		$this->setStatusCode($code);
+
+		return $this;
+	}
+
+	/**
+	 * Set a cookie
+	 *
+	 * Accepts an arbitrary number of binds (up to 7) or an associative
+	 * array in the first parameter containing all the values.
+	 *
+	 * @param string|array $name     Cookie name or array containing binds
+	 * @param string       $value    Cookie value
+	 * @param string       $expire   Cookie expiration time in seconds
+	 * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
+	 * @param string       $path     Cookie path (default: '/')
+	 * @param string       $prefix   Cookie name prefix
+	 * @param boolean      $secure   Whether to only transfer cookies via SSL
+	 * @param boolean      $httponly Whether only make the cookie accessible via HTTP (no javascript)
+	 * @param string|null  $samesite
+	 *
+	 * @return $this
+	 */
+	public function setCookie(
+		$name,
+		$value = '',
+		$expire = '',
+		$domain = '',
+		$path = '/',
+		$prefix = '',
+		$secure = false,
+		$httponly = false,
+		$samesite = null
+	)
+	{
+		if (is_array($name))
+		{
+			// always leave 'name' in last place, as the loop will break otherwise, due to $$item
+			foreach (['samesite', 'value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item)
+			{
+				if (isset($name[$item]))
+				{
+					$$item = $name[$item];
+				}
+			}
+		}
+
+		if (is_numeric($expire))
+		{
+			$expire = $expire > 0 ? time() + $expire : 0;
+		}
+
+		$cookie = new Cookie($name, $value, [
+			'expires'  => $expire ?: 0,
+			'domain'   => $domain,
+			'path'     => $path,
+			'prefix'   => $prefix,
+			'secure'   => $secure,
+			'httponly' => $httponly,
+			'samesite' => $samesite ?? '',
+		]);
+
+		$this->cookieStore = $this->cookieStore->put($cookie);
+
+		return $this;
+	}
+
+	/**
+	 * Returns the `CookieStore` instance.
+	 *
+	 * @return CookieStore
+	 */
+	public function getCookieStore()
+	{
+		return $this->cookieStore;
+	}
+
+	/**
+	 * Checks to see if the Response has a specified cookie or not.
+	 *
+	 * @param string      $name
+	 * @param string|null $value
+	 * @param string      $prefix
+	 *
+	 * @return boolean
+	 */
+	public function hasCookie(string $name, string $value = null, string $prefix = ''): bool
+	{
+		$prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
+
+		return $this->cookieStore->has($name, $prefix, $value);
+	}
+
+	/**
+	 * Returns the cookie
+	 *
+	 * @param string|null $name
+	 * @param string      $prefix
+	 *
+	 * @return Cookie[]|Cookie|null
+	 */
+	public function getCookie(string $name = null, string $prefix = '')
+	{
+		if ((string) $name === '')
+		{
+			return $this->cookieStore->display();
+		}
+
+		try
+		{
+			$prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
+
+			return $this->cookieStore->get($name, $prefix);
+		}
+		catch (CookieException $e)
+		{
+			log_message('error', $e->getMessage());
+			return null;
+		}
+	}
+
+	/**
+	 * Sets a cookie to be deleted when the response is sent.
+	 *
+	 * @param string $name
+	 * @param string $domain
+	 * @param string $path
+	 * @param string $prefix
+	 *
+	 * @return $this
+	 */
+	public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '')
+	{
+		if ($name === '')
+		{
+			return $this;
+		}
+
+		$prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
+
+		$prefixed = $prefix . $name;
+		$store    = $this->cookieStore;
+		$found    = false;
+
+		foreach ($store as $cookie)
+		{
+			if ($cookie->getPrefixedName() === $prefixed)
+			{
+				if ($domain !== $cookie->getDomain())
+				{
+					continue;
+				}
+
+				if ($path !== $cookie->getPath())
+				{
+					continue;
+				}
+
+				$cookie = $cookie->withValue('')->withExpired();
+				$found  = true;
+
+				$this->cookieStore = $store->put($cookie);
+				break;
+			}
+		}
+
+		if (! $found)
+		{
+			$this->setCookie($name, '', '', $domain, $path, $prefix);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns all cookies currently set.
+	 *
+	 * @return Cookie[]
+	 */
+	public function getCookies()
+	{
+		return $this->cookieStore->display();
+	}
+
+	/**
+	 * Actually sets the cookies.
+	 */
+	protected function sendCookies()
+	{
+		if ($this->pretend)
+		{
+			return;
+		}
+
+		$this->cookieStore->dispatch();
+	}
+
+	/**
+	 * Force a download.
+	 *
+	 * Generates the headers that force a download to happen. And
+	 * sends the file to the browser.
+	 *
+	 * @param string      $filename The path to the file to send
+	 * @param string|null $data     The data to be downloaded
+	 * @param boolean     $setMime  Whether to try and send the actual MIME type
+	 *
+	 * @return DownloadResponse|null
+	 */
+	public function download(string $filename = '', $data = '', bool $setMime = false)
+	{
+		if ($filename === '' || $data === '')
+		{
+			return null;
+		}
+
+		$filepath = '';
+		if ($data === null)
+		{
+			$filepath = $filename;
+			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
+			$filename = end($filename);
+		}
+
+		$response = new DownloadResponse($filename, $setMime);
+
+		if ($filepath !== '')
+		{
+			$response->setFilePath($filepath);
+		}
+		elseif ($data !== null)
+		{
+			$response->setBinary($data);
+		}
+
+		return $response;
+	}
+}
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
new file mode 100644
index 0000000..3fc4434
--- /dev/null
+++ b/system/HTTP/URI.php
@@ -0,0 +1,1246 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use InvalidArgumentException;
+
+/**
+ * Abstraction for a uniform resource identifier (URI).
+ */
+class URI
+{
+	/**
+	 * Sub-delimiters used in query strings and fragments.
+	 */
+	const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+
+	/**
+	 * Unreserved characters used in paths, query strings, and fragments.
+	 */
+	const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
+
+	/**
+	 * Current URI string
+	 *
+	 * @var string
+	 */
+	protected $uriString;
+
+	/**
+	 * List of URI segments.
+	 *
+	 * Starts at 1 instead of 0
+	 *
+	 * @var array
+	 */
+	protected $segments = [];
+
+	/**
+	 * The URI Scheme.
+	 *
+	 * @var string
+	 */
+	protected $scheme = 'http';
+
+	/**
+	 * URI User Info
+	 *
+	 * @var string
+	 */
+	protected $user;
+
+	/**
+	 * URI User Password
+	 *
+	 * @var string
+	 */
+	protected $password;
+
+	/**
+	 * URI Host
+	 *
+	 * @var string
+	 */
+	protected $host;
+
+	/**
+	 * URI Port
+	 *
+	 * @var integer
+	 */
+	protected $port;
+
+	/**
+	 * URI path.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * The name of any fragment.
+	 *
+	 * @var string
+	 */
+	protected $fragment = '';
+
+	/**
+	 * The query string.
+	 *
+	 * @var array
+	 */
+	protected $query = [];
+
+	/**
+	 * Default schemes/ports.
+	 *
+	 * @var array
+	 */
+	protected $defaultPorts = [
+		'http'  => 80,
+		'https' => 443,
+		'ftp'   => 21,
+		'sftp'  => 22,
+	];
+
+	/**
+	 * Whether passwords should be shown in userInfo/authority calls.
+	 * Default to false because URIs often show up in logs
+	 *
+	 * @var boolean
+	 */
+	protected $showPassword = false;
+
+	/**
+	 * If true, will continue instead of throwing exceptions.
+	 *
+	 * @var boolean
+	 */
+	protected $silent = false;
+
+	/**
+	 * If true, will use raw query string.
+	 *
+	 * @var boolean
+	 */
+	protected $rawQueryString = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds a representation of the string from the component parts.
+	 *
+	 * @param string $scheme
+	 * @param string $authority
+	 * @param string $path
+	 * @param string $query
+	 * @param string $fragment
+	 *
+	 * @return string
+	 */
+	public static function createURIString(string $scheme = null, string $authority = null, string $path = null, string $query = null, string $fragment = null): string
+	{
+		$uri = '';
+		if (! empty($scheme))
+		{
+			$uri .= $scheme . '://';
+		}
+
+		if (! empty($authority))
+		{
+			$uri .= $authority;
+		}
+
+		if (isset($path) && $path !== '')
+		{
+			$uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
+		}
+
+		if ($query)
+		{
+			$uri .= '?' . $query;
+		}
+
+		if ($fragment)
+		{
+			$uri .= '#' . $fragment;
+		}
+
+		return $uri;
+	}
+
+	/**
+	 * Used when resolving and merging paths to correctly interpret and
+	 * remove single and double dot segments from the path per
+	 * RFC 3986 Section 5.2.4
+	 *
+	 * @see http://tools.ietf.org/html/rfc3986#section-5.2.4
+	 *
+	 * @param string $path
+	 *
+	 * @return   string
+	 * @internal
+	 */
+	public static function removeDotSegments(string $path): string
+	{
+		if ($path === '' || $path === '/')
+		{
+			return $path;
+		}
+
+		$output = [];
+
+		$input = explode('/', $path);
+
+		if ($input[0] === '')
+		{
+			unset($input[0]);
+			$input = array_values($input);
+		}
+
+		// This is not a perfect representation of the
+		// RFC, but matches most cases and is pretty
+		// much what Guzzle uses. Should be good enough
+		// for almost every real use case.
+		foreach ($input as $segment)
+		{
+			if ($segment === '..')
+			{
+				array_pop($output);
+			}
+			elseif ($segment !== '.' && $segment !== '')
+			{
+				$output[] = $segment;
+			}
+		}
+
+		$output = implode('/', $output);
+		$output = trim($output, '/ ');
+
+		// Add leading slash if necessary
+		if (strpos($path, '/') === 0)
+		{
+			$output = '/' . $output;
+		}
+
+		// Add trailing slash if necessary
+		if ($output !== '/' && substr($path, -1, 1) === '/')
+		{
+			$output .= '/';
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uri
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(string $uri = null)
+	{
+		if (! is_null($uri))
+		{
+			$this->setURI($uri);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If $silent == true, then will not throw exceptions and will
+	 * attempt to continue gracefully.
+	 *
+	 * @param boolean $silent
+	 *
+	 * @return URI
+	 */
+	public function setSilent(bool $silent = true)
+	{
+		$this->silent = $silent;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If $raw == true, then will use parseStr() method
+	 * instead of native parse_str() function.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return URI
+	 */
+	public function useRawQueryString(bool $raw = true)
+	{
+		$this->rawQueryString = $raw;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets and overwrites any current URI information.
+	 *
+	 * @param string|null $uri
+	 *
+	 * @return URI
+	 */
+	public function setURI(string $uri = null)
+	{
+		if (! is_null($uri))
+		{
+			$parts = parse_url($uri);
+
+			if ($parts === false)
+			{
+				if ($this->silent)
+				{
+					return $this;
+				}
+
+				throw HTTPException::forUnableToParseURI($uri);
+			}
+
+			$this->applyParts($parts);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the scheme component of the URI.
+	 *
+	 * If no scheme is present, this method MUST return an empty string.
+	 *
+	 * The value returned MUST be normalized to lowercase, per RFC 3986
+	 * Section 3.1.
+	 *
+	 * The trailing ":" character is not part of the scheme and MUST NOT be
+	 * added.
+	 *
+	 * @see    https://tools.ietf.org/html/rfc3986#section-3.1
+	 * @return string The URI scheme.
+	 */
+	public function getScheme(): string
+	{
+		return $this->scheme;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the authority component of the URI.
+	 *
+	 * If no authority information is present, this method MUST return an empty
+	 * string.
+	 *
+	 * The authority syntax of the URI is:
+	 *
+	 * <pre>
+	 * [user-info@]host[:port]
+	 * </pre>
+	 *
+	 * If the port component is not set or is the standard port for the current
+	 * scheme, it SHOULD NOT be included.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.2
+	 *
+	 * @param boolean $ignorePort
+	 *
+	 * @return string The URI authority, in "[user-info@]host[:port]" format.
+	 */
+	public function getAuthority(bool $ignorePort = false): string
+	{
+		if (empty($this->host))
+		{
+			return '';
+		}
+
+		$authority = $this->host;
+
+		if (! empty($this->getUserInfo()))
+		{
+			$authority = $this->getUserInfo() . '@' . $authority;
+		}
+
+		// Don't add port if it's a standard port for
+		// this scheme
+		if (! empty($this->port) && ! $ignorePort && $this->port !== $this->defaultPorts[$this->scheme])
+		{
+			$authority .= ':' . $this->port;
+		}
+
+		$this->showPassword = false;
+
+		return $authority;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the user information component of the URI.
+	 *
+	 * If no user information is present, this method MUST return an empty
+	 * string.
+	 *
+	 * If a user is present in the URI, this will return that value;
+	 * additionally, if the password is also present, it will be appended to the
+	 * user value, with a colon (":") separating the values.
+	 *
+	 * NOTE that be default, the password, if available, will NOT be shown
+	 * as a security measure as discussed in RFC 3986, Section 7.5. If you know
+	 * the password is not a security issue, you can force it to be shown
+	 * with $this->showPassword();
+	 *
+	 * The trailing "@" character is not part of the user information and MUST
+	 * NOT be added.
+	 *
+	 * @return string|null The URI user information, in "username[:password]" format.
+	 */
+	public function getUserInfo()
+	{
+		$userInfo = $this->user;
+
+		if ($this->showPassword === true && ! empty($this->password))
+		{
+			$userInfo .= ':' . $this->password;
+		}
+
+		return $userInfo;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Temporarily sets the URI to show a password in userInfo. Will
+	 * reset itself after the first call to authority().
+	 *
+	 * @param boolean $val
+	 *
+	 * @return URI
+	 */
+	public function showPassword(bool $val = true)
+	{
+		$this->showPassword = $val;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the host component of the URI.
+	 *
+	 * If no host is present, this method MUST return an empty string.
+	 *
+	 * The value returned MUST be normalized to lowercase, per RFC 3986
+	 * Section 3.2.2.
+	 *
+	 * @see    http://tools.ietf.org/html/rfc3986#section-3.2.2
+	 * @return string The URI host.
+	 */
+	public function getHost(): string
+	{
+		return $this->host ?? '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the port component of the URI.
+	 *
+	 * If a port is present, and it is non-standard for the current scheme,
+	 * this method MUST return it as an integer. If the port is the standard port
+	 * used with the current scheme, this method SHOULD return null.
+	 *
+	 * If no port is present, and no scheme is present, this method MUST return
+	 * a null value.
+	 *
+	 * If no port is present, but a scheme is present, this method MAY return
+	 * the standard port for that scheme, but SHOULD return null.
+	 *
+	 * @return null|integer The URI port.
+	 */
+	public function getPort()
+	{
+		return $this->port;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the path component of the URI.
+	 *
+	 * The path can either be empty or absolute (starting with a slash) or
+	 * rootless (not starting with a slash). Implementations MUST support all
+	 * three syntaxes.
+	 *
+	 * Normally, the empty path "" and absolute path "/" are considered equal as
+	 * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+	 * do this normalization because in contexts with a trimmed base path, e.g.
+	 * the front controller, this difference becomes significant. It's the task
+	 * of the user to handle both "" and "/".
+	 *
+	 * The value returned MUST be percent-encoded, but MUST NOT double-encode
+	 * any characters. To determine what characters to encode, please refer to
+	 * RFC 3986, Sections 2 and 3.3.
+	 *
+	 * As an example, if the value should include a slash ("/") not intended as
+	 * delimiter between path segments, that value MUST be passed in encoded
+	 * form (e.g., "%2F") to the instance.
+	 *
+	 * @see    https://tools.ietf.org/html/rfc3986#section-2
+	 * @see    https://tools.ietf.org/html/rfc3986#section-3.3
+	 * @return string The URI path.
+	 */
+	public function getPath(): string
+	{
+		return $this->path ?? '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the query string
+	 *
+	 * @param array $options
+	 *
+	 * @return string
+	 */
+	public function getQuery(array $options = []): string
+	{
+		$vars = $this->query;
+
+		if (array_key_exists('except', $options))
+		{
+			if (! is_array($options['except']))
+			{
+				$options['except'] = [$options['except']];
+			}
+
+			foreach ($options['except'] as $var)
+			{
+				unset($vars[$var]);
+			}
+		}
+		elseif (array_key_exists('only', $options))
+		{
+			$temp = [];
+
+			if (! is_array($options['only']))
+			{
+				$options['only'] = [$options['only']];
+			}
+
+			foreach ($options['only'] as $var)
+			{
+				if (array_key_exists($var, $vars))
+				{
+					$temp[$var] = $vars[$var];
+				}
+			}
+
+			$vars = $temp;
+		}
+
+		return empty($vars) ? '' : http_build_query($vars);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve a URI fragment
+	 *
+	 * @return string
+	 */
+	public function getFragment(): string
+	{
+		return $this->fragment ?? '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the segments of the path as an array.
+	 *
+	 * @return array
+	 */
+	public function getSegments(): array
+	{
+		return $this->segments;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the value of a specific segment of the URI path.
+	 *
+	 * @param integer $number  Segment number
+	 * @param string  $default Default value
+	 *
+	 * @return string     The value of the segment. If no segment is found,
+	 *                    throws InvalidArgumentError
+	 */
+	public function getSegment(int $number, string $default = ''): string
+	{
+		// The segment should treat the array as 1-based for the user
+		// but we still have to deal with a zero-based array.
+		$number -= 1;
+
+		if ($number > count($this->segments) && ! $this->silent)
+		{
+			throw HTTPException::forURISegmentOutOfRange($number);
+		}
+
+		return $this->segments[$number] ?? $default;
+	}
+
+	/**
+	 * Set the value of a specific segment of the URI path.
+	 * Allows to set only existing segments or add new one.
+	 *
+	 * @param integer $number
+	 * @param mixed   $value  (string or int)
+	 *
+	 * @return $this
+	 */
+	public function setSegment(int $number, $value)
+	{
+		// The segment should treat the array as 1-based for the user
+		// but we still have to deal with a zero-based array.
+		$number -= 1;
+
+		if ($number > count($this->segments) + 1)
+		{
+			if ($this->silent)
+			{
+				return $this;
+			}
+
+			throw HTTPException::forURISegmentOutOfRange($number);
+		}
+
+		$this->segments[$number] = $value;
+		$this->refreshPath();
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of segments.
+	 *
+	 * @return integer
+	 */
+	public function getTotalSegments(): int
+	{
+		return count($this->segments);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Formats the URI as a string.
+	 *
+	 * Warning: For backwards-compatability this method
+	 * assumes URIs with the same host as baseURL should
+	 * be relative to the project's configuration.
+	 * This aspect of __toString() is deprecated and should be avoided.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		$path   = $this->getPath();
+		$scheme = $this->getScheme();
+
+		// Check if this is an internal URI
+		$config  = config('App');
+		$baseUri = new self($config->baseURL);
+
+		// If the hosts matches then assume this should be relative to baseURL
+		if ($this->getHost() === $baseUri->getHost())
+		{
+			// Check for additional segments
+			$basePath = trim($baseUri->getPath(), '/') . '/';
+			$trimPath = ltrim($path, '/');
+
+			if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
+			{
+				$path = $basePath . $trimPath;
+			}
+
+			// Check for forced HTTPS
+			if ($config->forceGlobalSecureRequests)
+			{
+				$scheme = 'https';
+			}
+		}
+
+		return static::createURIString(
+			$scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
+			$this->getQuery(), $this->getFragment()
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the given string and saves the appropriate authority pieces.
+	 *
+	 * @param string $str
+	 *
+	 * @return $this
+	 */
+	public function setAuthority(string $str)
+	{
+		$parts = parse_url($str);
+
+		if (! isset($parts['path']))
+		{
+			$parts['path'] = $this->getPath();
+		}
+
+		if (empty($parts['host']) && $parts['path'] !== '')
+		{
+			$parts['host'] = $parts['path'];
+			unset($parts['path']); // @phpstan-ignore-line
+		}
+
+		$this->applyParts($parts);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the scheme for this URI.
+	 *
+	 * Because of the large number of valid schemes we cannot limit this
+	 * to only http or https.
+	 *
+	 * @see https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
+	 *
+	 * @param string $str
+	 *
+	 * @return $this
+	 */
+	public function setScheme(string $str)
+	{
+		$str = strtolower($str);
+		$str = preg_replace('#:(//)?$#', '', $str);
+
+		$this->scheme = $str;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the userInfo/Authority portion of the URI.
+	 *
+	 * @param string $user The user's username
+	 * @param string $pass The user's password
+	 *
+	 * @return $this
+	 */
+	public function setUserInfo(string $user, string $pass)
+	{
+		$this->user     = trim($user);
+		$this->password = trim($pass);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the host name to use.
+	 *
+	 * @param string $str
+	 *
+	 * @return $this
+	 */
+	public function setHost(string $str)
+	{
+		$this->host = trim($str);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the port portion of the URI.
+	 *
+	 * @param integer $port
+	 *
+	 * @return $this
+	 */
+	public function setPort(int $port = null)
+	{
+		if (is_null($port))
+		{
+			return $this;
+		}
+
+		if ($port <= 0 || $port > 65535)
+		{
+			if ($this->silent)
+			{
+				return $this;
+			}
+
+			throw HTTPException::forInvalidPort($port);
+		}
+
+		$this->port = $port;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the path portion of the URI.
+	 *
+	 * @param string $path
+	 *
+	 * @return $this
+	 */
+	public function setPath(string $path)
+	{
+		$this->path = $this->filterPath($path);
+
+		$tempPath = trim($this->path, '/');
+
+		$this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
+
+		return $this;
+	}
+
+	/**
+	 * Sets the path portion of the URI based on segments.
+	 *
+	 * @return $this
+	 */
+	public function refreshPath()
+	{
+		$this->path = $this->filterPath(implode('/', $this->segments));
+
+		$tempPath = trim($this->path, '/');
+
+		$this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the query portion of the URI, while attempting
+	 * to clean the various parts of the query keys and values.
+	 *
+	 * @param string $query
+	 *
+	 * @return $this
+	 */
+	public function setQuery(string $query)
+	{
+		if (strpos($query, '#') !== false)
+		{
+			if ($this->silent)
+			{
+				return $this;
+			}
+
+			throw HTTPException::forMalformedQueryString();
+		}
+
+		// Can't have leading ?
+		if (! empty($query) && strpos($query, '?') === 0)
+		{
+			$query = substr($query, 1);
+		}
+
+		if ($this->rawQueryString)
+		{
+			$this->query = $this->parseStr($query);
+		}
+		else
+		{
+			parse_str($query, $this->query);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A convenience method to pass an array of items in as the Query
+	 * portion of the URI.
+	 *
+	 * @param array $query
+	 *
+	 * @return URI
+	 */
+	public function setQueryArray(array $query)
+	{
+		$query = http_build_query($query);
+
+		return $this->setQuery($query);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a single new element to the query vars.
+	 *
+	 * @param string $key
+	 * @param mixed  $value
+	 *
+	 * @return $this
+	 */
+	public function addQuery(string $key, $value = null)
+	{
+		$this->query[$key] = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes one or more query vars from the URI.
+	 *
+	 * @param string ...$params
+	 *
+	 * @return $this
+	 */
+	public function stripQuery(...$params)
+	{
+		foreach ($params as $param)
+		{
+			unset($this->query[$param]);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Filters the query variables so that only the keys passed in
+	 * are kept. The rest are removed from the object.
+	 *
+	 * @param string ...$params
+	 *
+	 * @return $this
+	 */
+	public function keepQuery(...$params)
+	{
+		$temp = [];
+
+		foreach ($this->query as $key => $value)
+		{
+			if (! in_array($key, $params, true))
+			{
+				continue;
+			}
+
+			$temp[$key] = $value;
+		}
+
+		$this->query = $temp;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the fragment portion of the URI.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.5
+	 *
+	 * @param string $string
+	 *
+	 * @return $this
+	 */
+	public function setFragment(string $string)
+	{
+		$this->fragment = trim($string, '# ');
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Encodes any dangerous characters, and removes dot segments.
+	 * While dot segments have valid uses according to the spec,
+	 * this URI class does not allow them.
+	 *
+	 * @param string|null $path
+	 *
+	 * @return string
+	 */
+	protected function filterPath(string $path = null): string
+	{
+		$orig = $path;
+
+		// Decode/normalize percent-encoded chars so
+		// we can always have matching for Routes, etc.
+		$path = urldecode($path);
+
+		// Remove dot segments
+		$path = self::removeDotSegments($path);
+
+		// Fix up some leading slash edge cases...
+		if (strpos($orig, './') === 0)
+		{
+			$path = '/' . $path;
+		}
+		if (strpos($orig, '../') === 0)
+		{
+			$path = '/' . $path;
+		}
+
+		// Encode characters
+		$path = preg_replace_callback(
+				'/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/', function (array $matches) {
+					return rawurlencode($matches[0]);
+				}, $path
+		);
+
+		return $path;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves our parts from a parse_url call.
+	 *
+	 * @param array $parts
+	 */
+	protected function applyParts(array $parts)
+	{
+		if (! empty($parts['host']))
+		{
+			$this->host = $parts['host'];
+		}
+		if (! empty($parts['user']))
+		{
+			$this->user = $parts['user'];
+		}
+		if (isset($parts['path']) && $parts['path'] !== '')
+		{
+			$this->path = $this->filterPath($parts['path']);
+		}
+		if (! empty($parts['query']))
+		{
+			$this->setQuery($parts['query']);
+		}
+		if (! empty($parts['fragment']))
+		{
+			$this->fragment = $parts['fragment'];
+		}
+
+		// Scheme
+		if (isset($parts['scheme']))
+		{
+			$this->setScheme(rtrim($parts['scheme'], ':/'));
+		}
+		else
+		{
+			$this->setScheme('http');
+		}
+
+		// Port
+		if (isset($parts['port']) && ! is_null($parts['port']))
+		{
+			// Valid port numbers are enforced by earlier parse_url or setPort()
+			$port       = $parts['port'];
+			$this->port = $port;
+		}
+
+		if (isset($parts['pass']))
+		{
+			$this->password = $parts['pass'];
+		}
+
+		// Populate our segments array
+		if (isset($parts['path']) && $parts['path'] !== '')
+		{
+			$tempPath = trim($parts['path'], '/');
+
+			$this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines one URI string with this one based on the rules set out in
+	 * RFC 3986 Section 2
+	 *
+	 * @see http://tools.ietf.org/html/rfc3986#section-5.2
+	 *
+	 * @param string $uri
+	 *
+	 * @return URI
+	 */
+	public function resolveRelativeURI(string $uri)
+	{
+		/*
+		 * NOTE: We don't use removeDotSegments in this
+		 * algorithm since it's already done by this line!
+		 */
+		$relative = new self();
+		$relative->setURI($uri);
+
+		if ($relative->getScheme() === $this->getScheme())
+		{
+			$relative->setScheme('');
+		}
+
+		$transformed = clone $relative;
+
+		// 5.2.2 Transform References in a non-strict method (no scheme)
+		if (! empty($relative->getAuthority()))
+		{
+			$transformed->setAuthority($relative->getAuthority())
+					->setPath($relative->getPath())
+					->setQuery($relative->getQuery());
+		}
+		else
+		{
+			if ($relative->getPath() === '')
+			{
+				$transformed->setPath($this->getPath());
+
+				if ($relative->getQuery())
+				{
+					$transformed->setQuery($relative->getQuery());
+				}
+				else
+				{
+					$transformed->setQuery($this->getQuery());
+				}
+			}
+			else
+			{
+				if (strpos($relative->getPath(), '/') === 0)
+				{
+					$transformed->setPath($relative->getPath());
+				}
+				else
+				{
+					$transformed->setPath($this->mergePaths($this, $relative));
+				}
+
+				$transformed->setQuery($relative->getQuery());
+			}
+
+			$transformed->setAuthority($this->getAuthority());
+		}
+
+		$transformed->setScheme($this->getScheme());
+
+		$transformed->setFragment($relative->getFragment());
+
+		return $transformed;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given 2 paths, will merge them according to rules set out in RFC 2986,
+	 * Section 5.2
+	 *
+	 * @see http://tools.ietf.org/html/rfc3986#section-5.2.3
+	 *
+	 * @param URI $base
+	 * @param URI $reference
+	 *
+	 * @return string
+	 */
+	protected function mergePaths(URI $base, URI $reference): string
+	{
+		if (! empty($base->getAuthority()) && $base->getPath() === '')
+		{
+			return '/' . ltrim($reference->getPath(), '/ ');
+		}
+
+		$path = explode('/', $base->getPath());
+
+		if ($path[0] === '')
+		{
+			unset($path[0]);
+		}
+
+		array_pop($path);
+		$path[] = $reference->getPath();
+
+		return implode('/', $path);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * This is equivalent to the native PHP parse_str() function.
+	 * This version allows the dot to be used as a key of the query string.
+	 *
+	 * @param string $query
+	 *
+	 * @return array
+	 */
+	protected function parseStr(string $query): array
+	{
+		$return = [];
+		$query  = explode('&', $query);
+
+		$params = array_map(function (string $chunk) {
+			return preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', function (array $match) {
+				return str_replace($match['key'], bin2hex($match['key']), $match[0]);
+			}, urldecode($chunk));
+		}, $query);
+
+		$params = implode('&', $params);
+		parse_str($params, $params);
+
+		foreach ($params as $key => $value)
+		{
+			$return[hex2bin($key)] = $value;
+		}
+
+		$query = $params = null;
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
new file mode 100644
index 0000000..029775e
--- /dev/null
+++ b/system/HTTP/UserAgent.php
@@ -0,0 +1,475 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use Config\UserAgents;
+
+/**
+ * Abstraction for an HTTP user agent
+ */
+class UserAgent
+{
+	/**
+	 * Current user-agent
+	 *
+	 * @var string
+	 */
+	protected $agent = '';
+
+	/**
+	 * Flag for if the user-agent belongs to a browser
+	 *
+	 * @var boolean
+	 */
+	protected $isBrowser = false;
+
+	/**
+	 * Flag for if the user-agent is a robot
+	 *
+	 * @var boolean
+	 */
+	protected $isRobot = false;
+
+	/**
+	 * Flag for if the user-agent is a mobile browser
+	 *
+	 * @var boolean
+	 */
+	protected $isMobile = false;
+
+	/**
+	 * Holds the config file contents.
+	 *
+	 * @var UserAgents
+	 */
+	protected $config;
+
+	/**
+	 * Current user-agent platform
+	 *
+	 * @var string
+	 */
+	protected $platform = '';
+
+	/**
+	 * Current user-agent browser
+	 *
+	 * @var string
+	 */
+	protected $browser = '';
+
+	/**
+	 * Current user-agent version
+	 *
+	 * @var string
+	 */
+	protected $version = '';
+
+	/**
+	 * Current user-agent mobile name
+	 *
+	 * @var string
+	 */
+	protected $mobile = '';
+
+	/**
+	 * Current user-agent robot name
+	 *
+	 * @var string
+	 */
+	protected $robot = '';
+
+	/**
+	 * HTTP Referer
+	 *
+	 * @var mixed
+	 */
+	protected $referrer;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * Sets the User Agent and runs the compilation routine
+	 *
+	 * @param null|UserAgents $config
+	 */
+	public function __construct(UserAgents $config = null)
+	{
+		$this->config = $config ?? new UserAgents();
+
+		if (isset($_SERVER['HTTP_USER_AGENT']))
+		{
+			$this->agent = trim($_SERVER['HTTP_USER_AGENT']);
+			$this->compileData();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Is Browser
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function isBrowser(string $key = null): bool
+	{
+		if (! $this->isBrowser)
+		{
+			return false;
+		}
+
+		// No need to be specific, it's a browser
+		if ($key === null)
+		{
+			return true;
+		}
+
+		// Check for a specific browser
+		return (isset($this->config->browsers[$key]) && $this->browser === $this->config->browsers[$key]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Is Robot
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function isRobot(string $key = null): bool
+	{
+		if (! $this->isRobot)
+		{
+			return false;
+		}
+
+		// No need to be specific, it's a robot
+		if ($key === null)
+		{
+			return true;
+		}
+
+		// Check for a specific robot
+		return (isset($this->config->robots[$key]) && $this->robot === $this->config->robots[$key]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Is Mobile
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	public function isMobile(string $key = null): bool
+	{
+		if (! $this->isMobile)
+		{
+			return false;
+		}
+
+		// No need to be specific, it's a mobile
+		if ($key === null)
+		{
+			return true;
+		}
+
+		// Check for a specific robot
+		return (isset($this->config->mobiles[$key]) && $this->mobile === $this->config->mobiles[$key]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Is this a referral from another site?
+	 *
+	 * @return boolean
+	 */
+	public function isReferral(): bool
+	{
+		if (! isset($this->referrer))
+		{
+			if (empty($_SERVER['HTTP_REFERER']))
+			{
+				$this->referrer = false;
+			}
+			else
+			{
+				$refererHost = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
+				$ownHost     = parse_url(\base_url(), PHP_URL_HOST);
+
+				$this->referrer = ($refererHost && $refererHost !== $ownHost);
+			}
+		}
+
+		return $this->referrer;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Agent String
+	 *
+	 * @return string
+	 */
+	public function getAgentString(): string
+	{
+		return $this->agent;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Platform
+	 *
+	 * @return string
+	 */
+	public function getPlatform(): string
+	{
+		return $this->platform;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Browser Name
+	 *
+	 * @return string
+	 */
+	public function getBrowser(): string
+	{
+		return $this->browser;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the Browser Version
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		return $this->version;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get The Robot Name
+	 *
+	 * @return string
+	 */
+	public function getRobot(): string
+	{
+		return $this->robot;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the Mobile Device
+	 *
+	 * @return string
+	 */
+	public function getMobile(): string
+	{
+		return $this->mobile;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the referrer
+	 *
+	 * @return string
+	 */
+	public function getReferrer(): string
+	{
+		return empty($_SERVER['HTTP_REFERER']) ? '' : trim($_SERVER['HTTP_REFERER']);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse a custom user-agent string
+	 *
+	 * @param string $string
+	 *
+	 * @return void
+	 */
+	public function parse(string $string)
+	{
+		// Reset values
+		$this->isBrowser = false;
+		$this->isRobot   = false;
+		$this->isMobile  = false;
+		$this->browser   = '';
+		$this->version   = '';
+		$this->mobile    = '';
+		$this->robot     = '';
+
+		// Set the new user-agent string and parse it, unless empty
+		$this->agent = $string;
+
+		if (! empty($string))
+		{
+			$this->compileData();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compile the User Agent Data
+	 *
+	 * @return void
+	 */
+	protected function compileData()
+	{
+		$this->setPlatform();
+
+		foreach (['setRobot', 'setBrowser', 'setMobile'] as $function)
+		{
+			if ($this->$function() === true)
+			{
+				break;
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set the Platform
+	 *
+	 * @return boolean
+	 */
+	protected function setPlatform(): bool
+	{
+		if (is_array($this->config->platforms) && $this->config->platforms)
+		{
+			foreach ($this->config->platforms as $key => $val)
+			{
+				if (preg_match('|' . preg_quote($key) . '|i', $this->agent))
+				{
+					$this->platform = $val;
+
+					return true;
+				}
+			}
+		}
+
+		$this->platform = 'Unknown Platform';
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set the Browser
+	 *
+	 * @return boolean
+	 */
+	protected function setBrowser(): bool
+	{
+		if (is_array($this->config->browsers) && $this->config->browsers)
+		{
+			foreach ($this->config->browsers as $key => $val)
+			{
+				if (preg_match('|' . $key . '.*?([0-9\.]+)|i', $this->agent, $match))
+				{
+					$this->isBrowser = true;
+					$this->version   = $match[1];
+					$this->browser   = $val;
+					$this->setMobile();
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set the Robot
+	 *
+	 * @return boolean
+	 */
+	protected function setRobot(): bool
+	{
+		if (is_array($this->config->robots) && $this->config->robots)
+		{
+			foreach ($this->config->robots as $key => $val)
+			{
+				if (preg_match('|' . preg_quote($key) . '|i', $this->agent))
+				{
+					$this->isRobot = true;
+					$this->robot   = $val;
+					$this->setMobile();
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set the Mobile Device
+	 *
+	 * @return boolean
+	 */
+	protected function setMobile(): bool
+	{
+		if (is_array($this->config->mobiles) && $this->config->mobiles)
+		{
+			foreach ($this->config->mobiles as $key => $val)
+			{
+				if (false !== (stripos($this->agent, $key)))
+				{
+					$this->isMobile = true;
+					$this->mobile   = $val;
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs the original Agent String when cast as a string.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->getAgentString();
+	}
+}
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
new file mode 100644
index 0000000..b818ff6
--- /dev/null
+++ b/system/Helpers/array_helper.php
@@ -0,0 +1,243 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * CodeIgniter Array Helpers
+ */
+
+if (! function_exists('dot_array_search'))
+{
+	/**
+	 * Searches an array through dot syntax. Supports
+	 * wildcard searches, like foo.*.bar
+	 *
+	 * @param string $index
+	 * @param array  $array
+	 *
+	 * @return mixed
+	 */
+	function dot_array_search(string $index, array $array)
+	{
+		$segments = preg_split('/(?<!\\\)\./', rtrim($index, '* '), 0, PREG_SPLIT_NO_EMPTY);
+
+		$segments = array_map(static function ($key) {
+			return str_replace('\.', '.', $key);
+		}, $segments);
+
+		return _array_search_dot($segments, $array);
+	}
+}
+
+if (! function_exists('_array_search_dot'))
+{
+	/**
+	 * Used by `dot_array_search` to recursively search the
+	 * array with wildcards.
+	 *
+	 * @internal This should not be used on its own.
+	 *
+	 * @param array $indexes
+	 * @param array $array
+	 *
+	 * @return mixed
+	 */
+	function _array_search_dot(array $indexes, array $array)
+	{
+		// Grab the current index
+		$currentIndex = $indexes ? array_shift($indexes) : null;
+
+		if ((empty($currentIndex) && (int) $currentIndex !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*'))
+		{
+			return null;
+		}
+
+		// Handle Wildcard (*)
+		if ($currentIndex === '*')
+		{
+			$answer = [];
+
+			foreach ($array as $value)
+			{
+				$answer[] = _array_search_dot($indexes, $value);
+			}
+
+			$answer = array_filter($answer, static function ($value) {
+				return $value !== null;
+			});
+
+			if ($answer !== [])
+			{
+				if (count($answer) === 1)
+				{
+					// If array only has one element, we return that element for BC.
+					return current($answer);
+				}
+
+				return $answer;
+			}
+
+			return null;
+		}
+
+		// If this is the last index, make sure to return it now,
+		// and not try to recurse through things.
+		if (empty($indexes))
+		{
+			return $array[$currentIndex];
+		}
+
+		// Do we need to recursively search this value?
+		if (is_array($array[$currentIndex]) && $array[$currentIndex] !== [])
+		{
+			return _array_search_dot($indexes, $array[$currentIndex]);
+		}
+
+		// Otherwise we've found our match!
+		return $array[$currentIndex];
+	}
+}
+
+if (! function_exists('array_deep_search'))
+{
+	/**
+	 * Returns the value of an element at a key in an array of uncertain depth.
+	 *
+	 * @param mixed $key
+	 * @param array $array
+	 *
+	 * @return mixed|null
+	 */
+	function array_deep_search($key, array $array)
+	{
+		if (isset($array[$key]))
+		{
+			return $array[$key];
+		}
+
+		foreach ($array as $value)
+		{
+			if (is_array($value) && ($result = array_deep_search($key, $value)))
+			{
+				return $result;
+			}
+		}
+
+		return null;
+	}
+}
+
+if (! function_exists('array_sort_by_multiple_keys'))
+{
+	/**
+	 * Sorts a multidimensional array by its elements values. The array
+	 * columns to be used for sorting are passed as an associative
+	 * array of key names and sorting flags.
+	 *
+	 * Both arrays of objects and arrays of array can be sorted.
+	 *
+	 * Example:
+	 *     array_sort_by_multiple_keys($players, [
+	 *         'team.hierarchy' => SORT_ASC,
+	 *         'position'       => SORT_ASC,
+	 *         'name'           => SORT_STRING,
+	 *     ]);
+	 *
+	 * The '.' dot operator in the column name indicates a deeper array or
+	 * object level. In principle, any number of sublevels could be used,
+	 * as long as the level and column exist in every array element.
+	 *
+	 * For information on multi-level array sorting, refer to Example #3 here:
+	 * https://www.php.net/manual/de/function.array-multisort.php
+	 *
+	 * @param array $array       the reference of the array to be sorted
+	 * @param array $sortColumns an associative array of columns to sort
+	 *                           after and their sorting flags
+	 *
+	 * @return boolean
+	 */
+	function array_sort_by_multiple_keys(array &$array, array $sortColumns): bool
+	{
+		// Check if there really are columns to sort after
+		if (empty($sortColumns) || empty($array))
+		{
+			return false;
+		}
+
+		// Group sorting indexes and data
+		$tempArray = [];
+		foreach ($sortColumns as $key => $sortFlag)
+		{
+			// Get sorting values
+			$carry = $array;
+
+			// The '.' operator separates nested elements
+			foreach (explode('.', $key) as $keySegment)
+			{
+				// Loop elements if they are objects
+				if (is_object(reset($carry)))
+				{
+					// Extract the object attribute
+					foreach ($carry as $index => $object)
+					{
+						$carry[$index] = $object->$keySegment;
+					}
+
+					continue;
+				}
+
+				// Extract the target column if elements are arrays
+				$carry = array_column($carry, $keySegment);
+			}
+
+			// Store the collected sorting parameters
+			$tempArray[] = $carry;
+			$tempArray[] = $sortFlag;
+		}
+
+		// Append the array as reference
+		$tempArray[] = &$array;
+
+		// Pass sorting arrays and flags as an argument list.
+		return array_multisort(...$tempArray);
+	}
+}
+
+if (! function_exists('array_flatten_with_dots'))
+{
+	/**
+	 * Flatten a multidimensional array using dots as separators.
+	 *
+	 * @param iterable $array The multi-dimensional array
+	 * @param string   $id    Something to initially prepend to the flattened keys
+	 *
+	 * @return array The flattened array
+	 */
+	function array_flatten_with_dots(iterable $array, string $id = ''): array
+	{
+		$flattened = [];
+
+		foreach ($array as $key => $value)
+		{
+			$newKey = $id . $key;
+
+			if (is_array($value))
+			{
+				$flattened = array_merge($flattened, array_flatten_with_dots($value, $newKey . '.'));
+			}
+			else
+			{
+				$flattened[$newKey] = $value;
+			}
+		}
+
+		return $flattened;
+	}
+}
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
new file mode 100644
index 0000000..ed47c5e
--- /dev/null
+++ b/system/Helpers/cookie_helper.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Config\App;
+use Config\Services;
+
+//=============================================================================
+// CodeIgniter Cookie Helpers
+//=============================================================================
+
+if (! function_exists('set_cookie'))
+{
+	/**
+	 * Set cookie
+	 *
+	 * Accepts seven parameters, or you can submit an associative
+	 * array in the first parameter containing all the values.
+	 *
+	 * @param string|array $name     Cookie name or array containing binds
+	 * @param string       $value    The value of the cookie
+	 * @param string       $expire   The number of seconds until expiration
+	 * @param string       $domain   For site-wide cookie. Usually: .yourdomain.com
+	 * @param string       $path     The cookie path
+	 * @param string       $prefix   The cookie prefix
+	 * @param boolean      $secure   True makes the cookie secure
+	 * @param boolean      $httpOnly True makes the cookie accessible via http(s) only (no javascript)
+	 * @param string|null  $sameSite The cookie SameSite value
+	 *
+	 * @see \CodeIgniter\HTTP\Response::setCookie()
+	 */
+	function set_cookie(
+		$name,
+		string $value = '',
+		string $expire = '',
+		string $domain = '',
+		string $path = '/',
+		string $prefix = '',
+		bool $secure = false,
+		bool $httpOnly = false,
+		string $sameSite = null
+	)
+	{
+		$response = Services::response();
+		$response->setCookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httpOnly, $sameSite);
+	}
+}
+
+if (! function_exists('get_cookie'))
+{
+	/**
+	 * Fetch an item from the $_COOKIE array
+	 *
+	 * @param string  $index
+	 * @param boolean $xssClean
+	 *
+	 * @return mixed
+	 *
+	 * @see \CodeIgniter\HTTP\IncomingRequest::getCookie()
+	 */
+	function get_cookie($index, bool $xssClean = false)
+	{
+		$prefix  = isset($_COOKIE[$index]) ? '' : config(App::class)->cookiePrefix;
+		$request = Services::request();
+		$filter  = $xssClean ? FILTER_SANITIZE_STRING : FILTER_DEFAULT;
+
+		return $request->getCookie($prefix . $index, $filter);
+	}
+}
+
+if (! function_exists('delete_cookie'))
+{
+	/**
+	 * Delete a cookie
+	 *
+	 * @param mixed  $name
+	 * @param string $domain the cookie domain. Usually: .yourdomain.com
+	 * @param string $path   the cookie path
+	 * @param string $prefix the cookie prefix
+	 *
+	 * @return void
+	 *
+	 * @see \CodeIgniter\HTTP\Response::deleteCookie()
+	 */
+	function delete_cookie($name, string $domain = '', string $path = '/', string $prefix = '')
+	{
+		Services::response()->deleteCookie($name, $domain, $path, $prefix);
+	}
+}
+
+if (! function_exists('has_cookie'))
+{
+	/**
+	 * Checks if a cookie exists by name.
+	 *
+	 * @param string      $name
+	 * @param string|null $value
+	 * @param string      $prefix
+	 *
+	 * @return boolean
+	 */
+	function has_cookie(string $name, string $value = null, string $prefix = ''): bool
+	{
+		return Services::response()->hasCookie($name, $value, $prefix);
+	}
+}
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
new file mode 100644
index 0000000..11e8d47
--- /dev/null
+++ b/system/Helpers/date_helper.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * CodeIgniter Date Helpers
+ */
+
+if (! function_exists('now'))
+{
+	/**
+	 * Get "now" time
+	 *
+	 * Returns time() based on the timezone parameter or on the
+	 * app_timezone() setting
+	 *
+	 * @param string $timezone
+	 *
+	 * @return integer
+	 * @throws Exception
+	 */
+	function now(string $timezone = null): int
+	{
+		$timezone = empty($timezone) ? app_timezone() : $timezone;
+
+		if ($timezone === 'local' || $timezone === date_default_timezone_get())
+		{
+			return time();
+		}
+
+		$datetime = new DateTime('now', new DateTimeZone($timezone));
+		sscanf($datetime->format('j-n-Y G:i:s'), '%d-%d-%d %d:%d:%d', $day, $month, $year, $hour, $minute, $second);
+
+		return mktime($hour, $minute, $second, $month, $day, $year);
+	}
+}
+
+if (! function_exists('timezone_select'))
+{
+	/**
+	 * Generates a select field of all available timezones
+	 *
+	 * Returns a string with the formatted HTML
+	 *
+	 * @param string  $class   Optional class to apply to the select field
+	 * @param string  $default Default value for initial selection
+	 * @param integer $what    One of the DateTimeZone class constants (for listIdentifiers)
+	 * @param string  $country A two-letter ISO 3166-1 compatible country code (for listIdentifiers)
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, string $country = null): string
+	{
+		$timezones = DateTimeZone::listIdentifiers($what, $country);
+
+		$buffer = "<select name='timezone' class='{$class}'>" . PHP_EOL;
+		foreach ($timezones as $timezone)
+		{
+			$selected = ($timezone === $default) ? 'selected' : '';
+			$buffer .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
+		}
+
+		return $buffer . ('</select>' . PHP_EOL);
+	}
+}
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
new file mode 100644
index 0000000..5735537
--- /dev/null
+++ b/system/Helpers/filesystem_helper.php
@@ -0,0 +1,555 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * CodeIgniter File System Helpers
+ */
+// ------------------------------------------------------------------------
+
+if (! function_exists('directory_map'))
+{
+	/**
+	 * Create a Directory Map
+	 *
+	 * Reads the specified directory and builds an array
+	 * representation of it. Sub-folders contained with the
+	 * directory will be mapped as well.
+	 *
+	 * @param string  $sourceDir      Path to source
+	 * @param integer $directoryDepth Depth of directories to traverse
+	 *                                 (0 = fully recursive, 1 = current dir, etc)
+	 * @param boolean $hidden         Whether to show hidden files
+	 *
+	 * @return array
+	 */
+	function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden = false): array
+	{
+		try
+		{
+			$fp = opendir($sourceDir);
+
+			$fileData  = [];
+			$newDepth  = $directoryDepth - 1;
+			$sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+			while (false !== ($file = readdir($fp)))
+			{
+				// Remove '.', '..', and hidden files [optional]
+				if ($file === '.' || $file === '..' || ($hidden === false && $file[0] === '.'))
+				{
+					continue;
+				}
+
+				if (is_dir($sourceDir . $file))
+				{
+					$file .= DIRECTORY_SEPARATOR;
+				}
+
+				if (($directoryDepth < 1 || $newDepth > 0) && is_dir($sourceDir . $file))
+				{
+					$fileData[$file] = directory_map($sourceDir . $file, $newDepth, $hidden);
+				}
+				else
+				{
+					$fileData[] = $file;
+				}
+			}
+
+			closedir($fp);
+			return $fileData;
+		}
+		catch (Throwable $e)
+		{
+			return [];
+		}
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('directory_mirror'))
+{
+	/**
+	 * Recursively copies the files and directories of the origin directory
+	 * into the target directory, i.e. "mirror" its contents.
+	 *
+	 * @param string  $originDir
+	 * @param string  $targetDir
+	 * @param boolean $overwrite Whether individual files overwrite on collision
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	function directory_mirror(string $originDir, string $targetDir, bool $overwrite = true): void
+	{
+		if (! is_dir($originDir = rtrim($originDir, '\\/')))
+		{
+			throw new InvalidArgumentException(sprintf('The origin directory "%s" was not found.', $originDir));
+		}
+
+		if (! is_dir($targetDir = rtrim($targetDir, '\\/')))
+		{
+			@mkdir($targetDir, 0755, true);
+		}
+
+		$dirLen = strlen($originDir);
+
+		/**
+		 * @var SplFileInfo $file
+		 */
+		foreach (new RecursiveIteratorIterator(
+			new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
+			RecursiveIteratorIterator::SELF_FIRST
+		) as $file)
+		{
+			$origin = $file->getPathname();
+			$target = $targetDir . substr($origin, $dirLen);
+
+			if ($file->isDir())
+			{
+				mkdir($target, 0755);
+			}
+			elseif (! is_file($target) || ($overwrite && is_file($target)))
+			{
+				copy($origin, $target);
+			}
+		}
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('write_file'))
+{
+	/**
+	 * Write File
+	 *
+	 * Writes data to the file specified in the path.
+	 * Creates a new file if non-existent.
+	 *
+	 * @param string $path File path
+	 * @param string $data Data to write
+	 * @param string $mode fopen() mode (default: 'wb')
+	 *
+	 * @return boolean
+	 */
+	function write_file(string $path, string $data, string $mode = 'wb'): bool
+	{
+		try
+		{
+			$fp = fopen($path, $mode);
+
+			flock($fp, LOCK_EX);
+
+			for ($result = $written = 0, $length = strlen($data); $written < $length; $written += $result)
+			{
+				if (($result = fwrite($fp, substr($data, $written))) === false)
+				{
+					break;
+				}
+			}
+
+			flock($fp, LOCK_UN);
+			fclose($fp);
+
+			return is_int($result);
+		}
+		catch (Throwable $e)
+		{
+			return false;
+		}
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('delete_files'))
+{
+	/**
+	 * Delete Files
+	 *
+	 * Deletes all files contained in the supplied directory path.
+	 * Files must be writable or owned by the system in order to be deleted.
+	 * If the second parameter is set to true, any directories contained
+	 * within the supplied base directory will be nuked as well.
+	 *
+	 * @param string  $path   File path
+	 * @param boolean $delDir Whether to delete any directories found in the path
+	 * @param boolean $htdocs Whether to skip deleting .htaccess and index page files
+	 * @param boolean $hidden Whether to include hidden files (files beginning with a period)
+	 *
+	 * @return boolean
+	 */
+	function delete_files(string $path, bool $delDir = false, bool $htdocs = false, bool $hidden = false): bool
+	{
+		$path = realpath($path) ?: $path;
+		$path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+		try
+		{
+			foreach (new RecursiveIteratorIterator(
+				new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
+				RecursiveIteratorIterator::CHILD_FIRST
+			) as $object)
+			{
+				$filename = $object->getFilename();
+				if (! $hidden && $filename[0] === '.')
+				{
+					continue;
+				}
+
+				if (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
+				{
+					$isDir = $object->isDir();
+					if ($isDir && $delDir)
+					{
+						rmdir($object->getPathname());
+						continue;
+					}
+					if (! $isDir)
+					{
+						unlink($object->getPathname());
+					}
+				}
+			}
+
+			return true;
+		}
+		catch (Throwable $e)
+		{
+			return false;
+		}
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('get_filenames'))
+{
+	/**
+	 * Get Filenames
+	 *
+	 * Reads the specified directory and builds an array containing the filenames.
+	 * Any sub-folders contained within the specified path are read as well.
+	 *
+	 * @param string       $sourceDir   Path to source
+	 * @param boolean|null $includePath Whether to include the path as part of the filename; false for no path, null for a relative path, true for full path
+	 * @param boolean      $hidden      Whether to include hidden files (files beginning with a period)
+	 *
+	 * @return array
+	 */
+	function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array
+	{
+		$files = [];
+
+		$sourceDir = realpath($sourceDir) ?: $sourceDir;
+		$sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+		try
+		{
+			foreach (new RecursiveIteratorIterator(
+					new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
+					RecursiveIteratorIterator::SELF_FIRST
+				) as $name => $object)
+			{
+				$basename = pathinfo($name, PATHINFO_BASENAME);
+				if (! $hidden && $basename[0] === '.')
+				{
+					continue;
+				}
+
+				if ($includePath === false)
+				{
+					$files[] = $basename;
+				}
+				elseif (is_null($includePath))
+				{
+					$files[] = str_replace($sourceDir, '', $name);
+				}
+				else
+				{
+					$files[] = $name;
+				}
+			}
+		}
+		catch (Throwable $e)
+		{
+			return [];
+		}
+
+		sort($files);
+
+		return $files;
+	}
+}
+
+// --------------------------------------------------------------------
+
+if (! function_exists('get_dir_file_info'))
+{
+	/**
+	 * Get Directory File Information
+	 *
+	 * Reads the specified directory and builds an array containing the filenames,
+	 * filesize, dates, and permissions
+	 *
+	 * Any sub-folders contained within the specified path are read as well.
+	 *
+	 * @param string  $sourceDir    Path to source
+	 * @param boolean $topLevelOnly Look only at the top level directory specified?
+	 * @param boolean $recursion    Internal variable to determine recursion status - do not use in calls
+	 *
+	 * @return array
+	 */
+	function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $recursion = false): array
+	{
+		static $fileData = [];
+		$relativePath    = $sourceDir;
+
+		try
+		{
+			$fp = opendir($sourceDir); {
+				// reset the array and make sure $source_dir has a trailing slash on the initial call
+			if ($recursion === false)
+				{
+				$fileData  = [];
+				$sourceDir = rtrim(realpath($sourceDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+			}
+
+				// Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
+			while (false !== ($file = readdir($fp)))
+				{
+				if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false)
+				{
+					get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
+				}
+				elseif ($file[0] !== '.')
+				{
+					$fileData[$file]                  = get_file_info($sourceDir . $file);
+					$fileData[$file]['relative_path'] = $relativePath;
+				}
+			}
+
+				closedir($fp);
+				return $fileData;
+			}
+		}
+		catch (Throwable $fe)
+		{
+			return [];
+		}
+	}
+}
+
+// --------------------------------------------------------------------
+
+if (! function_exists('get_file_info'))
+{
+	/**
+	 * Get File Info
+	 *
+	 * Given a file and path, returns the name, path, size, date modified
+	 * Second parameter allows you to explicitly declare what information you want returned
+	 * Options are: name, server_path, size, date, readable, writable, executable, fileperms
+	 * Returns false if the file cannot be found.
+	 *
+	 * @param string $file           Path to file
+	 * @param mixed  $returnedValues Array or comma separated string of information returned
+	 *
+	 * @return array|null
+	 */
+	function get_file_info(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
+	{
+		if (! is_file($file))
+		{
+			return null;
+		}
+
+		$fileInfo = [];
+
+		if (is_string($returnedValues))
+		{
+			$returnedValues = explode(',', $returnedValues);
+		}
+
+		foreach ($returnedValues as $key)
+		{
+			switch ($key) {
+				case 'name':
+					$fileInfo['name'] = basename($file);
+					break;
+				case 'server_path':
+					$fileInfo['server_path'] = $file;
+					break;
+				case 'size':
+					$fileInfo['size'] = filesize($file);
+					break;
+				case 'date':
+					$fileInfo['date'] = filemtime($file);
+					break;
+				case 'readable':
+					$fileInfo['readable'] = is_readable($file);
+					break;
+				case 'writable':
+					$fileInfo['writable'] = is_really_writable($file);
+					break;
+				case 'executable':
+					$fileInfo['executable'] = is_executable($file);
+					break;
+				case 'fileperms':
+					$fileInfo['fileperms'] = fileperms($file);
+					break;
+			}
+		}
+
+		return $fileInfo;
+	}
+}
+
+// --------------------------------------------------------------------
+
+if (! function_exists('symbolic_permissions'))
+{
+	/**
+	 * Symbolic Permissions
+	 *
+	 * Takes a numeric value representing a file's permissions and returns
+	 * standard symbolic notation representing that value
+	 *
+	 * @param  integer $perms Permissions
+	 * @return string
+	 */
+	function symbolic_permissions(int $perms): string
+	{
+		if (($perms & 0xC000) === 0xC000)
+		{
+			$symbolic = 's'; // Socket
+		}
+		elseif (($perms & 0xA000) === 0xA000)
+		{
+			$symbolic = 'l'; // Symbolic Link
+		}
+		elseif (($perms & 0x8000) === 0x8000)
+		{
+			$symbolic = '-'; // Regular
+		}
+		elseif (($perms & 0x6000) === 0x6000)
+		{
+			$symbolic = 'b'; // Block special
+		}
+		elseif (($perms & 0x4000) === 0x4000)
+		{
+			$symbolic = 'd'; // Directory
+		}
+		elseif (($perms & 0x2000) === 0x2000)
+		{
+			$symbolic = 'c'; // Character special
+		}
+		elseif (($perms & 0x1000) === 0x1000)
+		{
+			$symbolic = 'p'; // FIFO pipe
+		}
+		else
+		{
+			$symbolic = 'u'; // Unknown
+		}
+
+		// Owner
+		$symbolic .= (($perms & 0x0100) ? 'r' : '-')
+				. (($perms & 0x0080) ? 'w' : '-')
+				. (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
+
+		// Group
+		$symbolic .= (($perms & 0x0020) ? 'r' : '-')
+				. (($perms & 0x0010) ? 'w' : '-')
+				. (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
+
+		// World
+		$symbolic .= (($perms & 0x0004) ? 'r' : '-')
+				. (($perms & 0x0002) ? 'w' : '-')
+				. (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
+
+		return $symbolic;
+	}
+}
+
+// --------------------------------------------------------------------
+
+if (! function_exists('octal_permissions'))
+{
+	/**
+	 * Octal Permissions
+	 *
+	 * Takes a numeric value representing a file's permissions and returns
+	 * a three character string representing the file's octal permissions
+	 *
+	 * @param  integer $perms Permissions
+	 * @return string
+	 */
+	function octal_permissions(int $perms): string
+	{
+		return substr(sprintf('%o', $perms), -3);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('same_file'))
+{
+	/**
+	 * Checks if two files both exist and have identical hashes
+	 *
+	 * @param string $file1
+	 * @param string $file2
+	 *
+	 * @return boolean  Same or not
+	 */
+	function same_file(string $file1, string $file2): bool
+	{
+		return is_file($file1) && is_file($file2) && md5_file($file1) === md5_file($file2);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('set_realpath'))
+{
+	/**
+	 * Set Realpath
+	 *
+	 * @param string  $path
+	 * @param boolean $checkExistence Checks to see if the path exists
+	 *
+	 * @return string
+	 */
+	function set_realpath(string $path, bool $checkExistence = false): string
+	{
+		// Security check to make sure the path is NOT a URL. No remote file inclusion!
+		if (preg_match('#^(http:\/\/|https:\/\/|www\.|ftp)#i', $path) || filter_var($path, FILTER_VALIDATE_IP) === $path)
+		{
+			throw new InvalidArgumentException('The path you submitted must be a local server path, not a URL');
+		}
+
+		// Resolve the path
+		if (realpath($path) !== false)
+		{
+			$path = realpath($path);
+		}
+		elseif ($checkExistence && ! is_dir($path) && ! is_file($path))
+		{
+			throw new InvalidArgumentException('Not a valid path: ' . $path);
+		}
+
+		// Add a trailing slash, if this is a directory
+		return is_dir($path) ? rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path;
+	}
+}
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
new file mode 100644
index 0000000..8bfb422
--- /dev/null
+++ b/system/Helpers/form_helper.php
@@ -0,0 +1,963 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Config\App;
+
+/**
+ * CodeIgniter Form Helpers
+ */
+
+use Config\Services;
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_open'))
+{
+	/**
+	 * Form Declaration
+	 *
+	 * Creates the opening portion of the form.
+	 *
+	 * @param string       $action     the URI segments of the form destination
+	 * @param array|string $attributes a key/value pair of attributes, or string representation
+	 * @param array        $hidden     a key/value pair hidden data
+	 *
+	 * @return string
+	 */
+	function form_open(string $action = '', $attributes = [], array $hidden = []): string
+	{
+		// If no action is provided then set to the current url
+		if (! $action)
+		{
+			$action = current_url(true);
+		} // If an action is not a full URL then turn it into one
+		elseif (strpos($action, '://') === false)
+		{
+			// If an action has {locale}
+			if (strpos($action, '{locale}') !== false)
+			{
+				$action = str_replace('{locale}', Services::request()->getLocale(), $action);
+			}
+
+			$action = site_url($action);
+		}
+
+		if (is_array($attributes) && array_key_exists('csrf_id', $attributes))
+		{
+			$csrfId = $attributes['csrf_id'];
+			unset($attributes['csrf_id']);
+		}
+
+		$attributes = stringify_attributes($attributes);
+
+		if (stripos($attributes, 'method=') === false)
+		{
+			$attributes .= ' method="post"';
+		}
+		if (stripos($attributes, 'accept-charset=') === false)
+		{
+			$config      = config(App::class);
+			$attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
+		}
+
+		$form = '<form action="' . $action . '"' . $attributes . ">\n";
+
+		// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
+		$before = Services::filters()->getFilters()['before'];
+
+		if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && strpos($action, base_url()) !== false && ! stripos($form, 'method="get"'))
+		{
+			$form .= csrf_field($csrfId ?? null);
+		}
+
+		if (is_array($hidden))
+		{
+			foreach ($hidden as $name => $value)
+			{
+				$form .= form_hidden($name, $value);
+			}
+		}
+
+		return $form;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_open_multipart'))
+{
+	/**
+	 * Form Declaration - Multipart type
+	 *
+	 * Creates the opening portion of the form, but with "multipart/form-data".
+	 *
+	 * @param string       $action     The URI segments of the form destination
+	 * @param array|string $attributes A key/value pair of attributes, or the same as a string
+	 * @param array        $hidden     A key/value pair hidden data
+	 *
+	 * @return string
+	 */
+	function form_open_multipart(string $action = '', $attributes = [], array $hidden = []): string
+	{
+		if (is_string($attributes))
+		{
+			$attributes .= ' enctype="' . esc('multipart/form-data') . '"';
+		}
+		else
+		{
+			$attributes['enctype'] = 'multipart/form-data';
+		}
+
+		return form_open($action, $attributes, $hidden);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_hidden'))
+{
+	/**
+	 * Hidden Input Field
+	 *
+	 * Generates hidden fields. You can pass a simple key/value string or
+	 * an associative array with multiple values.
+	 *
+	 * @param string|array $name      Field name or associative array to create multiple fields
+	 * @param string|array $value     Field value
+	 * @param boolean      $recursing
+	 *
+	 * @return string
+	 */
+	function form_hidden($name, $value = '', bool $recursing = false): string
+	{
+		static $form;
+
+		if ($recursing === false)
+		{
+			$form = "\n";
+		}
+
+		if (is_array($name))
+		{
+			foreach ($name as $key => $val)
+			{
+				form_hidden($key, $val, true);
+			}
+
+			return $form;
+		}
+
+		if (! is_array($value))
+		{
+			$form .= form_input($name, $value, '', 'hidden');
+		}
+		else
+		{
+			foreach ($value as $k => $v)
+			{
+				$k = is_int($k) ? '' : $k;
+				form_hidden($name . '[' . $k . ']', $v, true);
+			}
+		}
+
+		return $form;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_input'))
+{
+	/**
+	 * Text Input Field. If 'type' is passed in the $type field, it will be
+	 * used as the input type, for making 'email', 'phone', etc input fields.
+	 *
+	 * @param mixed  $data
+	 * @param string $value
+	 * @param mixed  $extra
+	 * @param string $type
+	 *
+	 * @return string
+	 */
+	function form_input($data = '', string $value = '', $extra = '', string $type = 'text'): string
+	{
+		$defaults = [
+			'type'  => $type,
+			'name'  => is_array($data) ? '' : $data,
+			'value' => $value,
+		];
+
+		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_password'))
+{
+	/**
+	 * Password Field
+	 *
+	 * Identical to the input function but adds the "password" type
+	 *
+	 * @param mixed  $data
+	 * @param string $value
+	 * @param mixed  $extra
+	 *
+	 * @return string
+	 */
+	function form_password($data = '', string $value = '', $extra = ''): string
+	{
+		if (! is_array($data))
+		{
+			$data = ['name' => $data];
+		}
+		$data['type'] = 'password';
+
+		return form_input($data, $value, $extra);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_upload'))
+{
+	/**
+	 * Upload Field
+	 *
+	 * Identical to the input function but adds the "file" type
+	 *
+	 * @param mixed  $data
+	 * @param string $value
+	 * @param mixed  $extra
+	 *
+	 * @return string
+	 */
+	function form_upload($data = '', string $value = '', $extra = ''): string
+	{
+		$defaults = [
+			'type' => 'file',
+			'name' => '',
+		];
+
+		if (! is_array($data))
+		{
+			$data = ['name' => $data];
+		}
+
+		$data['type'] = 'file';
+
+		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_textarea'))
+{
+	/**
+	 * Textarea field
+	 *
+	 * @param mixed  $data
+	 * @param string $value
+	 * @param mixed  $extra
+	 *
+	 * @return string
+	 */
+	function form_textarea($data = '', string $value = '', $extra = ''): string
+	{
+		$defaults = [
+			'name' => is_array($data) ? '' : $data,
+			'cols' => '40',
+			'rows' => '10',
+		];
+		if (! is_array($data) || ! isset($data['value']))
+		{
+			$val = $value;
+		}
+		else
+		{
+			$val = $data['value'];
+			unset($data['value']); // textareas don't use the value attribute
+		}
+
+		// Unsets default rows and cols if defined in extra field as array or string.
+		if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false))
+		{
+			unset($defaults['rows']);
+		}
+
+		if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false))
+		{
+			unset($defaults['cols']);
+		}
+
+		return '<textarea ' . rtrim(parse_form_attributes($data, $defaults)) . stringify_attributes($extra) . '>'
+				. htmlspecialchars($val)
+				. "</textarea>\n";
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_multiselect'))
+{
+	/**
+	 * Multi-select menu
+	 *
+	 * @param mixed $name
+	 * @param array $options
+	 * @param array $selected
+	 * @param mixed $extra
+	 *
+	 * @return string
+	 */
+	function form_multiselect($name = '', array $options = [], array $selected = [], $extra = ''): string
+	{
+		$extra = stringify_attributes($extra);
+
+		if (stripos($extra, 'multiple') === false)
+		{
+			$extra .= ' multiple="multiple"';
+		}
+
+		return form_dropdown($name, $options, $selected, $extra);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_dropdown'))
+{
+	/**
+	 * Drop-down Menu
+	 *
+	 * @param mixed $data
+	 * @param mixed $options
+	 * @param mixed $selected
+	 * @param mixed $extra
+	 *
+	 * @return string
+	 */
+	function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
+	{
+		$defaults = [];
+		if (is_array($data))
+		{
+			if (isset($data['selected']))
+			{
+				$selected = $data['selected'];
+				unset($data['selected']); // select tags don't have a selected attribute
+			}
+			if (isset($data['options']))
+			{
+				$options = $data['options'];
+				unset($data['options']); // select tags don't use an options attribute
+			}
+		}
+		else
+		{
+			$defaults = ['name' => $data];
+		}
+
+		if (! is_array($selected))
+		{
+			$selected = [$selected];
+		}
+		if (! is_array($options))
+		{
+			$options = [$options];
+		}
+
+		// If no selected state was submitted we will attempt to set it automatically
+		if (empty($selected))
+		{
+			if (is_array($data))
+			{
+				if (isset($data['name'], $_POST[$data['name']]))
+				{
+					$selected = [$_POST[$data['name']]];
+				}
+			}
+			elseif (isset($_POST[$data]))
+			{
+				$selected = [$_POST[$data]];
+			}
+		}
+
+		// standardize selected as strings, like  the option keys will be.
+		foreach ($selected as $key => $item)
+		{
+			$selected[$key] = (string) $item;
+		}
+
+		$extra    = stringify_attributes($extra);
+		$multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
+		$form     = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";
+		foreach ($options as $key => $val)
+		{
+			$key = (string) $key;
+			if (is_array($val))
+			{
+				if (empty($val))
+				{
+					continue;
+				}
+				$form .= '<optgroup label="' . $key . "\">\n";
+				foreach ($val as $optgroupKey => $optgroupVal)
+				{
+					$sel   = in_array($optgroupKey, $selected, true) ? ' selected="selected"' : '';
+					$form .= '<option value="' . htmlspecialchars($optgroupKey) . '"' . $sel . '>'
+							. $optgroupVal . "</option>\n";
+				}
+				$form .= "</optgroup>\n";
+			}
+			else
+			{
+				$form .= '<option value="' . htmlspecialchars($key) . '"'
+						. (in_array($key, $selected, true) ? ' selected="selected"' : '') . '>'
+						. $val . "</option>\n";
+			}
+		}
+
+		return $form . "</select>\n";
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_checkbox'))
+{
+	/**
+	 * Checkbox Field
+	 *
+	 * @param mixed   $data
+	 * @param string  $value
+	 * @param boolean $checked
+	 * @param mixed   $extra
+	 *
+	 * @return string
+	 */
+	function form_checkbox($data = '', string $value = '', bool $checked = false, $extra = ''): string
+	{
+		$defaults = [
+			'type'  => 'checkbox',
+			'name'  => (! is_array($data) ? $data : ''),
+			'value' => $value,
+		];
+
+		if (is_array($data) && array_key_exists('checked', $data))
+		{
+			$checked = $data['checked'];
+			if ($checked === false)
+			{
+				unset($data['checked']);
+			}
+			else
+			{
+				$data['checked'] = 'checked';
+			}
+		}
+
+		if ($checked === true)
+		{
+			$defaults['checked'] = 'checked';
+		}
+		elseif (isset($defaults['checked']))
+		{
+			unset($defaults['checked']);
+		}
+
+		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_radio'))
+{
+	/**
+	 * Radio Button
+	 *
+	 * @param mixed   $data
+	 * @param string  $value
+	 * @param boolean $checked
+	 * @param mixed   $extra
+	 *
+	 * @return string
+	 */
+	function form_radio($data = '', string $value = '', bool $checked = false, $extra = ''): string
+	{
+		if (! is_array($data))
+		{
+			$data = ['name' => $data];
+		}
+		$data['type'] = 'radio';
+
+		return form_checkbox($data, $value, $checked, $extra);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_submit'))
+{
+	/**
+	 * Submit Button
+	 *
+	 * @param mixed  $data
+	 * @param string $value
+	 * @param mixed  $extra
+	 *
+	 * @return string
+	 */
+	function form_submit($data = '', string $value = '', $extra = ''): string
+	{
+		return form_input($data, $value, $extra, 'submit');
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_reset'))
+{
+	/**
+	 * Reset Button
+	 *
+	 * @param mixed  $data
+	 * @param string $value
+	 * @param mixed  $extra
+	 *
+	 * @return string
+	 */
+	function form_reset($data = '', string $value = '', $extra = ''): string
+	{
+		return form_input($data, $value, $extra, 'reset');
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_button'))
+{
+	/**
+	 * Form Button
+	 *
+	 * @param mixed  $data
+	 * @param string $content
+	 * @param mixed  $extra
+	 *
+	 * @return string
+	 */
+	function form_button($data = '', string $content = '', $extra = ''): string
+	{
+		$defaults = [
+			'name' => is_array($data) ? '' : $data,
+			'type' => 'button',
+		];
+
+		if (is_array($data) && isset($data['content']))
+		{
+			$content = $data['content'];
+			unset($data['content']); // content is not an attribute
+		}
+
+		return '<button ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . '>'
+				. $content
+				. "</button>\n";
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_label'))
+{
+	/**
+	 * Form Label Tag
+	 *
+	 * @param string $labelText  The text to appear onscreen
+	 * @param string $id         The id the label applies to
+	 * @param array  $attributes Additional attributes
+	 *
+	 * @return string
+	 */
+	function form_label(string $labelText = '', string $id = '', array $attributes = []): string
+	{
+		$label = '<label';
+
+		if ($id !== '')
+		{
+			$label .= ' for="' . $id . '"';
+		}
+
+		if (is_array($attributes) && $attributes)
+		{
+			foreach ($attributes as $key => $val)
+			{
+				$label .= ' ' . $key . '="' . $val . '"';
+			}
+		}
+
+		return $label . '>' . $labelText . '</label>';
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_datalist'))
+{
+	/**
+	 * Datalist
+	 *
+	 * The <datalist> element specifies a list of pre-defined options for an <input> element.
+	 * Users will see a drop-down list of pre-defined options as they input data.
+	 * The list attribute of the <input> element, must refer to the id attribute of the <datalist> element.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @param array  $options
+	 *
+	 * @return string
+	 */
+	function form_datalist(string $name, string $value, array $options): string
+	{
+		$data = [
+			'type'  => 'text',
+			'name'  => $name,
+			'list'  => $name . '_list',
+			'value' => $value,
+		];
+
+		$out = form_input($data) . "\n";
+
+		$out .= "<datalist id='" . $name . '_list' . "'>";
+
+		foreach ($options as $option)
+		{
+			$out .= "<option value='$option'>" . "\n";
+		}
+
+		return $out . ('</datalist>' . "\n");
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_fieldset'))
+{
+	/**
+	 * Fieldset Tag
+	 *
+	 * Used to produce <fieldset><legend>text</legend>.  To close fieldset
+	 * use form_fieldset_close()
+	 *
+	 * @param string $legendText The legend text
+	 * @param array  $attributes Additional attributes
+	 *
+	 * @return string
+	 */
+	function form_fieldset(string $legendText = '', array $attributes = []): string
+	{
+		$fieldset = '<fieldset' . stringify_attributes($attributes) . ">\n";
+
+		if ($legendText !== '')
+		{
+			return $fieldset . '<legend>' . $legendText . "</legend>\n";
+		}
+
+		return $fieldset;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_fieldset_close'))
+{
+	/**
+	 * Fieldset Close Tag
+	 *
+	 * @param string $extra
+	 *
+	 * @return string
+	 */
+	function form_fieldset_close(string $extra = ''): string
+	{
+		return '</fieldset>' . $extra;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('form_close'))
+{
+	/**
+	 * Form Close Tag
+	 *
+	 * @param string $extra
+	 *
+	 * @return string
+	 */
+	function form_close(string $extra = ''): string
+	{
+		return '</form>' . $extra;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('set_value'))
+{
+	/**
+	 * Form Value
+	 *
+	 * Grabs a value from the POST array for the specified field so you can
+	 * re-populate an input field or textarea
+	 *
+	 * @param string          $field      Field name
+	 * @param string|string[] $default    Default value
+	 * @param boolean         $htmlEscape Whether to escape HTML special characters or not
+	 *
+	 * @return string|string[]
+	 */
+	function set_value(string $field, $default = '', bool $htmlEscape = true)
+	{
+		$request = Services::request();
+
+		// Try any old input data we may have first
+		$value = $request->getOldInput($field);
+
+		if ($value === null)
+		{
+			$value = $request->getPost($field) ?? $default;
+		}
+
+		return ($htmlEscape) ? esc($value) : $value;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('set_select'))
+{
+	/**
+	 * Set Select
+	 *
+	 * Let's you set the selected value of a <select> menu via data in the POST array.
+	 * If Form Validation is active it retrieves the info from the validation class
+	 *
+	 * @param string  $field
+	 * @param string  $value
+	 * @param boolean $default
+	 *
+	 * @return string
+	 */
+	function set_select(string $field, string $value = '', bool $default = false): string
+	{
+		$request = Services::request();
+
+		// Try any old input data we may have first
+		$input = $request->getOldInput($field);
+
+		if ($input === null)
+		{
+			$input = $request->getPost($field);
+		}
+
+		if ($input === null)
+		{
+			return ($default === true) ? ' selected="selected"' : '';
+		}
+
+		if (is_array($input))
+		{
+			// Note: in_array('', array(0)) returns TRUE, do not use it
+			foreach ($input as &$v)
+			{
+				if ($value === $v)
+				{
+					return ' selected="selected"';
+				}
+			}
+
+			return '';
+		}
+
+		return ($input === $value) ? ' selected="selected"' : '';
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('set_checkbox'))
+{
+	/**
+	 * Set Checkbox
+	 *
+	 * Let's you set the selected value of a checkbox via the value in the POST array.
+	 * If Form Validation is active it retrieves the info from the validation class
+	 *
+	 * @param string  $field
+	 * @param string  $value
+	 * @param boolean $default
+	 *
+	 * @return string
+	 */
+	function set_checkbox(string $field, string $value = '', bool $default = false): string
+	{
+		$request = Services::request();
+
+		// Try any old input data we may have first
+		$input = $request->getOldInput($field);
+
+		if ($input === null)
+		{
+			$input = $request->getPost($field);
+		}
+
+		if (is_array($input))
+		{
+			// Note: in_array('', array(0)) returns TRUE, do not use it
+			foreach ($input as &$v)
+			{
+				if ($value === $v)
+				{
+					return ' checked="checked"';
+				}
+			}
+
+			return '';
+		}
+
+		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
+		if ((string) $input === '0' || ! empty($request->getPost()) || ! empty(old($field)))
+		{
+			return ($input === $value) ? ' checked="checked"' : '';
+		}
+
+		return ($default === true) ? ' checked="checked"' : '';
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('set_radio'))
+{
+	/**
+	 * Set Radio
+	 *
+	 * Let's you set the selected value of a radio field via info in the POST array.
+	 * If Form Validation is active it retrieves the info from the validation class
+	 *
+	 * @param string  $field
+	 * @param string  $value
+	 * @param boolean $default
+	 *
+	 * @return string
+	 */
+	function set_radio(string $field, string $value = '', bool $default = false): string
+	{
+		$request = Services::request();
+
+		// Try any old input data we may have first
+		$input = $request->getOldInput($field);
+		if ($input === null)
+		{
+			$input = $request->getPost($field) ?? $default;
+		}
+
+		if (is_array($input))
+		{
+			// Note: in_array('', array(0)) returns TRUE, do not use it
+			foreach ($input as &$v)
+			{
+				if ($value === $v)
+				{
+					return ' checked="checked"';
+				}
+			}
+
+			return '';
+		}
+
+		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
+		$result = '';
+		if ((string) $input === '0' || ! empty($input = $request->getPost($field)) || ! empty($input = old($field)))
+		{
+			$result = ($input === $value) ? ' checked="checked"' : '';
+		}
+
+		if (empty($result))
+		{
+			$result = ($default === true) ? ' checked="checked"' : '';
+		}
+		return $result;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('parse_form_attributes'))
+{
+	/**
+	 * Parse the form attributes
+	 *
+	 * Helper function used by some of the form helpers
+	 *
+	 * @param string|array $attributes List of attributes
+	 * @param array        $default    Default values
+	 *
+	 * @return string
+	 */
+	function parse_form_attributes($attributes, array $default): string
+	{
+		if (is_array($attributes))
+		{
+			foreach (array_keys($default) as $key)
+			{
+				if (isset($attributes[$key]))
+				{
+					$default[$key] = $attributes[$key];
+					unset($attributes[$key]);
+				}
+			}
+			if (! empty($attributes))
+			{
+				$default = array_merge($default, $attributes);
+			}
+		}
+
+		$att = '';
+
+		foreach ($default as $key => $val)
+		{
+			if (! is_bool($val))
+			{
+				if ($key === 'value')
+				{
+					$val = esc($val);
+				}
+				elseif ($key === 'name' && ! strlen($default['name']))
+				{
+					continue;
+				}
+				$att .= $key . '="' . $val . '"' . ($key === array_key_last($default) ? '' : ' ');
+			}
+			else
+			{
+				$att .= $key . ' ';
+			}
+		}
+
+		return $att;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
new file mode 100644
index 0000000..be71619
--- /dev/null
+++ b/system/Helpers/html_helper.php
@@ -0,0 +1,733 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use Config\DocTypes;
+use Config\Mimes;
+
+// --------------------------------------------------------------------
+
+/**
+ * CodeIgniter HTML Helpers
+ */
+if (! function_exists('ul'))
+{
+	/**
+	 * Unordered List
+	 *
+	 * Generates an HTML unordered list from an single or
+	 * multi-dimensional array.
+	 *
+	 * @param array $list
+	 * @param mixed $attributes HTML attributes string, array, object
+	 *
+	 * @return string
+	 */
+	function ul(array $list, $attributes = ''): string
+	{
+		return _list('ul', $list, $attributes);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('ol'))
+{
+	/**
+	 * Ordered List
+	 *
+	 * Generates an HTML ordered list from an single or multi-dimensional array.
+	 *
+	 * @param array $list
+	 * @param mixed $attributes HTML attributes string, array, object
+	 *
+	 * @return string
+	 */
+	function ol(array $list, $attributes = ''): string
+	{
+		return _list('ol', $list, $attributes);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('_list'))
+{
+	/**
+	 * Generates the list
+	 *
+	 * Generates an HTML ordered list from an single or multi-dimensional array.
+	 *
+	 * @param string  $type
+	 * @param mixed   $list
+	 * @param mixed   $attributes string, array, object
+	 * @param integer $depth
+	 *
+	 * @return string
+	 */
+	function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0): string
+	{
+		// Set the indentation based on the depth
+		$out = str_repeat(' ', $depth)
+				// Write the opening list tag
+				. '<' . $type . stringify_attributes($attributes) . ">\n";
+
+		// Cycle through the list elements.  If an array is
+		// encountered we will recursively call _list()
+
+		static $_last_list_item = '';
+		foreach ($list as $key => $val)
+		{
+			$_last_list_item = $key;
+
+			$out .= str_repeat(' ', $depth + 2) . '<li>';
+
+			if (! is_array($val))
+			{
+				$out .= $val;
+			}
+			else
+			{
+				$out .= $_last_list_item
+						. "\n"
+						. _list($type, $val, '', $depth + 4)
+						. str_repeat(' ', $depth + 2);
+			}
+
+			$out .= "</li>\n";
+		}
+
+		// Set the indentation for the closing tag and apply it
+		return $out . str_repeat(' ', $depth) . '</' . $type . ">\n";
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('img'))
+{
+	/**
+	 * Image
+	 *
+	 * Generates an image element
+	 *
+	 * @param string|array        $src        Image source URI, or array of attributes and values
+	 * @param boolean             $indexPage  Whether to treat $src as a routed URI string
+	 * @param string|array|object $attributes Additional HTML attributes
+	 *
+	 * @return string
+	 */
+	function img($src = '', bool $indexPage = false, $attributes = ''): string
+	{
+		if (! is_array($src))
+		{
+			$src = ['src' => $src];
+		}
+		if (! isset($src['src']))
+		{
+			$src['src'] = $attributes['src'] ?? '';
+		}
+		if (! isset($src['alt']))
+		{
+			$src['alt'] = $attributes['alt'] ?? '';
+		}
+
+		$img = '<img';
+
+		// Check for a relative URI
+		if (! preg_match('#^([a-z]+:)?//#i', $src['src']) && strpos($src['src'], 'data:') !== 0)
+		{
+			if ($indexPage === true)
+			{
+				$img .= ' src="' . site_url($src['src']) . '"';
+			}
+			else
+			{
+				$img .= ' src="' . slash_item('baseURL') . $src['src'] . '"';
+			}
+
+			unset($src['src']);
+		}
+
+		// Append any other values
+		foreach ($src as $key => $value)
+		{
+			$img .= ' ' . $key . '="' . $value . '"';
+		}
+
+		// Prevent passing completed values to stringify_attributes
+		if (is_array($attributes))
+		{
+			unset($attributes['alt'], $attributes['src']);
+		}
+
+		return $img . stringify_attributes($attributes) . ' />';
+	}
+}
+
+if (! function_exists('img_data'))
+{
+	/**
+	 * Image (data)
+	 *
+	 * Generates a src-ready string from an image using the "data:" protocol
+	 *
+	 * @param string      $path Image source path
+	 * @param string|null $mime MIME type to use, or null to guess
+	 *
+	 * @return string
+	 */
+	function img_data(string $path, string $mime = null): string
+	{
+		if (! is_file($path) || ! is_readable($path))
+		{
+			throw FileNotFoundException::forFileNotFound($path);
+		}
+
+		// Read in file binary data
+		$handle = fopen($path, 'rb');
+		$data   = fread($handle, filesize($path));
+		fclose($handle);
+
+		// Encode as base64
+		$data = base64_encode($data);
+
+		// Figure out the type (Hail Mary to JPEG)
+		$mime = $mime ?? Mimes::guessTypeFromExtension(pathinfo($path, PATHINFO_EXTENSION)) ?? 'image/jpg';
+
+		return 'data:' . $mime . ';base64,' . $data;
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('doctype'))
+{
+	/**
+	 * Doctype
+	 *
+	 * Generates a page document type declaration
+	 *
+	 * Examples of valid options: html5, xhtml-11, xhtml-strict, xhtml-trans,
+	 * xhtml-frame, html4-strict, html4-trans, and html4-frame.
+	 * All values are saved in the doctypes config file.
+	 *
+	 * @param string $type The doctype to be generated
+	 *
+	 * @return string
+	 */
+	function doctype(string $type = 'html5'): string
+	{
+		$config   = new DocTypes();
+		$doctypes = $config->list;
+		return $doctypes[$type] ?? false;
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('script_tag'))
+{
+	/**
+	 * Script
+	 *
+	 * Generates link to a JS file
+	 *
+	 * @param mixed   $src       Script source or an array
+	 * @param boolean $indexPage Should indexPage be added to the JS path
+	 *
+	 * @return string
+	 */
+	function script_tag($src = '', bool $indexPage = false): string
+	{
+		$script = '<script ';
+		if (! is_array($src))
+		{
+			$src = ['src' => $src];
+		}
+
+		foreach ($src as $k => $v)
+		{
+			if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v))
+			{
+				if ($indexPage === true)
+				{
+					$script .= 'src="' . site_url($v) . '" ';
+				}
+				else
+				{
+					$script .= 'src="' . slash_item('baseURL') . $v . '" ';
+				}
+			}
+			else
+			{
+				$script .= $k . '="' . $v . '" ';
+			}
+		}
+
+		return $script . 'type="text/javascript"' . '></script>';
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('link_tag'))
+{
+	/**
+	 * Link
+	 *
+	 * Generates link to a CSS file
+	 *
+	 * @param mixed   $href      Stylesheet href or an array
+	 * @param string  $rel
+	 * @param string  $type
+	 * @param string  $title
+	 * @param string  $media
+	 * @param boolean $indexPage should indexPage be added to the CSS path.
+	 * @param string  $hreflang
+	 *
+	 * @return string
+	 */
+	function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false, string $hreflang = ''): string
+	{
+		$link = '<link ';
+
+		// extract fields if needed
+		if (is_array($href))
+		{
+			$rel       = $href['rel'] ?? $rel;
+			$type      = $href['type'] ?? $type;
+			$title     = $href['title'] ?? $title;
+			$media     = $href['media'] ?? $media;
+			$hreflang  = $href['hreflang'] ?? '';
+			$indexPage = $href['indexPage'] ?? $indexPage;
+			$href      = $href['href'] ?? '';
+		}
+
+		if (! preg_match('#^([a-z]+:)?//#i', $href))
+		{
+			if ($indexPage === true)
+			{
+				$link .= 'href="' . site_url($href) . '" ';
+			}
+			else
+			{
+				$link .= 'href="' . slash_item('baseURL') . $href . '" ';
+			}
+		}
+		else
+		{
+			$link .= 'href="' . $href . '" ';
+		}
+
+		if ($hreflang !== '')
+		{
+			$link .= 'hreflang="' . $hreflang . '" ';
+		}
+
+		$link .= 'rel="' . $rel . '" ';
+
+		if (! in_array($rel, ['alternate', 'canonical'], true))
+		{
+			$link .= 'type="' . $type . '" ';
+		}
+
+		if ($media !== '')
+		{
+			$link .= 'media="' . $media . '" ';
+		}
+
+		if ($title !== '')
+		{
+			$link .= 'title="' . $title . '" ';
+		}
+
+		return $link . '/>';
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('video'))
+{
+	/**
+	 * Video
+	 *
+	 * Generates a video element to embed videos. The video element can
+	 * contain one or more video sources
+	 *
+	 * @param mixed   $src                Either a source string or an array of sources
+	 * @param string  $unsupportedMessage The message to display if the media tag is not supported by the browser
+	 * @param string  $attributes         HTML attributes
+	 * @param array   $tracks
+	 * @param boolean $indexPage
+	 *
+	 * @return string
+	 */
+	function video($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
+	{
+		if (is_array($src))
+		{
+			return _media('video', $src, $unsupportedMessage, $attributes, $tracks);
+		}
+
+		$video = '<video';
+
+		if (_has_protocol($src))
+		{
+			$video .= ' src="' . $src . '"';
+		}
+		elseif ($indexPage === true)
+		{
+			$video .= ' src="' . site_url($src) . '"';
+		}
+		else
+		{
+			$video .= ' src="' . slash_item('baseURL') . $src . '"';
+		}
+
+		if ($attributes !== '')
+		{
+			$video .= ' ' . $attributes;
+		}
+
+		$video .= ">\n";
+
+		if (! empty($tracks))
+		{
+			foreach ($tracks as $track)
+			{
+				$video .= _space_indent() . $track . "\n";
+			}
+		}
+
+		if (! empty($unsupportedMessage))
+		{
+			$video .= _space_indent()
+					. $unsupportedMessage
+					. "\n";
+		}
+
+		return $video . "</video>\n";
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('audio'))
+{
+	/**
+	 * Audio
+	 *
+	 * Generates an audio element to embed sounds
+	 *
+	 * @param mixed   $src                Either a source string or an array of sources
+	 * @param string  $unsupportedMessage The message to display if the media tag is not supported by the browser.
+	 * @param string  $attributes         HTML attributes
+	 * @param array   $tracks
+	 * @param boolean $indexPage
+	 *
+	 * @return string
+	 */
+	function audio($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
+	{
+		if (is_array($src))
+		{
+			return _media('audio', $src, $unsupportedMessage, $attributes, $tracks);
+		}
+
+		$audio = '<audio';
+
+		if (_has_protocol($src))
+		{
+			$audio .= ' src="' . $src . '"';
+		}
+		elseif ($indexPage === true)
+		{
+			$audio .= ' src="' . site_url($src) . '"';
+		}
+		else
+		{
+			$audio .= ' src="' . slash_item('baseURL') . $src . '"';
+		}
+
+		if ($attributes !== '')
+		{
+			$audio .= ' ' . $attributes;
+		}
+
+		$audio .= '>';
+
+		if (! empty($tracks))
+		{
+			foreach ($tracks as $track)
+			{
+				$audio .= "\n" . _space_indent() . $track;
+			}
+		}
+
+		if (! empty($unsupportedMessage))
+		{
+			$audio .= "\n" . _space_indent() . $unsupportedMessage . "\n";
+		}
+
+		return $audio . "</audio>\n";
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('_media'))
+{
+	/**
+	 * Generate media based tag
+	 *
+	 * @param string $name
+	 * @param array  $types
+	 * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
+	 * @param string $attributes
+	 * @param array  $tracks
+	 *
+	 * @return string
+	 */
+	function _media(string $name, array $types = [], string $unsupportedMessage = '', string $attributes = '', array $tracks = []): string
+	{
+		$media = '<' . $name;
+
+		if (empty($attributes))
+		{
+			$media .= '>';
+		}
+		else
+		{
+			$media .= ' ' . $attributes . '>';
+		}
+
+		$media .= "\n";
+
+		foreach ($types as $option)
+		{
+			$media .= _space_indent() . $option . "\n";
+		}
+
+		if (! empty($tracks))
+		{
+			foreach ($tracks as $track)
+			{
+				$media .= _space_indent() . $track . "\n";
+			}
+		}
+
+		if (! empty($unsupportedMessage))
+		{
+			$media .= _space_indent() . $unsupportedMessage . "\n";
+		}
+
+		return $media . ('</' . $name . ">\n");
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('source'))
+{
+	/**
+	 * Source
+	 *
+	 * Generates a source element that specifies multiple media resources
+	 * for either audio or video element
+	 *
+	 * @param string  $src        The path of the media resource
+	 * @param string  $type       The MIME-type of the resource with optional codecs parameters
+	 * @param string  $attributes HTML attributes
+	 * @param boolean $indexPage
+	 *
+	 * @return string
+	 */
+	function source(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
+	{
+		if (! _has_protocol($src))
+		{
+			$src = $indexPage === true ? site_url($src) : slash_item('baseURL') . $src;
+		}
+
+		$source = '<source src="' . $src
+				. '" type="' . $type . '"';
+
+		if (! empty($attributes))
+		{
+			$source .= ' ' . $attributes;
+		}
+
+		return $source . ' />';
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('track'))
+{
+	/**
+	 * Track
+	 *
+	 * Generates a track element to specify timed tracks. The tracks are
+	 * formatted in WebVTT format.
+	 *
+	 * @param string $src         The path of the .VTT file
+	 * @param string $kind
+	 * @param string $srcLanguage
+	 * @param string $label
+	 *
+	 * @return string
+	 */
+	function track(string $src, string $kind, string $srcLanguage, string $label): string
+	{
+		return '<track src="' . $src
+				. '" kind="' . $kind
+				. '" srclang="' . $srcLanguage
+				. '" label="' . $label
+				. '" />';
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('object'))
+{
+	/**
+	 * Object
+	 *
+	 * Generates an object element that represents the media
+	 * as either image or a resource plugin such as audio, video,
+	 * Java applets, ActiveX, PDF and Flash
+	 *
+	 * @param string  $data       A resource URL
+	 * @param string  $type       Content-type of the resource
+	 * @param string  $attributes HTML attributes
+	 * @param array   $params
+	 * @param boolean $indexPage
+	 *
+	 * @return string
+	 */
+	function object(string $data, string $type = 'unknown', string $attributes = '', array $params = [], bool $indexPage = false): string
+	{
+		if (! _has_protocol($data))
+		{
+			$data = $indexPage === true ? site_url($data) : slash_item('baseURL') . $data;
+		}
+
+		$object = '<object data="' . $data . '" '
+				. $attributes . '>';
+
+		if (! empty($params))
+		{
+			$object .= "\n";
+		}
+
+		foreach ($params as $param)
+		{
+			$object .= _space_indent() . $param . "\n";
+		}
+
+		return $object . "</object>\n";
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('param'))
+{
+	/**
+	 * Param
+	 *
+	 * Generates a param element that defines parameters
+	 * for the object element.
+	 *
+	 * @param string $name       The name of the parameter
+	 * @param string $value      The value of the parameter
+	 * @param string $type       The MIME-type
+	 * @param string $attributes HTML attributes
+	 *
+	 * @return string
+	 */
+	function param(string $name, string $value, string $type = 'ref', string $attributes = ''): string
+	{
+		return '<param name="' . $name
+				. '" type="' . $type
+				. '" value="' . $value
+				. '" ' . $attributes . ' />';
+	}
+}
+
+	// ------------------------------------------------------------------------
+
+if (! function_exists('embed'))
+{
+	/**
+	 * Embed
+	 *
+	 * Generates an embed element
+	 *
+	 * @param string  $src        The path of the resource to embed
+	 * @param string  $type       MIME-type
+	 * @param string  $attributes HTML attributes
+	 * @param boolean $indexPage
+	 *
+	 * @return string
+	 */
+	function embed(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
+	{
+		if (! _has_protocol($src))
+		{
+			$src = $indexPage === true ? site_url($src) : slash_item('baseURL') . $src;
+		}
+
+		return '<embed src="' . $src
+				. '" type="' . $type . '" '
+				. $attributes . " />\n";
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('_has_protocol'))
+{
+	/**
+	 * Test the protocol of a URI.
+	 *
+	 * @param string $url
+	 *
+	 * @return false|integer
+	 */
+	function _has_protocol(string $url)
+	{
+		return preg_match('#^([a-z]+:)?//#i', $url);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('_space_indent'))
+{
+	/**
+	 * Provide space indenting.
+	 *
+	 * @param integer $depth
+	 *
+	 * @return string
+	 */
+	function _space_indent(int $depth = 2): string
+	{
+		return str_repeat(' ', $depth);
+	}
+}
+
+// ------------------------------------------------------------------------
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
new file mode 100644
index 0000000..36ea9b5
--- /dev/null
+++ b/system/Helpers/inflector_helper.php
@@ -0,0 +1,384 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// --------------------------------------------------------------------
+
+/**
+ * CodeIgniter Inflector Helpers
+ */
+if (! function_exists('singular'))
+{
+	/**
+	 * Singular
+	 *
+	 * Takes a plural word and makes it singular
+	 *
+	 * @param string $string Input string
+	 *
+	 * @return string
+	 */
+	function singular(string $string): string
+	{
+		$result = $string;
+
+		if (! is_pluralizable($result))
+		{
+			return $result;
+		}
+
+		//Arranged in order.
+		$singularRules = [
+			'/(matr)ices$/'                                                   => '\1ix',
+			'/(vert|ind)ices$/'                                               => '\1ex',
+			'/^(ox)en/'                                                       => '\1',
+			'/(alias)es$/'                                                    => '\1',
+			'/([octop|vir])i$/'                                               => '\1us',
+			'/(cris|ax|test)es$/'                                             => '\1is',
+			'/(shoe)s$/'                                                      => '\1',
+			'/(o)es$/'                                                        => '\1',
+			'/(bus|campus)es$/'                                               => '\1',
+			'/([m|l])ice$/'                                                   => '\1ouse',
+			'/(x|ch|ss|sh)es$/'                                               => '\1',
+			'/(m)ovies$/'                                                     => '\1\2ovie',
+			'/(s)eries$/'                                                     => '\1\2eries',
+			'/([^aeiouy]|qu)ies$/'                                            => '\1y',
+			'/([lr])ves$/'                                                    => '\1f',
+			'/(tive)s$/'                                                      => '\1',
+			'/(hive)s$/'                                                      => '\1',
+			'/([^f])ves$/'                                                    => '\1fe',
+			'/(^analy)ses$/'                                                  => '\1sis',
+			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/' => '\1\2sis',
+			'/([ti])a$/'                                                      => '\1um',
+			'/(p)eople$/'                                                     => '\1\2erson',
+			'/(m)en$/'                                                        => '\1an',
+			'/(s)tatuses$/'                                                   => '\1\2tatus',
+			'/(c)hildren$/'                                                   => '\1\2hild',
+			'/(n)ews$/'                                                       => '\1\2ews',
+			'/(quiz)zes$/'                                                    => '\1',
+			'/([^us])s$/'                                                     => '\1',
+		];
+
+		foreach ($singularRules as $rule => $replacement)
+		{
+			if (preg_match($rule, $result))
+			{
+				$result = preg_replace($rule, $replacement, $result);
+				break;
+			}
+		}
+
+		return $result;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('plural'))
+{
+	/**
+	 * Plural
+	 *
+	 * Takes a singular word and makes it plural
+	 *
+	 * @param string $string Input string
+	 *
+	 * @return string
+	 */
+	function plural(string $string): string
+	{
+		$result = $string;
+
+		if (! is_pluralizable($result))
+		{
+			return $result;
+		}
+
+		$pluralRules = [
+			'/(quiz)$/'               => '\1zes',    // quizzes
+			'/^(ox)$/'                => '\1\2en', // ox
+			'/([m|l])ouse$/'          => '\1ice', // mouse, louse
+			'/(matr|vert|ind)ix|ex$/' => '\1ices', // matrix, vertex, index
+			'/(x|ch|ss|sh)$/'         => '\1es', // search, switch, fix, box, process, address
+			'/([^aeiouy]|qu)y$/'      => '\1ies', // query, ability, agency
+			'/(hive)$/'               => '\1s', // archive, hive
+			'/(?:([^f])fe|([lr])f)$/' => '\1\2ves', // half, safe, wife
+			'/sis$/'                  => 'ses', // basis, diagnosis
+			'/([ti])um$/'             => '\1a', // datum, medium
+			'/(p)erson$/'             => '\1eople', // person, salesperson
+			'/(m)an$/'                => '\1en', // man, woman, spokesman
+			'/(c)hild$/'              => '\1hildren', // child
+			'/(buffal|tomat)o$/'      => '\1\2oes', // buffalo, tomato
+			'/(bu|campu)s$/'          => '\1\2ses', // bus, campus
+			'/(alias|status|virus)$/' => '\1es', // alias
+			'/(octop)us$/'            => '\1i', // octopus
+			'/(ax|cris|test)is$/'     => '\1es', // axis, crisis
+			'/s$/'                    => 's', // no change (compatibility)
+			'/$/'                     => 's',
+		];
+
+		foreach ($pluralRules as $rule => $replacement)
+		{
+			if (preg_match($rule, $result))
+			{
+				$result = preg_replace($rule, $replacement, $result);
+				break;
+			}
+		}
+
+		return $result;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('counted'))
+{
+	/**
+	 * Counted
+	 *
+	 * Takes a number and a word to return the plural or not
+	 * E.g. 0 cats, 1 cat, 2 cats, ...
+	 *
+	 * @param integer $count  Number of items
+	 * @param string  $string Input string
+	 *
+	 * @return string
+	 */
+	function counted(int $count, string $string): string
+	{
+		$result = "{$count} ";
+
+		return $result . ($count === 1 ? singular($string) : plural($string));
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('camelize'))
+{
+	/**
+	 * Camelize
+	 *
+	 * Takes multiple words separated by spaces or
+	 * underscores and converts them to camel case.
+	 *
+	 * @param  string $string Input string
+	 * @return string
+	 */
+	function camelize(string $string): string
+	{
+		return lcfirst(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $string))));
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('pascalize'))
+{
+	/**
+	 * Pascalize
+	 *
+	 * Takes multiple words separated by spaces or
+	 * underscores and converts them to Pascal case,
+	 * which is camel case with an uppercase first letter.
+	 *
+	 * @param string $string Input string
+	 *
+	 * @return string
+	 */
+	function pascalize(string $string): string
+	{
+		return ucfirst(camelize($string));
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('underscore'))
+{
+	/**
+	 * Underscore
+	 *
+	 * Takes multiple words separated by spaces and underscores them
+	 *
+	 * @param string $string Input string
+	 *
+	 * @return string
+	 */
+	function underscore(string $string): string
+	{
+		$replacement = trim($string);
+
+		return preg_replace('/[\s]+/', '_', $replacement);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('humanize'))
+{
+	/**
+	 * Humanize
+	 *
+	 * Takes multiple words separated by the separator,
+	 * camelizes and changes them to spaces
+	 *
+	 * @param string $string    Input string
+	 * @param string $separator Input separator
+	 *
+	 * @return string
+	 */
+	function humanize(string $string, string $separator = '_'): string
+	{
+		$replacement = trim($string);
+
+		return ucwords
+				(
+				preg_replace('/[' . $separator . ']+/', ' ', $replacement)
+		);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('is_pluralizable'))
+{
+	/**
+	 * Checks if the given word has a plural version.
+	 *
+	 * @param string $word Word to check
+	 *
+	 * @return boolean
+	 */
+	function is_pluralizable(string $word): bool
+	{
+		$uncountables = in_array
+				(
+			strtolower($word), [
+						   'advice',
+						   'bravery',
+						   'butter',
+						   'chaos',
+						   'clarity',
+						   'coal',
+						   'courage',
+						   'cowardice',
+						   'curiosity',
+						   'education',
+						   'equipment',
+						   'evidence',
+						   'fish',
+						   'fun',
+						   'furniture',
+						   'greed',
+						   'help',
+						   'homework',
+						   'honesty',
+						   'information',
+						   'insurance',
+						   'jewelry',
+						   'knowledge',
+						   'livestock',
+						   'love',
+						   'luck',
+						   'marketing',
+						   'meta',
+						   'money',
+						   'mud',
+						   'news',
+						   'patriotism',
+						   'racism',
+						   'rice',
+						   'satisfaction',
+						   'scenery',
+						   'series',
+						   'sexism',
+						   'silence',
+						   'species',
+						   'spelling',
+						   'sugar',
+						   'water',
+						   'weather',
+						   'wisdom',
+						   'work',
+					   ], true);
+
+		return ! $uncountables;
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('dasherize'))
+{
+	/**
+	 * Replaces underscores with dashes in the string.
+	 *
+	 * @param string $string Input string
+	 *
+	 * @return string
+	 */
+	function dasherize(string $string): string
+	{
+		return str_replace('_', '-', $string);
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('ordinal'))
+{
+	/**
+	 * Returns the suffix that should be added to a
+	 * number to denote the position in an ordered
+	 * sequence such as 1st, 2nd, 3rd, 4th.
+	 *
+	 * @param integer $integer The integer to determine the suffix
+	 *
+	 * @return string
+	 */
+	function ordinal(int $integer): string
+	{
+		$suffixes = [
+			'th',
+			'st',
+			'nd',
+			'rd',
+			'th',
+			'th',
+			'th',
+			'th',
+			'th',
+			'th',
+		];
+
+		return $integer % 100 >= 11 && $integer % 100 <= 13 ? 'th' : $suffixes[$integer % 10];
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('ordinalize'))
+{
+	/**
+	 * Turns a number into an ordinal string used
+	 * to denote the position in an ordered sequence
+	 * such as 1st, 2nd, 3rd, 4th.
+	 *
+	 * @param integer $integer The integer to ordinalize
+	 *
+	 * @return string
+	 */
+	function ordinalize(int $integer): string
+	{
+		return $integer . ordinal($integer);
+	}
+}
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
new file mode 100644
index 0000000..4262ee6
--- /dev/null
+++ b/system/Helpers/number_helper.php
@@ -0,0 +1,313 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Config\Services;
+
+/**
+ * CodeIgniter Number Helpers
+ */
+
+if (! function_exists('number_to_size'))
+{
+	/**
+	 * Formats a numbers as bytes, based on size, and adds the appropriate suffix
+	 *
+	 * @param mixed   $num       Will be cast as int
+	 * @param integer $precision
+	 * @param string  $locale
+	 *
+	 * @return boolean|string
+	 */
+	function number_to_size($num, int $precision = 1, string $locale = null)
+	{
+		// Strip any formatting & ensure numeric input
+		try
+		{
+			$num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
+		}
+		catch (ErrorException $ee)
+		{
+			return false;
+		}
+
+		// ignore sub part
+		$generalLocale = $locale;
+		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
+		{
+			$generalLocale = substr($locale, 0, $underscorePos);
+		}
+
+		if ($num >= 1000000000000)
+		{
+			$num  = round($num / 1099511627776, $precision);
+			$unit = lang('Number.terabyteAbbr', [], $generalLocale);
+		}
+		elseif ($num >= 1000000000)
+		{
+			$num  = round($num / 1073741824, $precision);
+			$unit = lang('Number.gigabyteAbbr', [], $generalLocale);
+		}
+		elseif ($num >= 1000000)
+		{
+			$num  = round($num / 1048576, $precision);
+			$unit = lang('Number.megabyteAbbr', [], $generalLocale);
+		}
+		elseif ($num >= 1000)
+		{
+			$num  = round($num / 1024, $precision);
+			$unit = lang('Number.kilobyteAbbr', [], $generalLocale);
+		}
+		else
+		{
+			$unit = lang('Number.bytes', [], $generalLocale);
+		}
+
+		return format_number($num, $precision, $locale, ['after' => ' ' . $unit]);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('number_to_amount'))
+{
+	/**
+	 * Converts numbers to a more readable representation
+	 * when dealing with very large numbers (in the thousands or above),
+	 * up to the quadrillions, because you won't often deal with numbers
+	 * larger than that.
+	 *
+	 * It uses the "short form" numbering system as this is most commonly
+	 * used within most English-speaking countries today.
+	 *
+	 * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers
+	 *
+	 * @param string      $num
+	 * @param integer     $precision
+	 * @param string|null $locale
+	 *
+	 * @return boolean|string
+	 */
+	function number_to_amount($num, int $precision = 0, string $locale = null)
+	{
+		// Strip any formatting & ensure numeric input
+		try
+		{
+			$num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
+		}
+		catch (ErrorException $ee)
+		{
+			return false;
+		}
+
+		$suffix = '';
+
+		// ignore sub part
+		$generalLocale = $locale;
+		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
+		{
+			$generalLocale = substr($locale, 0, $underscorePos);
+		}
+
+		if ($num > 1000000000000000)
+		{
+			$suffix = lang('Number.quadrillion', [], $generalLocale);
+			$num    = round(($num / 1000000000000000), $precision);
+		}
+		elseif ($num > 1000000000000)
+		{
+			$suffix = lang('Number.trillion', [], $generalLocale);
+			$num    = round(($num / 1000000000000), $precision);
+		}
+		elseif ($num > 1000000000)
+		{
+			$suffix = lang('Number.billion', [], $generalLocale);
+			$num    = round(($num / 1000000000), $precision);
+		}
+		elseif ($num > 1000000)
+		{
+			$suffix = lang('Number.million', [], $generalLocale);
+			$num    = round(($num / 1000000), $precision);
+		}
+		elseif ($num > 1000)
+		{
+			$suffix = lang('Number.thousand', [], $generalLocale);
+			$num    = round(($num / 1000), $precision);
+		}
+
+		return format_number($num, $precision, $locale, ['after' => $suffix]);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('number_to_currency'))
+{
+	/**
+	 * @param float   $num
+	 * @param string  $currency
+	 * @param string  $locale
+	 * @param integer $fraction
+	 *
+	 * @return string
+	 */
+	function number_to_currency(float $num, string $currency, string $locale = null, int $fraction = null): string
+	{
+		return format_number($num, 1, $locale, [
+			'type'     => NumberFormatter::CURRENCY,
+			'currency' => $currency,
+			'fraction' => $fraction,
+		]);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('format_number'))
+{
+	/**
+	 * A general purpose, locale-aware, number_format method.
+	 * Used by all of the functions of the number_helper.
+	 *
+	 * @param float       $num
+	 * @param integer     $precision
+	 * @param string|null $locale
+	 * @param array       $options
+	 *
+	 * @return string
+	 */
+	function format_number(float $num, int $precision = 1, string $locale = null, array $options = []): string
+	{
+		// Locale is either passed in here, negotiated with client, or grabbed from our config file.
+		$locale = $locale ?? Services::request()->getLocale();
+
+		// Type can be any of the NumberFormatter options, but provide a default.
+		$type = (int) ($options['type'] ?? NumberFormatter::DECIMAL);
+
+		$formatter = new NumberFormatter($locale, $type);
+
+		// Try to format it per the locale
+		if ($type === NumberFormatter::CURRENCY)
+		{
+			$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, $options['fraction']);
+			$output = $formatter->formatCurrency($num, $options['currency']);
+		}
+		else
+		{
+			// In order to specify a precision, we'll have to modify
+			// the pattern used by NumberFormatter.
+			$pattern = '#,##0.' . str_repeat('#', $precision);
+
+			$formatter->setPattern($pattern);
+			$output = $formatter->format($num);
+		}
+
+		// This might lead a trailing period if $precision == 0
+		$output = trim($output, '. ');
+
+		if (intl_is_failure($formatter->getErrorCode()))
+		{
+			throw new BadFunctionCallException($formatter->getErrorMessage());
+		}
+
+		// Add on any before/after text.
+		if (isset($options['before']) && is_string($options['before']))
+		{
+			$output = $options['before'] . $output;
+		}
+
+		if (isset($options['after']) && is_string($options['after']))
+		{
+			$output .= $options['after'];
+		}
+
+		return $output;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('number_to_roman'))
+{
+	/**
+	 * Convert a number to a roman numeral.
+	 *
+	 * @param string $num it will convert to int
+	 *
+	 * @return string|null
+	 */
+	function number_to_roman(string $num): ?string
+	{
+		$num = (int) $num;
+		if ($num < 1 || $num > 3999)
+		{
+			return null;
+		}
+
+		$_number_to_roman = function ($num, $th) use (&$_number_to_roman) {
+			$return = '';
+			$key1   = null;
+			$key2   = null;
+			switch ($th) {
+				case 1:
+					$key1 = 'I';
+					$key2 = 'V';
+					$keyF = 'X';
+					break;
+				case 2:
+					$key1 = 'X';
+					$key2 = 'L';
+					$keyF = 'C';
+					break;
+				case 3:
+					$key1 = 'C';
+					$key2 = 'D';
+					$keyF = 'M';
+					break;
+				case 4:
+					$key1 = 'M';
+					break;
+			}
+			$n = $num % 10;
+			switch ($n) {
+				case 1:
+				case 2:
+				case 3:
+					$return = str_repeat($key1, $n);
+					break;
+				case 4:
+					$return = $key1 . $key2;
+					break;
+				case 5:
+					$return = $key2;
+					break;
+				case 6:
+				case 7:
+				case 8:
+					$return = $key2 . str_repeat($key1, $n - 5);
+					break;
+				case 9:
+					$return = $key1 . $keyF; // @phpstan-ignore-line
+					break;
+			}
+			switch ($num) {
+				case 10:
+					$return = $keyF; // @phpstan-ignore-line
+					break;
+			}
+			if ($num > 10)
+			{
+				$return = $_number_to_roman($num / 10, ++ $th) . $return;
+			}
+			return $return;
+		};
+		return $_number_to_roman($num, 1);
+	}
+}
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
new file mode 100644
index 0000000..d743656
--- /dev/null
+++ b/system/Helpers/security_helper.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Config\Services;
+
+/**
+ * CodeIgniter Security Helpers
+ */
+
+if (! function_exists('sanitize_filename'))
+{
+	/**
+	 * Sanitize a filename to use in a URI.
+	 *
+	 * @param string $filename
+	 *
+	 * @return string
+	 */
+	function sanitize_filename(string $filename): string
+	{
+		return Services::security()->sanitizeFilename($filename);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('strip_image_tags'))
+{
+	/**
+	 * Strip Image Tags
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	function strip_image_tags(string $str): string
+	{
+		return preg_replace([
+			'#<img[\s/]+.*?src\s*=\s*(["\'])([^\\1]+?)\\1.*?\>#i',
+			'#<img[\s/]+.*?src\s*=\s*?(([^\s"\'=<>`]+)).*?\>#i',
+		], '\\2', $str
+		);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('encode_php_tags'))
+{
+	/**
+	 * Convert PHP tags to entities
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	function encode_php_tags(string $str): string
+	{
+		return str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $str);
+	}
+}
+
+//--------------------------------------------------------------------
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
new file mode 100644
index 0000000..e051d9d
--- /dev/null
+++ b/system/Helpers/test_helper.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Model;
+use CodeIgniter\Test\Fabricator;
+
+/**
+ * CodeIgniter Test Helpers
+ */
+//--------------------------------------------------------------------
+
+if (! function_exists('fake'))
+{
+	/**
+	 * Creates a single item using Fabricator.
+	 *
+	 * @param Model|object|string $model     Instance or name of the model
+	 * @param array|null          $overrides Overriding data to pass to Fabricator::setOverrides()
+	 *
+	 * @return object|array
+	 */
+	function fake($model, array $overrides = null, $persist = true)
+	{
+		// Get a model-appropriate Fabricator instance
+		$fabricator = new Fabricator($model);
+
+		// Set overriding data, if necessary
+		if ($overrides)
+		{
+			$fabricator->setOverrides($overrides);
+		}
+
+		if ($persist)
+		{
+			return $fabricator->create();
+		}
+
+		return $fabricator->make();
+	}
+}
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
new file mode 100644
index 0000000..0e3baed
--- /dev/null
+++ b/system/Helpers/text_helper.php
@@ -0,0 +1,853 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Config\ForeignCharacters;
+
+/**
+ * CodeIgniter Text Helpers
+ */
+//--------------------------------------------------------------------
+
+if (! function_exists('word_limiter'))
+{
+	/**
+	 * Word Limiter
+	 *
+	 * Limits a string to X number of words.
+	 *
+	 * @param string  $str
+	 * @param integer $limit
+	 * @param string  $endChar the end character. Usually an ellipsis
+	 *
+	 * @return string
+	 */
+	function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'): string
+	{
+		if (trim($str) === '')
+		{
+			return $str;
+		}
+
+		preg_match('/^\s*+(?:\S++\s*+){1,' . $limit . '}/', $str, $matches);
+
+		if (strlen($str) === strlen($matches[0]))
+		{
+			$endChar = '';
+		}
+
+		return rtrim($matches[0]) . $endChar;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('character_limiter'))
+{
+	/**
+	 * Character Limiter
+	 *
+	 * Limits the string based on the character count.  Preserves complete words
+	 * so the character count may not be exactly as specified.
+	 *
+	 * @param string  $str
+	 * @param integer $n
+	 * @param string  $endChar the end character. Usually an ellipsis
+	 *
+	 * @return string
+	 */
+	function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;'): string
+	{
+		if (mb_strlen($str) < $n)
+		{
+			return $str;
+		}
+
+		// a bit complicated, but faster than preg_replace with \s+
+		$str = preg_replace('/ {2,}/', ' ', str_replace(["\r", "\n", "\t", "\x0B", "\x0C"], ' ', $str));
+
+		if (mb_strlen($str) <= $n)
+		{
+			return $str;
+		}
+
+		$out = '';
+
+		foreach (explode(' ', trim($str)) as $val)
+		{
+			$out .= $val . ' ';
+			if (mb_strlen($out) >= $n)
+			{
+				$out = trim($out);
+				break;
+			}
+		}
+		return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $endChar;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('ascii_to_entities'))
+{
+	/**
+	 * High ASCII to Entities
+	 *
+	 * Converts high ASCII text and MS Word special characters to character entities
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	function ascii_to_entities(string $str): string
+	{
+		$out = '';
+
+		for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i ++)
+		{
+			$ordinal = ord($str[$i]);
+
+			if ($ordinal < 128)
+			{
+				/*
+				  If the $temp array has a value but we have moved on, then it seems only
+				  fair that we output that entity and restart $temp before continuing.
+				 */
+				if (count($temp) === 1)
+				{
+					$out  .= '&#' . array_shift($temp) . ';';
+					$count = 1;
+				}
+
+				$out .= $str[$i];
+			}
+			else
+			{
+				if (empty($temp))
+				{
+					$count = ($ordinal < 224) ? 2 : 3;
+				}
+
+				$temp[] = $ordinal;
+
+				if (count($temp) === $count)
+				{
+					$number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
+					$out   .= '&#' . $number . ';';
+					$count  = 1;
+					$temp   = [];
+				}
+				// If this is the last iteration, just output whatever we have
+				elseif ($i === $s)
+				{
+					$out .= '&#' . implode(';', $temp) . ';';
+				}
+			}
+		}
+
+		return $out;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('entities_to_ascii'))
+{
+	/**
+	 * Entities to ASCII
+	 *
+	 * Converts character entities back to ASCII
+	 *
+	 * @param string  $str
+	 * @param boolean $all
+	 *
+	 * @return string
+	 */
+	function entities_to_ascii(string $str, bool $all = true): string
+	{
+		if (preg_match_all('/\&#(\d+)\;/', $str, $matches))
+		{
+			for ($i = 0, $s = count($matches[0]); $i < $s; $i ++)
+			{
+				$digits = $matches[1][$i];
+				$out    = '';
+				if ($digits < 128)
+				{
+					$out .= chr($digits);
+				}
+				elseif ($digits < 2048)
+				{
+					$out .= chr(192 + (($digits - ($digits % 64)) / 64)) . chr(128 + ($digits % 64));
+				}
+				else
+				{
+					$out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
+							. chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
+							. chr(128 + ($digits % 64));
+				}
+				$str = str_replace($matches[0][$i], $out, $str);
+			}
+		}
+
+		if ($all)
+		{
+			return str_replace([
+				'&amp;',
+				'&lt;',
+				'&gt;',
+				'&quot;',
+				'&apos;',
+				'&#45;',
+			], [
+				'&',
+				'<',
+				'>',
+				'"',
+				"'",
+				'-',
+			], $str
+			);
+		}
+
+		return $str;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('word_censor'))
+{
+	/**
+	 * Word Censoring Function
+	 *
+	 * Supply a string and an array of disallowed words and any
+	 * matched words will be converted to #### or to the replacement
+	 * word you've submitted.
+	 *
+	 * @param string $str         the text string
+	 * @param array  $censored    the array of censored words
+	 * @param string $replacement the optional replacement value
+	 *
+	 * @return string
+	 */
+	function word_censor(string $str, array $censored, string $replacement = ''): string
+	{
+		if (empty($censored))
+		{
+			return $str;
+		}
+
+		$str = ' ' . $str . ' ';
+
+		// \w, \b and a few others do not match on a unicode character
+		// set for performance reasons. As a result words like Ć¼ber
+		// will not match on a word boundary. Instead, we'll assume that
+		// a bad word will be bookended by any of these characters.
+		$delim = '[-_\'\"`(){}<>\[\]|!?@#%&,.:;^~*+=\/ 0-9\n\r\t]';
+
+		foreach ($censored as $badword)
+		{
+			$badword = str_replace('\*', '\w*?', preg_quote($badword, '/'));
+
+			if ($replacement !== '')
+			{
+				$str = preg_replace(
+						"/({$delim})(" . $badword . ")({$delim})/i", "\\1{$replacement}\\3", $str
+				);
+			}
+			elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE))
+			{
+				$matches = $matches[1];
+
+				for ($i = count($matches) - 1; $i >= 0; $i --)
+				{
+					$length = strlen($matches[$i][0]);
+					$str    = substr_replace(
+							$str, str_repeat('#', $length), $matches[$i][1], $length
+					);
+				}
+			}
+		}
+
+		return trim($str);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('highlight_code'))
+{
+	/**
+	 * Code Highlighter
+	 *
+	 * Colorizes code strings
+	 *
+	 * @param string $str the text string
+	 *
+	 * @return string
+	 */
+	function highlight_code(string $str): string
+	{
+		/* The highlight string function encodes and highlights
+		 * brackets so we need them to start raw.
+		 *
+		 * Also replace any existing PHP tags to temporary markers
+		 * so they don't accidentally break the string out of PHP,
+		 * and thus, thwart the highlighting.
+		 */
+		$str = str_replace([
+			'&lt;',
+			'&gt;',
+			'<?',
+			'?>',
+			'<%',
+			'%>',
+			'\\',
+			'</script>',
+		], [
+			'<',
+			'>',
+			'phptagopen',
+			'phptagclose',
+			'asptagopen',
+			'asptagclose',
+			'backslashtmp',
+			'scriptclose',
+		], $str
+		);
+
+		// The highlight_string function requires that the text be surrounded
+		// by PHP tags, which we will remove later
+		$str = highlight_string('<?php ' . $str . ' ?>', true);
+
+		// Remove our artificially added PHP, and the syntax highlighting that came with it
+		$str = preg_replace([
+			'/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
+			'/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
+			'/<span style="color: #[A-Z0-9]+"\><\/span>/i',
+		], [
+			'<span style="color: #$1">',
+			"$1</span>\n</span>\n</code>",
+			'',
+		], $str
+		);
+
+		// Replace our markers back to PHP tags.
+		return str_replace([
+			'phptagopen',
+			'phptagclose',
+			'asptagopen',
+			'asptagclose',
+			'backslashtmp',
+			'scriptclose',
+		], [
+			'&lt;?',
+			'?&gt;',
+			'&lt;%',
+			'%&gt;',
+			'\\',
+			'&lt;/script&gt;',
+		], $str
+		);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('highlight_phrase'))
+{
+	/**
+	 * Phrase Highlighter
+	 *
+	 * Highlights a phrase within a text string
+	 *
+	 * @param string $str      the text string
+	 * @param string $phrase   the phrase you'd like to highlight
+	 * @param string $tagOpen  the opening tag to precede the phrase with
+	 * @param string $tagClose the closing tag to end the phrase with
+	 *
+	 * @return string
+	 */
+	function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>', string $tagClose = '</mark>'): string
+	{
+		return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tagOpen . '\\1' . $tagClose, $str) : $str;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('convert_accented_characters'))
+{
+	/**
+	 * Convert Accented Foreign Characters to ASCII
+	 *
+	 * @param string $str Input string
+	 *
+	 * @return string
+	 */
+	function convert_accented_characters(string $str): string
+	{
+		static $arrayFrom, $arrayTo;
+
+		if (! is_array($arrayFrom))
+		{
+			$config = new ForeignCharacters();
+
+			if (empty($config->characterList) || ! is_array($config->characterList))
+			{
+				$arrayFrom = [];
+				$arrayTo   = [];
+
+				return $str;
+			}
+			$arrayFrom = array_keys($config->characterList);
+			$arrayTo   = array_values($config->characterList);
+
+			unset($config);
+		}
+
+		return preg_replace($arrayFrom, $arrayTo, $str);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('word_wrap'))
+{
+	/**
+	 * Word Wrap
+	 *
+	 * Wraps text at the specified character. Maintains the integrity of words.
+	 * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor
+	 * will URLs.
+	 *
+	 * @param string  $str     the text string
+	 * @param integer $charlim = 76    the number of characters to wrap at
+	 *
+	 * @return string
+	 */
+	function word_wrap(string $str, int $charlim = 76): string
+	{
+		// Reduce multiple spaces
+		$str = preg_replace('| +|', ' ', $str);
+
+		// Standardize newlines
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		// If the current word is surrounded by {unwrap} tags we'll
+		// strip the entire chunk and replace it with a marker.
+		$unwrap = [];
+
+		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
+		{
+			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
+			{
+				$unwrap[] = $matches[1][$i];
+				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
+			}
+		}
+
+		// Use PHP's native function to do the initial wordwrap.
+		// We set the cut flag to FALSE so that any individual words that are
+		// too long get left alone. In the next step we'll deal with them.
+		$str = wordwrap($str, $charlim, "\n", false);
+
+		// Split the string into individual lines of text and cycle through them
+		$output = '';
+
+		foreach (explode("\n", $str) as $line)
+		{
+			// Is the line within the allowed character count?
+			// If so we'll join it to the output and continue
+			if (mb_strlen($line) <= $charlim)
+			{
+				$output .= $line . "\n";
+				continue;
+			}
+
+			$temp = '';
+
+			while (mb_strlen($line) > $charlim)
+			{
+				// If the over-length word is a URL we won't wrap it
+				if (preg_match('!\[url.+\]|://|www\.!', $line))
+				{
+					break;
+				}
+				// Trim the word down
+				$temp .= mb_substr($line, 0, $charlim - 1);
+				$line  = mb_substr($line, $charlim - 1);
+			}
+
+			// If $temp contains data it means we had to split up an over-length
+			// word into smaller chunks so we'll add it back to our current line
+			if ($temp !== '')
+			{
+				$output .= $temp . "\n" . $line . "\n";
+			}
+			else
+			{
+				$output .= $line . "\n";
+			}
+		}
+
+		// Put our markers back
+		if (! empty($unwrap))
+		{
+			foreach ($unwrap as $key => $val)
+			{
+				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
+			}
+		}
+
+		// remove any trailing newline
+		$output = rtrim($output);
+
+		return $output;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('ellipsize'))
+{
+	/**
+	 * Ellipsize String
+	 *
+	 * This function will strip tags from a string, split it at its max_length and ellipsize
+	 *
+	 * @param string  $str       String to ellipsize
+	 * @param integer $maxLength Max length of string
+	 * @param mixed   $position  int (1|0) or float, .5, .2, etc for position to split
+	 * @param string  $ellipsis  ellipsis ; Default '...'
+	 *
+	 * @return string    Ellipsized string
+	 */
+	function ellipsize(string $str, int $maxLength, $position = 1, string $ellipsis = '&hellip;'): string
+	{
+		// Strip tags
+		$str = trim(strip_tags($str));
+
+		// Is the string long enough to ellipsize?
+		if (mb_strlen($str) <= $maxLength)
+		{
+			return $str;
+		}
+
+		$beg      = mb_substr($str, 0, (int) floor($maxLength * $position));
+		$position = ($position > 1) ? 1 : $position;
+
+		if ($position === 1)
+		{
+			$end = mb_substr($str, 0, -($maxLength - mb_strlen($beg)));
+		}
+		else
+		{
+			$end = mb_substr($str, -($maxLength - mb_strlen($beg)));
+		}
+
+		return $beg . $ellipsis . $end;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('strip_slashes'))
+{
+	/**
+	 * Strip Slashes
+	 *
+	 * Removes slashes contained in a string or in an array
+	 *
+	 * @param mixed $str string or array
+	 *
+	 * @return mixed  string or array
+	 */
+	function strip_slashes($str)
+	{
+		if (! is_array($str))
+		{
+			return stripslashes($str);
+		}
+		foreach ($str as $key => $val)
+		{
+			$str[$key] = strip_slashes($val);
+		}
+
+		return $str;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('strip_quotes'))
+{
+	/**
+	 * Strip Quotes
+	 *
+	 * Removes single and double quotes from a string
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	function strip_quotes(string $str): string
+	{
+		return str_replace(['"', "'"], '', $str);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('quotes_to_entities'))
+{
+	/**
+	 * Quotes to Entities
+	 *
+	 * Converts single and double quotes to entities
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	function quotes_to_entities(string $str): string
+	{
+		return str_replace(["\'", '"', "'", '"'], ['&#39;', '&quot;', '&#39;', '&quot;'], $str);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('reduce_double_slashes'))
+{
+	/**
+	 * Reduce Double Slashes
+	 *
+	 * Converts double slashes in a string to a single slash,
+	 * except those found in http://
+	 *
+	 * http://www.some-site.com//index.php
+	 *
+	 * becomes:
+	 *
+	 * http://www.some-site.com/index.php
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	function reduce_double_slashes(string $str): string
+	{
+		return preg_replace('#(^|[^:])//+#', '\\1/', $str);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('reduce_multiples'))
+{
+	/**
+	 * Reduce Multiples
+	 *
+	 * Reduces multiple instances of a particular character.  Example:
+	 *
+	 * Fred, Bill,, Joe, Jimmy
+	 *
+	 * becomes:
+	 *
+	 * Fred, Bill, Joe, Jimmy
+	 *
+	 * @param string  $str
+	 * @param string  $character the character you wish to reduce
+	 * @param boolean $trim      TRUE/FALSE - whether to trim the character from the beginning/end
+	 *
+	 * @return string
+	 */
+	function reduce_multiples(string $str, string $character = ',', bool $trim = false): string
+	{
+		$str = preg_replace('#' . preg_quote($character, '#') . '{2,}#', $character, $str);
+
+		return ($trim) ? trim($str, $character) : $str;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('random_string'))
+{
+	/**
+	 * Create a Random String
+	 *
+	 * Useful for generating passwords or hashes.
+	 *
+	 * @param string  $type Type of random string.  basic, alpha, alnum, numeric, nozero, md5, sha1, and crypto
+	 * @param integer $len  Number of characters
+	 *
+	 * @return string
+	 */
+	function random_string(string $type = 'alnum', int $len = 8): string
+	{
+		switch ($type)
+		{
+			case 'alnum':
+			case 'numeric':
+			case 'nozero':
+			case 'alpha':
+				switch ($type)
+				{
+					case 'alpha':
+						$pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+						break;
+					case 'alnum':
+						$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+						break;
+					case 'numeric':
+						$pool = '0123456789';
+						break;
+					case 'nozero':
+						$pool = '123456789';
+						break;
+				}
+
+				// @phpstan-ignore-next-line
+				return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
+			case 'md5':
+				return md5(uniqid((string) mt_rand(), true));
+			case 'sha1':
+				return sha1(uniqid((string) mt_rand(), true));
+			case 'crypto':
+				return bin2hex(random_bytes($len / 2));
+		}
+		// 'basic' type treated as default
+		return (string) mt_rand();
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('increment_string'))
+{
+	/**
+	 * Add's _1 to a string or increment the ending number to allow _2, _3, etc
+	 *
+	 * @param string  $str       Required
+	 * @param string  $separator What should the duplicate number be appended with
+	 * @param integer $first     Which number should be used for the first dupe increment
+	 *
+	 * @return string
+	 */
+	function increment_string(string $str, string $separator = '_', int $first = 1): string
+	{
+		preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
+
+		return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('alternator'))
+{
+	/**
+	 * Alternator
+	 *
+	 * Allows strings to be alternated. See docs...
+	 *
+	 * @phpstan-ignore-next-line
+	 * @param                    string (as many parameters as needed)
+	 *
+	 * @return string
+	 */
+	function alternator(): string
+	{
+		static $i;
+
+		if (func_num_args() === 0)
+		{
+			$i = 0;
+
+			return '';
+		}
+
+		$args = func_get_args();
+
+		return $args[($i++ % count($args))];
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('excerpt'))
+{
+	/**
+	 * Excerpt.
+	 *
+	 * Allows to extract a piece of text surrounding a word or phrase.
+	 *
+	 * @param string  $text     String to search the phrase
+	 * @param string  $phrase   Phrase that will be searched for.
+	 * @param integer $radius   The amount of characters returned around the phrase.
+	 * @param string  $ellipsis Ending that will be appended
+	 *
+	 * @return string
+	 *
+	 * If no $phrase is passed, will generate an excerpt of $radius characters
+	 * from the beginning of $text.
+	 */
+	function excerpt(string $text, string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
+	{
+		if (isset($phrase))
+		{
+			$phrasePos = stripos($text, $phrase);
+			$phraseLen = strlen($phrase);
+		}
+		else
+		{
+			$phrasePos = $radius / 2;
+			$phraseLen = 1;
+		}
+
+		$pre = explode(' ', substr($text, 0, $phrasePos));
+		$pos = explode(' ', substr($text, $phrasePos + $phraseLen));
+
+		$prev  = ' ';
+		$post  = ' ';
+		$count = 0;
+
+		foreach (array_reverse($pre) as $e)
+		{
+			if ((strlen($e) + $count + 1) < $radius)
+			{
+				$prev = ' ' . $e . $prev;
+			}
+			$count = ++ $count + strlen($e);
+		}
+
+		$count = 0;
+
+		foreach ($pos as $s)
+		{
+			if ((strlen($s) + $count + 1) < $radius)
+			{
+				$post .= $s . ' ';
+			}
+			$count = ++ $count + strlen($s);
+		}
+
+		$ellPre = $phrase ? $ellipsis : '';
+
+		return str_replace('  ', ' ', $ellPre . $prev . $phrase . $post . $ellipsis);
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
new file mode 100644
index 0000000..2424a98
--- /dev/null
+++ b/system/Helpers/url_helper.php
@@ -0,0 +1,685 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Router\Exceptions\RouterException;
+use Config\App;
+use Config\Services;
+
+/**
+ * CodeIgniter URL Helpers
+ */
+
+if (! function_exists('_get_uri'))
+{
+	/**
+	 * Used by the other URL functions to build a
+	 * framework-specific URI based on the App config.
+	 *
+	 * @internal Outside of the framework this should not be used directly.
+	 *
+	 * @param string   $relativePath May include queries or fragments
+	 * @param App|null $config
+	 *
+	 * @return URI
+	 *
+	 * @throws InvalidArgumentException For invalid paths or config
+	 */
+	function _get_uri(string $relativePath = '', App $config = null): URI
+	{
+		$config = $config ?? config('App');
+
+		if ($config->baseURL === '')
+		{
+			throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');
+		}
+
+		// If a full URI was passed then convert it
+		if (is_int(strpos($relativePath, '://')))
+		{
+			$full         = new URI($relativePath);
+			$relativePath = URI::createURIString(null, null, $full->getPath(), $full->getQuery(), $full->getFragment());
+		}
+
+		$relativePath = URI::removeDotSegments($relativePath);
+
+		// Build the full URL based on $config and $relativePath
+		$url = rtrim($config->baseURL, '/ ') . '/';
+
+		// Check for an index page
+		if ($config->indexPage !== '')
+		{
+			$url .= $config->indexPage;
+
+			// Check if we need a separator
+			if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?')
+			{
+				$url .= '/';
+			}
+		}
+
+		$url .= $relativePath;
+
+		$uri = new URI($url);
+
+		// Check if the baseURL scheme needs to be coerced into its secure version
+		if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http')
+		{
+			$uri->setScheme('https');
+		}
+
+		return $uri;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('site_url'))
+{
+	/**
+	 * Returns a site URL as defined by the App config.
+	 *
+	 * @param mixed       $relativePath URI string or array of URI segments
+	 * @param string|null $scheme
+	 * @param App|null    $config       Alternate configuration to use
+	 *
+	 * @return string
+	 */
+	function site_url($relativePath = '', string $scheme = null, App $config = null): string
+	{
+		// Convert array of segments to a string
+		if (is_array($relativePath))
+		{
+			$relativePath = implode('/', $relativePath);
+		}
+
+		$uri = _get_uri($relativePath, $config);
+
+		return URI::createURIString($scheme ?? $uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('base_url'))
+{
+	/**
+	 * Returns the base URL as defined by the App config.
+	 * Base URLs are trimmed site URLs without the index page.
+	 *
+	 * @param  mixed  $relativePath URI string or array of URI segments
+	 * @param  string $scheme
+	 * @return string
+	 */
+	function base_url($relativePath = '', string $scheme = null): string
+	{
+		$config            = clone config('App');
+		$config->indexPage = '';
+
+		return rtrim(site_url($relativePath, $scheme, $config), '/');
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('current_url'))
+{
+	/**
+	 * Returns the current full URL based on the IncomingRequest.
+	 * String returns ignore query and fragment parts.
+	 *
+	 * @param boolean              $returnObject True to return an object instead of a string
+	 * @param IncomingRequest|null $request      A request to use when retrieving the path
+	 *
+	 * @return string|URI
+	 */
+	function current_url(bool $returnObject = false, IncomingRequest $request = null)
+	{
+		$request = $request ?? Services::request();
+		$path    = $request->getPath();
+
+		// Append queries and fragments
+		if ($query = $request->getUri()->getQuery())
+		{
+			$path .= '?' . $query;
+		}
+		if ($fragment = $request->getUri()->getFragment())
+		{
+			$path .= '#' . $fragment;
+		}
+
+		$uri = _get_uri($path);
+
+		return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('previous_url'))
+{
+	/**
+	 * Returns the previous URL the current visitor was on. For security reasons
+	 * we first check in a saved session variable, if it exists, and use that.
+	 * If that's not available, however, we'll use a sanitized url from $_SERVER['HTTP_REFERER']
+	 * which can be set by the user so is untrusted and not set by certain browsers/servers.
+	 *
+	 * @param boolean $returnObject
+	 *
+	 * @return URI|mixed|string
+	 */
+	function previous_url(bool $returnObject = false)
+	{
+		// Grab from the session first, if we have it,
+		// since it's more reliable and safer.
+		// Otherwise, grab a sanitized version from $_SERVER.
+		$referer = $_SESSION['_ci_previous_url'] ?? Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);
+
+		$referer = $referer ?? site_url('/');
+
+		return $returnObject ? new URI($referer) : $referer;
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('uri_string'))
+{
+	/**
+	 * URL String
+	 *
+	 * Returns the path part of the current URL
+	 *
+	 * @param boolean $relative Whether the resulting path should be relative to baseURL
+	 *
+	 * @return string
+	 */
+	function uri_string(bool $relative = false): string
+	{
+		return $relative
+			? ltrim(Services::request()->getPath(), '/')
+			: Services::request()->getUri()->getPath();
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('index_page'))
+{
+	/**
+	 * Index page
+	 *
+	 * Returns the "index_page" from your config file
+	 *
+	 * @param  App|null $altConfig Alternate configuration to use
+	 * @return string
+	 */
+	function index_page(App $altConfig = null): string
+	{
+		// use alternate config if provided, else default one
+		$config = $altConfig ?? config(App::class);
+
+		return $config->indexPage;
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('anchor'))
+{
+	/**
+	 * Anchor Link
+	 *
+	 * Creates an anchor based on the local URL.
+	 *
+	 * @param mixed    $uri        URI string or array of URI segments
+	 * @param string   $title      The link title
+	 * @param mixed    $attributes Any attributes
+	 * @param App|null $altConfig  Alternate configuration to use
+	 *
+	 * @return string
+	 */
+	function anchor($uri = '', string $title = '', $attributes = '', App $altConfig = null): string
+	{
+		// use alternate config if provided, else default one
+		$config = $altConfig ?? config(App::class);
+
+		$siteUrl = is_array($uri) ? site_url($uri, null, $config) : (preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config));
+		// eliminate trailing slash
+		$siteUrl = rtrim($siteUrl, '/');
+
+		if ($title === '')
+		{
+			$title = $siteUrl;
+		}
+
+		if ($attributes !== '')
+		{
+			$attributes = stringify_attributes($attributes);
+		}
+
+		return '<a href="' . $siteUrl . '"' . $attributes . '>' . $title . '</a>';
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('anchor_popup'))
+{
+	/**
+	 * Anchor Link - Pop-up version
+	 *
+	 * Creates an anchor based on the local URL. The link
+	 * opens a new window based on the attributes specified.
+	 *
+	 * @param string   $uri        the URL
+	 * @param string   $title      the link title
+	 * @param mixed    $attributes any attributes
+	 * @param App|null $altConfig  Alternate configuration to use
+	 *
+	 * @return string
+	 */
+	function anchor_popup($uri = '', string $title = '', $attributes = false, App $altConfig = null): string
+	{
+		// use alternate config if provided, else default one
+		$config = $altConfig ?? config(App::class);
+
+		$siteUrl = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config);
+		$siteUrl = rtrim($siteUrl, '/');
+
+		if ($title === '')
+		{
+			$title = $siteUrl;
+		}
+
+		if ($attributes === false)
+		{
+			return '<a href="' . $siteUrl . '" onclick="window.open(\'' . $siteUrl . "', '_blank'); return false;\">" . $title . '</a>';
+		}
+
+		if (! is_array($attributes))
+		{
+			$attributes = [$attributes];
+
+			// Ref: http://www.w3schools.com/jsref/met_win_open.asp
+			$windowName = '_blank';
+		}
+		elseif (! empty($attributes['window_name']))
+		{
+			$windowName = $attributes['window_name'];
+			unset($attributes['window_name']);
+		}
+		else
+		{
+			$windowName = '_blank';
+		}
+
+		foreach (['width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'menubar' => 'no', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0'] as $key => $val)
+		{
+			$atts[$key] = $attributes[$key] ?? $val;
+			unset($attributes[$key]);
+		}
+
+		$attributes = stringify_attributes($attributes);
+
+		return '<a href="' . $siteUrl
+				. '" onclick="window.open(\'' . $siteUrl . "', '" . $windowName . "', '" . stringify_attributes($atts, true) . "'); return false;\""
+				. $attributes . '>' . $title . '</a>';
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('mailto'))
+{
+	/**
+	 * Mailto Link
+	 *
+	 * @param string $email      the email address
+	 * @param string $title      the link title
+	 * @param mixed  $attributes any attributes
+	 *
+	 * @return string
+	 */
+	function mailto(string $email, string $title = '', $attributes = ''): string
+	{
+		if (trim($title) === '')
+		{
+			$title = $email;
+		}
+
+		return '<a href="mailto:' . $email . '"' . stringify_attributes($attributes) . '>' . $title . '</a>';
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('safe_mailto'))
+{
+	/**
+	 * Encoded Mailto Link
+	 *
+	 * Create a spam-protected mailto link written in Javascript
+	 *
+	 * @param string $email      the email address
+	 * @param string $title      the link title
+	 * @param mixed  $attributes any attributes
+	 *
+	 * @return string
+	 */
+	function safe_mailto(string $email, string $title = '', $attributes = ''): string
+	{
+		if (trim($title) === '')
+		{
+			$title = $email;
+		}
+
+		$x = str_split('<a href="mailto:', 1);
+
+		for ($i = 0, $l = strlen($email); $i < $l; $i ++)
+		{
+			$x[] = '|' . ord($email[$i]);
+		}
+
+		$x[] = '"';
+
+		if ($attributes !== '')
+		{
+			if (is_array($attributes))
+			{
+				foreach ($attributes as $key => $val)
+				{
+					$x[] = ' ' . $key . '="';
+					for ($i = 0, $l = strlen($val); $i < $l; $i ++)
+					{
+						$x[] = '|' . ord($val[$i]);
+					}
+					$x[] = '"';
+				}
+			}
+			else
+			{
+				for ($i = 0, $l = mb_strlen($attributes); $i < $l; $i ++)
+				{
+					$x[] = mb_substr($attributes, $i, 1);
+				}
+			}
+		}
+
+		$x[] = '>';
+
+		$temp = [];
+		for ($i = 0, $l = strlen($title); $i < $l; $i ++)
+		{
+			$ordinal = ord($title[$i]);
+
+			if ($ordinal < 128)
+			{
+				$x[] = '|' . $ordinal;
+			}
+			else
+			{
+				if (empty($temp))
+				{
+					$count = ($ordinal < 224) ? 2 : 3;
+				}
+
+				$temp[] = $ordinal;
+				if (count($temp) === $count) // @phpstan-ignore-line
+				{
+					$number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
+					$x[]    = '|' . $number;
+					$count  = 1;
+					$temp   = [];
+				}
+			}
+		}
+
+		$x[] = '<';
+		$x[] = '/';
+		$x[] = 'a';
+		$x[] = '>';
+
+		$x = array_reverse($x);
+
+		// improve obfuscation by eliminating newlines & whitespace
+		$output = '<script type="text/javascript">'
+				. 'var l=new Array();';
+
+		foreach ($x as $i => $value)
+		{
+			$output .= 'l[' . $i . "] = '" . $value . "';";
+		}
+
+		return $output . ('for (var i = l.length-1; i >= 0; i=i-1) {'
+				. "if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");"
+				. 'else document.write(unescape(l[i]));'
+				. '}'
+				. '</script>');
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('auto_link'))
+{
+	/**
+	 * Auto-linker
+	 *
+	 * Automatically links URL and Email addresses.
+	 * Note: There's a bit of extra code here to deal with
+	 * URLs or emails that end in a period. We'll strip these
+	 * off and add them after the link.
+	 *
+	 * @param string  $str   the string
+	 * @param string  $type  the type: email, url, or both
+	 * @param boolean $popup whether to create pop-up links
+	 *
+	 * @return string
+	 */
+	function auto_link(string $str, string $type = 'both', bool $popup = false): string
+	{
+		// Find and replace any URLs.
+		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
+		{
+			// Set our target HTML if using popup links.
+			$target = ($popup) ? ' target="_blank"' : '';
+
+			// We process the links in reverse order (last -> first) so that
+			// the returned string offsets from preg_match_all() are not
+			// moved as we add more HTML.
+			foreach (array_reverse($matches) as $match)
+			{
+				// $match[0] is the matched string/link
+				// $match[1] is either a protocol prefix or 'www.'
+				//
+				// With PREG_OFFSET_CAPTURE, both of the above is an array,
+				// where the actual value is held in [0] and its offset at the [1] index.
+				$a   = '<a href="' . (strpos($match[1][0], '/') ? '' : 'http://') . $match[0][0] . '"' . $target . '>' . $match[0][0] . '</a>';
+				$str = substr_replace($str, $a, $match[0][1], strlen($match[0][0]));
+			}
+		}
+
+		// Find and replace any emails.
+		if ($type !== 'url' && preg_match_all('#([\w\.\-\+]+@[a-z0-9\-]+\.[a-z0-9\-\.]+[^[:punct:]\s])#i', $str, $matches, PREG_OFFSET_CAPTURE))
+		{
+			foreach (array_reverse($matches[0]) as $match)
+			{
+				if (filter_var($match[0], FILTER_VALIDATE_EMAIL) !== false)
+				{
+					$str = substr_replace($str, safe_mailto($match[0]), $match[1], strlen($match[0]));
+				}
+			}
+		}
+
+		return $str;
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('prep_url'))
+{
+	/**
+	 * Prep URL - Simply adds the http:// or https:// part if no scheme is included.
+	 *
+	 * Formerly used URI, but that does not play nicely with URIs missing
+	 * the scheme.
+	 *
+	 * @param  string  $str    the URL
+	 * @param  boolean $secure set true if you want to force https://
+	 * @return string
+	 */
+	function prep_url(string $str = '', bool $secure = false): string
+	{
+		if (in_array($str, ['http://', 'https://', '//', ''], true))
+		{
+			return '';
+		}
+
+		if (parse_url($str, PHP_URL_SCHEME) === null)
+		{
+			$str = 'http://' . ltrim($str, '/');
+		}
+
+		// force replace http:// with https://
+		if ($secure)
+		{
+			$str = preg_replace('/^(?:http):/i', 'https:', $str);
+		}
+
+		return $str;
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('url_title'))
+{
+	/**
+	 * Create URL Title
+	 *
+	 * Takes a "title" string as input and creates a
+	 * human-friendly URL string with a "separator" string
+	 * as the word separator.
+	 *
+	 * @param  string  $str       Input string
+	 * @param  string  $separator Word separator (usually '-' or '_')
+	 * @param  boolean $lowercase Whether to transform the output string to lowercase
+	 * @return string
+	 */
+	function url_title(string $str, string $separator = '-', bool $lowercase = false): string
+	{
+		$qSeparator = preg_quote($separator, '#');
+
+		$trans = [
+			'&.+?;'                  => '',
+			'[^\w\d\pL\pM _-]'       => '',
+			'\s+'                    => $separator,
+			'(' . $qSeparator . ')+' => $separator,
+		];
+
+		$str = strip_tags($str);
+		foreach ($trans as $key => $val)
+		{
+			$str = preg_replace('#' . $key . '#iu', $val, $str);
+		}
+
+		if ($lowercase === true)
+		{
+			$str = mb_strtolower($str);
+		}
+
+		return trim(trim($str, $separator));
+	}
+}
+
+// ------------------------------------------------------------------------
+
+if (! function_exists('mb_url_title'))
+{
+	/**
+	 * Create URL Title that takes into account accented characters
+	 *
+	 * Takes a "title" string as input and creates a
+	 * human-friendly URL string with a "separator" string
+	 * as the word separator.
+	 *
+	 * @param  string  $str       Input string
+	 * @param  string  $separator Word separator (usually '-' or '_')
+	 * @param  boolean $lowercase Whether to transform the output string to lowercase
+	 * @return string
+	 */
+	function mb_url_title(string $str, string $separator = '-', bool $lowercase = false): string
+	{
+		helper('text');
+
+		return url_title(convert_accented_characters($str), $separator, $lowercase);
+	}
+}
+
+//--------------------------------------------------------------------
+
+if (! function_exists('url_to'))
+{
+	/**
+	 * Get the full, absolute URL to a controller method
+	 * (with additional arguments)
+	 *
+	 * @param string $controller
+	 * @param mixed  ...$args
+	 *
+	 * @throws RouterException
+	 *
+	 * @return string
+	 */
+	function url_to(string $controller, ...$args): string
+	{
+		if (! $route = route_to($controller, ...$args))
+		{
+			$explode = explode('::', $controller);
+
+			if (isset($explode[1]))
+			{
+				throw RouterException::forControllerNotFound($explode[0], $explode[1]);
+			}
+
+			throw RouterException::forInvalidRoute($controller);
+		}
+
+		return site_url($route);
+	}
+}
+
+if (! function_exists('url_is'))
+{
+	/**
+	 * Determines if current url path contains
+	 * the given path. It may contain a wildcard (*)
+	 * which will allow any valid character.
+	 *
+	 * Example:
+	 *   if (url_is('admin*)) ...
+	 *
+	 * @param string $path
+	 *
+	 * @return boolean
+	 */
+	function url_is(string $path): bool
+	{
+		// Setup our regex to allow wildcards
+		$path        = '/' . trim(str_replace('*', '(\S)*', $path), '/ ');
+		$currentPath = '/' . trim(uri_string(true), '/ ');
+
+		return (bool) preg_match("|^{$path}$|", $currentPath, $matches);
+	}
+}
diff --git a/system/Helpers/xml_helper.php b/system/Helpers/xml_helper.php
new file mode 100644
index 0000000..4f42bb3
--- /dev/null
+++ b/system/Helpers/xml_helper.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * CodeIgniter XML Helpers
+ */
+
+if (! function_exists('xml_convert'))
+{
+	/**
+	 * Convert Reserved XML characters to Entities
+	 *
+	 * @param  string  $str
+	 * @param  boolean $protectAll
+	 * @return string
+	 */
+	function xml_convert(string $str, bool $protectAll = false): string
+	{
+		$temp = '__TEMP_AMPERSANDS__';
+
+		// Replace entities to temporary markers so that
+		// ampersands won't get messed up
+		$str = preg_replace('/&#(\d+);/', $temp . '\\1;', $str);
+
+		if ($protectAll === true)
+		{
+			$str = preg_replace('/&(\w+);/', $temp . '\\1;', $str);
+		}
+
+		$original = [
+			'&',
+			'<',
+			'>',
+			'"',
+			"'",
+			'-',
+		];
+
+		$replacement = [
+			'&amp;',
+			'&lt;',
+			'&gt;',
+			'&quot;',
+			'&apos;',
+			'&#45;',
+		];
+
+		$str = str_replace($original, $replacement, $str);
+
+		// Decode the temp markers back to entities
+		$str = preg_replace('/' . $temp . '(\d+);/', '&#\\1;', $str);
+
+		if ($protectAll === true)
+		{
+			return preg_replace('/' . $temp . '(\w+);/', '&\\1;', $str);
+		}
+
+		return $str;
+	}
+}
diff --git a/system/Honeypot/Exceptions/HoneypotException.php b/system/Honeypot/Exceptions/HoneypotException.php
new file mode 100644
index 0000000..6e63690
--- /dev/null
+++ b/system/Honeypot/Exceptions/HoneypotException.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Honeypot\Exceptions;
+
+use CodeIgniter\Exceptions\ConfigException;
+use CodeIgniter\Exceptions\ExceptionInterface;
+
+class HoneypotException extends ConfigException implements ExceptionInterface
+{
+	public static function forNoTemplate()
+	{
+		return new static(lang('Honeypot.noTemplate'));
+	}
+
+	public static function forNoNameField()
+	{
+		return new static(lang('Honeypot.noNameField'));
+	}
+
+	public static function forNoHiddenValue()
+	{
+		return new static(lang('Honeypot.noHiddenValue'));
+	}
+
+	public static function isBot()
+	{
+		return new static(lang('Honeypot.theClientIsABot'));
+	}
+}
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
new file mode 100644
index 0000000..bc0068a
--- /dev/null
+++ b/system/Honeypot/Honeypot.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Honeypot;
+
+use CodeIgniter\Honeypot\Exceptions\HoneypotException;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Honeypot as HoneypotConfig;
+
+/**
+ * class Honeypot
+ */
+class Honeypot
+{
+	/**
+	 * Our configuration.
+	 *
+	 * @var HoneypotConfig
+	 */
+	protected $config;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param  HoneypotConfig $config
+	 * @throws HoneypotException
+	 */
+	public function __construct(HoneypotConfig $config)
+	{
+		$this->config = $config;
+
+		if (! $this->config->hidden)
+		{
+			throw HoneypotException::forNoHiddenValue();
+		}
+
+		if (empty($this->config->container) || strpos($this->config->container, '{template}') === false)
+		{
+			$this->config->container = '<div style="display:none">{template}</div>';
+		}
+
+		if ($this->config->template === '')
+		{
+			throw HoneypotException::forNoTemplate();
+		}
+
+		if ($this->config->name === '')
+		{
+			throw HoneypotException::forNoNameField();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the request if honeypot field has data.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function hasContent(RequestInterface $request)
+	{
+		return ! empty($request->getPost($this->config->name));
+	}
+
+	/**
+	 * Attaches Honeypot template to response.
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public function attachHoneypot(ResponseInterface $response)
+	{
+		$prepField = $this->prepareTemplate($this->config->template);
+
+		$body = $response->getBody();
+		$body = str_ireplace('</form>', $prepField . '</form>', $body);
+		$response->setBody($body);
+	}
+
+	/**
+	 * Prepares the template by adding label
+	 * content and field name.
+	 *
+	 * @param  string $template
+	 * @return string
+	 */
+	protected function prepareTemplate(string $template): string
+	{
+		$template = str_ireplace('{label}', $this->config->label, $template);
+		$template = str_ireplace('{name}', $this->config->name, $template);
+
+		if ($this->config->hidden)
+		{
+			$template = str_ireplace('{template}', $template, $this->config->container);
+		}
+
+		return $template;
+	}
+}
diff --git a/system/I18n/Exceptions/I18nException.php b/system/I18n/Exceptions/I18nException.php
new file mode 100644
index 0000000..8ccaf8b
--- /dev/null
+++ b/system/I18n/Exceptions/I18nException.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\I18n\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+/**
+ * I18nException
+ */
+class I18nException extends FrameworkException
+{
+	/**
+	 * Thrown when createFromFormat fails to receive a valid
+	 * DateTime back from DateTime::createFromFormat.
+	 *
+	 * @param string $format
+	 *
+	 * @return static
+	 */
+	public static function forInvalidFormat(string $format)
+	{
+		return new static(lang('Time.invalidFormat', [$format]));
+	}
+
+	/**
+	 * Thrown when the numeric representation of the month falls
+	 * outside the range of allowed months.
+	 *
+	 * @param string $month
+	 *
+	 * @return static
+	 */
+	public static function forInvalidMonth(string $month)
+	{
+		return new static(lang('Time.invalidMonth', [$month]));
+	}
+
+	/**
+	 * Thrown when the supplied day falls outside the range
+	 * of allowed days.
+	 *
+	 * @param string $day
+	 *
+	 * @return static
+	 */
+	public static function forInvalidDay(string $day)
+	{
+		return new static(lang('Time.invalidDay', [$day]));
+	}
+
+	/**
+	 * Thrown when the day provided falls outside the allowed
+	 * last day for the given month.
+	 *
+	 * @param string $lastDay
+	 * @param string $day
+	 *
+	 * @return static
+	 */
+	public static function forInvalidOverDay(string $lastDay, string $day)
+	{
+		return new static(lang('Time.invalidOverDay', [$lastDay, $day]));
+	}
+
+	/**
+	 * Thrown when the supplied hour falls outside the
+	 * range of allowed hours.
+	 *
+	 * @param string $hour
+	 *
+	 * @return static
+	 */
+	public static function forInvalidHour(string $hour)
+	{
+		return new static(lang('Time.invalidHour', [$hour]));
+	}
+
+	/**
+	 * Thrown when the supplied minutes falls outside the
+	 * range of allowed minutes.
+	 *
+	 * @param string $minutes
+	 *
+	 * @return static
+	 */
+	public static function forInvalidMinutes(string $minutes)
+	{
+		return new static(lang('Time.invalidMinutes', [$minutes]));
+	}
+
+	/**
+	 * Thrown when the supplied seconds falls outside the
+	 * range of allowed seconds.
+	 *
+	 * @param string $seconds
+	 *
+	 * @return static
+	 */
+	public static function forInvalidSeconds(string $seconds)
+	{
+		return new static(lang('Time.invalidSeconds', [$seconds]));
+	}
+}
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
new file mode 100644
index 0000000..c50f8f4
--- /dev/null
+++ b/system/I18n/Time.php
@@ -0,0 +1,1382 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\I18n;
+
+use CodeIgniter\I18n\Exceptions\I18nException;
+use DateInterval;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use DateTimeZone;
+use Exception;
+use IntlCalendar;
+use IntlDateFormatter;
+use Locale;
+
+/**
+ * Class Time
+ *
+ * A localized date/time package inspired
+ * by Nesbot/Carbon and CakePHP/Chronos.
+ *
+ * Requires the intl PHP extension.
+ *
+ * @property string $date
+ */
+class Time extends DateTime
+{
+	/**
+	 * @var DateTimeZone
+	 */
+	protected $timezone;
+
+	/**
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
+	 * Format to use when displaying datetime through __toString
+	 *
+	 * @var string
+	 */
+	protected $toStringFormat = 'yyyy-MM-dd HH:mm:ss';
+
+	/**
+	 * Used to check time string to determine if it is relative time or not....
+	 *
+	 * @var string
+	 */
+	protected static $relativePattern = '/this|next|last|tomorrow|yesterday|midnight|today|[+-]|first|last|ago/i';
+
+	/**
+	 * @var static|DateTimeInterface|null
+	 */
+	protected static $testNow;
+
+	//--------------------------------------------------------------------
+	// Constructors
+	//--------------------------------------------------------------------
+
+	/**
+	 * Time constructor.
+	 *
+	 * @param string|null              $time
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @throws Exception
+	 */
+	public function __construct(string $time = null, $timezone = null, string $locale = null)
+	{
+		// If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
+		$this->locale = ! empty($locale) ? $locale : Locale::getDefault();
+
+		// If a test instance has been provided, use it instead.
+		if (is_null($time) && static::$testNow instanceof Time)
+		{
+			if (empty($timezone))
+			{
+				$timezone = static::$testNow->getTimezone();
+			}
+
+			$time = static::$testNow->toDateTimeString();
+		}
+
+		$timezone       = ! empty($timezone) ? $timezone : date_default_timezone_get();
+		$this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+
+		// If the time string was a relative string (i.e. 'next Tuesday')
+		// then we need to adjust the time going in so that we have a current
+		// timezone to work with.
+		if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time)))
+		{
+			$instance = new DateTime('now', $this->timezone);
+			$instance->modify($time);
+			$time = $instance->format('Y-m-d H:i:s');
+		}
+
+		parent::__construct($time, $this->timezone);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new Time instance with the timezone set.
+	 *
+	 * @param string|DateTimeZone|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function now($timezone = null, string $locale = null)
+	{
+		return new Time(null, $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new Time instance while parsing a datetime string.
+	 *
+	 * Example:
+	 *  $time = Time::parse('first day of December 2008');
+	 *
+	 * @param string                   $datetime
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function parse(string $datetime, $timezone = null, string $locale = null)
+	{
+		return new Time($datetime, $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return a new time with the time set to midnight.
+	 *
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function today($timezone = null, string $locale = null)
+	{
+		return new Time(date('Y-m-d 00:00:00'), $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an instance set to midnight yesterday morning.
+	 *
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function yesterday($timezone = null, string $locale = null)
+	{
+		return new Time(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an instance set to midnight tomorrow morning.
+	 *
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function tomorrow($timezone = null, string $locale = null)
+	{
+		return new Time(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new instance based on the year, month and day. If any of those three
+	 * are left empty, will default to the current value.
+	 *
+	 * @param integer|null             $year
+	 * @param integer|null             $month
+	 * @param integer|null             $day
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function createFromDate(int $year = null, int $month = null, int $day = null, $timezone = null, string $locale = null)
+	{
+		return static::create($year, $month, $day, null, null, null, $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new instance with the date set to today, and the time set to the values passed in.
+	 *
+	 * @param integer|null             $hour
+	 * @param integer|null             $minutes
+	 * @param integer|null             $seconds
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function createFromTime(int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
+	{
+		return static::create(null, null, null, $hour, $minutes, $seconds, $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new instance with the date time values individually set.
+	 *
+	 * @param integer|null             $year
+	 * @param integer|null             $month
+	 * @param integer|null             $day
+	 * @param integer|null             $hour
+	 * @param integer|null             $minutes
+	 * @param integer|null             $seconds
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function create(int $year = null, int $month = null, int $day = null, int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
+	{
+		$year    = is_null($year) ? date('Y') : $year;
+		$month   = is_null($month) ? date('m') : $month;
+		$day     = is_null($day) ? date('d') : $day;
+		$hour    = empty($hour) ? 0 : $hour;
+		$minutes = empty($minutes) ? 0 : $minutes;
+		$seconds = empty($seconds) ? 0 : $seconds;
+
+		return new Time(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a replacement for DateTime's own createFromFormat function, that provides
+	 * more flexible timeZone handling
+	 *
+	 * @param string                   $format
+	 * @param string                   $datetime
+	 * @param DateTimeZone|string|null $timeZone
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function createFromFormat($format, $datetime, $timeZone = null)
+	{
+		if (! $date = parent::createFromFormat($format, $datetime))
+		{
+			throw I18nException::forInvalidFormat($format);
+		}
+
+		return new Time($date->format('Y-m-d H:i:s'), $timeZone);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new instance with the datetime set based on the provided UNIX timestamp.
+	 *
+	 * @param integer                  $timestamp
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function createFromTimestamp(int $timestamp, $timezone = null, string $locale = null)
+	{
+		return new Time(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes an instance of DateTimeInterface and returns an instance of Time with it's same values.
+	 *
+	 * @param DateTimeInterface $dateTime
+	 * @param string|null       $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public static function createFromInstance(DateTimeInterface $dateTime, string $locale = null)
+	{
+		$date     = $dateTime->format('Y-m-d H:i:s');
+		$timezone = $dateTime->getTimezone();
+
+		return new Time($date, $timezone, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes an instance of DateTime and returns an instance of Time with it's same values.
+	 *
+	 * @param DateTime    $dateTime
+	 * @param string|null $locale
+	 *
+	 * @return Time
+	 * @throws Exception
+	 *
+	 * @deprecated         Use createFromInstance() instead
+	 * @codeCoverageIgnore
+	 */
+	public static function instance(DateTime $dateTime, string $locale = null)
+	{
+		return self::createFromInstance($dateTime, $locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Converts the current instance to a mutable DateTime object.
+	 *
+	 * @return DateTime
+	 * @throws Exception
+	 */
+	public function toDateTime()
+	{
+		$dateTime = new DateTime('', $this->getTimezone());
+		$dateTime->setTimestamp(parent::getTimestamp());
+
+		return $dateTime;
+	}
+
+	//--------------------------------------------------------------------
+	// For Testing
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an instance of Time that will be returned during testing
+	 * when calling 'Time::now' instead of the current time.
+	 *
+	 * @param Time|DateTimeInterface|string|null $datetime
+	 * @param DateTimeZone|string|null           $timezone
+	 * @param string|null                        $locale
+	 *
+	 * @throws Exception
+	 */
+	public static function setTestNow($datetime = null, $timezone = null, string $locale = null)
+	{
+		// Reset the test instance
+		if (is_null($datetime))
+		{
+			static::$testNow = null;
+			return;
+		}
+
+		// Convert to a Time instance
+		if (is_string($datetime))
+		{
+			$datetime = new Time($datetime, $timezone, $locale);
+		}
+		elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof Time)
+		{
+			$datetime = new Time($datetime->format('Y-m-d H:i:s'), $timezone);
+		}
+
+		static::$testNow = $datetime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether we have a testNow instance saved.
+	 *
+	 * @return boolean
+	 */
+	public static function hasTestNow(): bool
+	{
+		return ! is_null(static::$testNow);
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Getters
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the localized Year
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getYear(): string
+	{
+		return $this->toLocalizedString('y');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the localized Month
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getMonth(): string
+	{
+		return $this->toLocalizedString('M');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the localized day of the month.
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getDay(): string
+	{
+		return $this->toLocalizedString('d');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the localized hour (in 24-hour format).
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getHour(): string
+	{
+		return $this->toLocalizedString('H');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the localized minutes in the hour.
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getMinute(): string
+	{
+		return $this->toLocalizedString('m');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the localized seconds
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getSecond(): string
+	{
+		return $this->toLocalizedString('s');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the index of the day of the week
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getDayOfWeek(): string
+	{
+		return $this->toLocalizedString('c');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the index of the day of the year
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getDayOfYear(): string
+	{
+		return $this->toLocalizedString('D');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the index of the week in the month
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getWeekOfMonth(): string
+	{
+		return $this->toLocalizedString('W');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the index of the week in the year
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getWeekOfYear(): string
+	{
+		return $this->toLocalizedString('w');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the age in years from the "current" date and 'now'
+	 *
+	 * @return integer
+	 * @throws Exception
+	 */
+	public function getAge()
+	{
+		$now  = Time::now()->getTimestamp();
+		$time = $this->getTimestamp();
+
+		// future dates have no age
+		return max(0, date('Y', $now) - date('Y', $time));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of the current quarter for the year.
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getQuarter(): string
+	{
+		return $this->toLocalizedString('Q');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Are we in daylight savings time currently?
+	 *
+	 * @return boolean
+	 */
+	public function getDst(): bool
+	{
+		// grab the transactions that would affect today
+		$start       = strtotime('-1 year', $this->getTimestamp());
+		$end         = strtotime('+2 year', $start);
+		$transitions = $this->timezone->getTransitions($start, $end);
+
+		$daylightSaving = false;
+		foreach ($transitions as $transition)
+		{
+			if ($transition['time'] > $this->format('U'))
+			{
+				$daylightSaving = (bool) $transition['isdst'] ?? $daylightSaving;
+				break;
+			}
+		}
+		return $daylightSaving;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns boolean whether the passed timezone is the same as
+	 * the local timezone.
+	 *
+	 * @return boolean
+	 */
+	public function getLocal(): bool
+	{
+		$local = date_default_timezone_get();
+
+		return $local === $this->timezone->getName();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns boolean whether object is in UTC.
+	 *
+	 * @return boolean
+	 */
+	public function getUtc(): bool
+	{
+		return $this->getOffset() === 0;
+	}
+
+	/**
+	 * Returns the name of the current timezone.
+	 *
+	 * @return string
+	 */
+	public function getTimezoneName(): string
+	{
+		return $this->timezone->getName();
+	}
+
+	//--------------------------------------------------------------------
+	// Setters
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current year for this instance.
+	 *
+	 * @param integer|string $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setYear($value)
+	{
+		return $this->setValue('year', $value);
+	}
+
+	/**
+	 * Sets the month of the year.
+	 *
+	 * @param integer|string $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setMonth($value)
+	{
+		if (is_numeric($value) && ($value < 1 || $value > 12))
+		{
+			throw I18nException::forInvalidMonth($value);
+		}
+
+		if (is_string($value) && ! is_numeric($value))
+		{
+			$value = date('m', strtotime("{$value} 1 2017"));
+		}
+
+		return $this->setValue('month', $value);
+	}
+
+	/**
+	 * Sets the day of the month.
+	 *
+	 * @param integer|string $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setDay($value)
+	{
+		if ($value < 1 || $value > 31)
+		{
+			throw I18nException::forInvalidDay($value);
+		}
+
+		$date    = $this->getYear() . '-' . $this->getMonth();
+		$lastDay = date('t', strtotime($date));
+		if ($value > $lastDay)
+		{
+			throw I18nException::forInvalidOverDay($lastDay, $value);
+		}
+
+		return $this->setValue('day', $value);
+	}
+
+	/**
+	 * Sets the hour of the day (24 hour cycle)
+	 *
+	 * @param integer|string $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setHour($value)
+	{
+		if ($value < 0 || $value > 23)
+		{
+			throw I18nException::forInvalidHour($value);
+		}
+
+		return $this->setValue('hour', $value);
+	}
+
+	/**
+	 * Sets the minute of the hour
+	 *
+	 * @param integer|string $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setMinute($value)
+	{
+		if ($value < 0 || $value > 59)
+		{
+			throw I18nException::forInvalidMinutes($value);
+		}
+
+		return $this->setValue('minute', $value);
+	}
+
+	/**
+	 * Sets the second of the minute.
+	 *
+	 * @param integer|string $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setSecond($value)
+	{
+		if ($value < 0 || $value > 59)
+		{
+			throw I18nException::forInvalidSeconds($value);
+		}
+
+		return $this->setValue('second', $value);
+	}
+
+	/**
+	 * Helper method to do the heavy lifting of the 'setX' methods.
+	 *
+	 * @param string  $name
+	 * @param integer $value
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	protected function setValue(string $name, $value)
+	{
+		[$year, $month, $day, $hour, $minute, $second] = explode('-', $this->format('Y-n-j-G-i-s'));
+		$$name                                             = $value;
+
+		return Time::create(
+			(int) $year,
+			(int) $month,
+			(int) $day,
+			(int) $hour,
+			(int) $minute,
+			(int) $second,
+			$this->getTimezoneName(),
+			$this->locale
+		);
+	}
+
+	/**
+	 * Returns a new instance with the revised timezone.
+	 *
+	 * @param string|DateTimeZone $timezone
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setTimezone($timezone)
+	{
+		$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+		return Time::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
+	}
+
+	/**
+	 * Returns a new instance with the date set to the new timestamp.
+	 *
+	 * @param integer $timestamp
+	 *
+	 * @return Time
+	 * @throws Exception
+	 */
+	public function setTimestamp($timestamp)
+	{
+		$time = date('Y-m-d H:i:s', $timestamp);
+
+		return Time::parse($time, $this->timezone, $this->locale);
+	}
+
+	//--------------------------------------------------------------------
+	// Add/Subtract
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new Time instance with $seconds added to the time.
+	 *
+	 * @param integer $seconds
+	 *
+	 * @return static
+	 */
+	public function addSeconds(int $seconds)
+	{
+		$time = clone($this);
+
+		return $time->add(DateInterval::createFromDateString("{$seconds} seconds"));
+	}
+
+	/**
+	 * Returns a new Time instance with $minutes added to the time.
+	 *
+	 * @param integer $minutes
+	 *
+	 * @return static
+	 */
+	public function addMinutes(int $minutes)
+	{
+		$time = clone($this);
+
+		return $time->add(DateInterval::createFromDateString("{$minutes} minutes"));
+	}
+
+	/**
+	 * Returns a new Time instance with $hours added to the time.
+	 *
+	 * @param integer $hours
+	 *
+	 * @return static
+	 */
+	public function addHours(int $hours)
+	{
+		$time = clone($this);
+
+		return $time->add(DateInterval::createFromDateString("{$hours} hours"));
+	}
+
+	/**
+	 * Returns a new Time instance with $days added to the time.
+	 *
+	 * @param integer $days
+	 *
+	 * @return static
+	 */
+	public function addDays(int $days)
+	{
+		$time = clone($this);
+
+		return $time->add(DateInterval::createFromDateString("{$days} days"));
+	}
+
+	/**
+	 * Returns a new Time instance with $months added to the time.
+	 *
+	 * @param integer $months
+	 *
+	 * @return static
+	 */
+	public function addMonths(int $months)
+	{
+		$time = clone($this);
+
+		return $time->add(DateInterval::createFromDateString("{$months} months"));
+	}
+
+	/**
+	 * Returns a new Time instance with $years added to the time.
+	 *
+	 * @param integer $years
+	 *
+	 * @return static
+	 */
+	public function addYears(int $years)
+	{
+		$time = clone($this);
+
+		return $time->add(DateInterval::createFromDateString("{$years} years"));
+	}
+
+	/**
+	 * Returns a new Time instance with $seconds subtracted from the time.
+	 *
+	 * @param integer $seconds
+	 *
+	 * @return static
+	 */
+	public function subSeconds(int $seconds)
+	{
+		$time = clone($this);
+
+		return $time->sub(DateInterval::createFromDateString("{$seconds} seconds"));
+	}
+
+	/**
+	 * Returns a new Time instance with $minutes subtracted from the time.
+	 *
+	 * @param integer $minutes
+	 *
+	 * @return static
+	 */
+	public function subMinutes(int $minutes)
+	{
+		$time = clone($this);
+
+		return $time->sub(DateInterval::createFromDateString("{$minutes} minutes"));
+	}
+
+	/**
+	 * Returns a new Time instance with $hours subtracted from the time.
+	 *
+	 * @param integer $hours
+	 *
+	 * @return static
+	 */
+	public function subHours(int $hours)
+	{
+		$time = clone($this);
+
+		return $time->sub(DateInterval::createFromDateString("{$hours} hours"));
+	}
+
+	/**
+	 * Returns a new Time instance with $days subtracted from the time.
+	 *
+	 * @param integer $days
+	 *
+	 * @return static
+	 */
+	public function subDays(int $days)
+	{
+		$time = clone($this);
+
+		return $time->sub(DateInterval::createFromDateString("{$days} days"));
+	}
+
+	/**
+	 * Returns a new Time instance with $months subtracted from the time.
+	 *
+	 * @param integer $months
+	 *
+	 * @return static
+	 */
+	public function subMonths(int $months)
+	{
+		$time = clone($this);
+
+		return $time->sub(DateInterval::createFromDateString("{$months} months"));
+	}
+
+	/**
+	 * Returns a new Time instance with $hours subtracted from the time.
+	 *
+	 * @param integer $years
+	 *
+	 * @return static
+	 */
+	public function subYears(int $years)
+	{
+		$time = clone($this);
+
+		return $time->sub(DateInterval::createFromDateString("{$years} years"));
+	}
+
+	//--------------------------------------------------------------------
+	// Formatters
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the localized value of the date in the format 'Y-m-d H:i:s'
+	 *
+	 * @throws Exception
+	 */
+	public function toDateTimeString()
+	{
+		return $this->toLocalizedString('yyyy-MM-dd HH:mm:ss');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a localized version of the date in Y-m-d format.
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function toDateString()
+	{
+		return $this->toLocalizedString('yyyy-MM-dd');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a localized version of the date in nicer date format:
+	 *
+	 *  i.e. Apr 1, 2017
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function toFormattedDateString()
+	{
+		return $this->toLocalizedString('MMM d, yyyy');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a localized version of the time in nicer date format:
+	 *
+	 *  i.e. 13:20:33
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function toTimeString()
+	{
+		return $this->toLocalizedString('HH:mm:ss');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the localized value of this instance in $format.
+	 *
+	 * @param string|null $format
+	 *
+	 * @return string|boolean
+	 * @throws Exception
+	 */
+	public function toLocalizedString(string $format = null)
+	{
+		$format = $format ?? $this->toStringFormat;
+
+		return IntlDateFormatter::formatObject($this->toDateTime(), $format, $this->locale);
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Comparison
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the datetime passed in is equal to the current instance.
+	 * Equal in this case means that they represent the same moment in time,
+	 * and are not required to be in the same timezone, as both times are
+	 * converted to UTC and compared that way.
+	 *
+	 * @param Time|DateTimeInterface|string $testTime
+	 * @param string|null                   $timezone
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function equals($testTime, string $timezone = null): bool
+	{
+		$testTime = $this->getUTCObject($testTime, $timezone);
+
+		$ourTime = $this->toDateTime()
+				->setTimezone(new DateTimeZone('UTC'))
+				->format('Y-m-d H:i:s');
+
+		return $testTime->format('Y-m-d H:i:s') === $ourTime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures that the times are identical, taking timezone into account.
+	 *
+	 * @param Time|DateTimeInterface|string $testTime
+	 * @param string|null                   $timezone
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function sameAs($testTime, string $timezone = null): bool
+	{
+		if ($testTime instanceof DateTimeInterface)
+		{
+			$testTime = $testTime->format('Y-m-d H:i:s');
+		}
+		elseif (is_string($testTime))
+		{
+			$timezone = $timezone ?: $this->timezone;
+			$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+			$testTime = new DateTime($testTime, $timezone);
+			$testTime = $testTime->format('Y-m-d H:i:s');
+		}
+
+		$ourTime = $this->toDateTimeString();
+
+		return $testTime === $ourTime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the current instance's time is before $testTime,
+	 * after converting to UTC.
+	 *
+	 * @param mixed       $testTime
+	 * @param string|null $timezone
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function isBefore($testTime, string $timezone = null): bool
+	{
+		$testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
+		$ourTime  = $this->getTimestamp();
+
+		return $ourTime < $testTime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the current instance's time is after $testTime,
+	 * after converting in UTC.
+	 *
+	 * @param mixed       $testTime
+	 * @param string|null $timezone
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function isAfter($testTime, string $timezone = null): bool
+	{
+		$testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
+		$ourTime  = $this->getTimestamp();
+
+		return $ourTime > $testTime;
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Differences
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a text string that is easily readable that describes
+	 * how long ago, or how long from now, a date is, like:
+	 *
+	 *  - 3 weeks ago
+	 *  - in 4 days
+	 *  - 6 hours ago
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function humanize()
+	{
+		$now  = IntlCalendar::fromDateTime(Time::now($this->timezone)->toDateTimeString());
+		$time = $this->getCalendar()->getTime();
+
+		$years   = $now->fieldDifference($time, IntlCalendar::FIELD_YEAR);
+		$months  = $now->fieldDifference($time, IntlCalendar::FIELD_MONTH);
+		$days    = $now->fieldDifference($time, IntlCalendar::FIELD_DAY_OF_YEAR);
+		$hours   = $now->fieldDifference($time, IntlCalendar::FIELD_HOUR_OF_DAY);
+		$minutes = $now->fieldDifference($time, IntlCalendar::FIELD_MINUTE);
+
+		$phrase = null;
+
+		if ($years !== 0)
+		{
+			$phrase = lang('Time.years', [abs($years)]);
+			$before = $years < 0;
+		}
+		elseif ($months !== 0)
+		{
+			$phrase = lang('Time.months', [abs($months)]);
+			$before = $months < 0;
+		}
+		elseif ($days !== 0 && (abs($days) >= 7))
+		{
+			$weeks  = ceil($days / 7);
+			$phrase = lang('Time.weeks', [abs($weeks)]);
+			$before = $days < 0;
+		}
+		elseif ($days !== 0)
+		{
+			$before = $days < 0;
+
+			// Yesterday/Tomorrow special cases
+			if (abs($days) === 1)
+			{
+				return $before ? lang('Time.yesterday') : lang('Time.tomorrow');
+			}
+
+			$phrase = lang('Time.days', [abs($days)]);
+		}
+		elseif ($hours !== 0)
+		{
+			$phrase = lang('Time.hours', [abs($hours)]);
+			$before = $hours < 0;
+		}
+		elseif ($minutes !== 0)
+		{
+			$phrase = lang('Time.minutes', [abs($minutes)]);
+			$before = $minutes < 0;
+		}
+		else
+		{
+			return lang('Time.now');
+		}
+
+		return $before ? lang('Time.ago', [$phrase]) : lang('Time.inFuture', [$phrase]);
+	}
+
+	/**
+	 * @param mixed       $testTime
+	 * @param string|null $timezone
+	 *
+	 * @return TimeDifference
+	 * @throws Exception
+	 */
+	public function difference($testTime, string $timezone = null)
+	{
+		$testTime = $this->getUTCObject($testTime, $timezone);
+		$ourTime  = $this->getUTCObject($this);
+
+		return new TimeDifference($ourTime, $testTime);
+	}
+
+	//--------------------------------------------------------------------
+	// Utilities
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a Time instance with the timezone converted to UTC.
+	 *
+	 * @param mixed       $time
+	 * @param string|null $timezone
+	 *
+	 * @return DateTime|static
+	 * @throws Exception
+	 */
+	public function getUTCObject($time, string $timezone = null)
+	{
+		if ($time instanceof Time)
+		{
+			$time = $time->toDateTime();
+		}
+		elseif (is_string($time))
+		{
+			$timezone = $timezone ?: $this->timezone;
+			$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+			$time     = new DateTime($time, $timezone);
+		}
+
+		if ($time instanceof DateTime || $time instanceof DateTimeImmutable)
+		{
+			$time = $time->setTimezone(new DateTimeZone('UTC'));
+		}
+
+		return $time;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the IntlCalendar object used for this object,
+	 * taking into account the locale, date, etc.
+	 *
+	 * Primarily used internally to provide the difference and comparison functions,
+	 * but available for public consumption if they need it.
+	 *
+	 * @return IntlCalendar
+	 * @throws Exception
+	 */
+	public function getCalendar()
+	{
+		return IntlCalendar::fromDateTime($this->toDateTimeString());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Check a time string to see if it includes a relative date (like 'next Tuesday').
+	 *
+	 * @param string $time
+	 *
+	 * @return boolean
+	 */
+	protected static function hasRelativeKeywords(string $time): bool
+	{
+		// skip common format with a '-' in it
+		if (preg_match('/[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}/', $time) !== 1)
+		{
+			return preg_match(static::$relativePattern, $time) > 0;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs a short format version of the datetime.
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function __toString(): string
+	{
+		return IntlDateFormatter::formatObject($this->toDateTime(), $this->toStringFormat, $this->locale);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allow for property-type access to any getX method...
+	 *
+	 * Note that we cannot use this for any of our setX methods,
+	 * as they return new Time objects, but the __set ignores
+	 * return values.
+	 * See http://php.net/manual/en/language.oop5.overloading.php
+	 *
+	 * @param string $name
+	 *
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		$method = 'get' . ucfirst($name);
+
+		if (method_exists($this, $method))
+		{
+			return $this->$method();
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allow for property-type checking to any getX method...
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean
+	 */
+	public function __isset($name): bool
+	{
+		$method = 'get' . ucfirst($name);
+
+		return method_exists($this, $method);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * This is called when we unserialize the Time object.
+	 */
+	public function __wakeup()
+	{
+		/**
+		 * Prior to unserialization, this is a string.
+		 *
+		 * @var string $timezone
+		 */
+		$timezone = $this->timezone;
+
+		$this->timezone = new DateTimeZone($timezone);
+		parent::__construct($this->date, $this->timezone);
+	}
+}
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
new file mode 100644
index 0000000..dca1bb9
--- /dev/null
+++ b/system/I18n/TimeDifference.php
@@ -0,0 +1,339 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\I18n;
+
+use DateTime;
+use IntlCalendar;
+
+/**
+ * Class TimeDifference
+ */
+class TimeDifference
+{
+	/**
+	 * The timestamp of the "current" time.
+	 *
+	 * @var IntlCalendar
+	 */
+	protected $currentTime;
+
+	/**
+	 * The timestamp to compare the current time to.
+	 *
+	 * @var float
+	 */
+	protected $testTime;
+
+	/**
+	 * Eras.
+	 *
+	 * @var float
+	 */
+	protected $eras = 0;
+
+	/**
+	 * Years.
+	 *
+	 * @var float
+	 */
+	protected $years = 0;
+
+	/**
+	 * Months.
+	 *
+	 * @var float
+	 */
+	protected $months = 0;
+
+	/**
+	 * Weeks.
+	 *
+	 * @var integer
+	 */
+	protected $weeks = 0;
+
+	/**
+	 * Days.
+	 *
+	 * @var integer
+	 */
+	protected $days = 0;
+
+	/**
+	 * Hours.
+	 *
+	 * @var integer
+	 */
+	protected $hours = 0;
+
+	/**
+	 * Minutes.
+	 *
+	 * @var integer
+	 */
+	protected $minutes = 0;
+
+	/**
+	 * Seconds.
+	 *
+	 * @var integer
+	 */
+	protected $seconds = 0;
+
+	/**
+	 * Difference in seconds.
+	 *
+	 * @var integer
+	 */
+	protected $difference;
+
+	/**
+	 * Note: both parameters are required to be in the same timezone. No timezone
+	 * shifting is done internally.
+	 *
+	 * @param DateTime $currentTime
+	 * @param DateTime $testTime
+	 */
+	public function __construct(DateTime $currentTime, DateTime $testTime)
+	{
+		$this->difference = $currentTime->getTimestamp() - $testTime->getTimestamp();
+
+		$current = IntlCalendar::fromDateTime($currentTime);
+		$time    = IntlCalendar::fromDateTime($testTime)->getTime();
+
+		$this->currentTime = $current;
+		$this->testTime    = $time;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of years of difference between the two.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return float|integer
+	 */
+	public function getYears(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference / YEAR;
+		}
+
+		$time = clone($this->currentTime);
+		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
+	}
+
+	/**
+	 * Returns the number of months difference between the two dates.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return float|integer
+	 */
+	public function getMonths(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference / MONTH;
+		}
+
+		$time = clone($this->currentTime);
+		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
+	}
+
+	/**
+	 * Returns the number of weeks difference between the two dates.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return float|integer
+	 */
+	public function getWeeks(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference / WEEK;
+		}
+
+		$time = clone($this->currentTime);
+		return (int) ($time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR) / 7);
+	}
+
+	/**
+	 * Returns the number of days difference between the two dates.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return float|integer
+	 */
+	public function getDays(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference / DAY;
+		}
+
+		$time = clone($this->currentTime);
+		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
+	}
+
+	/**
+	 * Returns the number of hours difference between the two dates.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return float|integer
+	 */
+	public function getHours(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference / HOUR;
+		}
+
+		$time = clone($this->currentTime);
+		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
+	}
+
+	/**
+	 * Returns the number of minutes difference between the two dates.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return float|integer
+	 */
+	public function getMinutes(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference / MINUTE;
+		}
+
+		$time = clone($this->currentTime);
+		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
+	}
+
+	/**
+	 * Returns the number of seconds difference between the two dates.
+	 *
+	 * @param boolean $raw
+	 *
+	 * @return integer
+	 */
+	public function getSeconds(bool $raw = false)
+	{
+		if ($raw)
+		{
+			return $this->difference;
+		}
+
+		$time = clone($this->currentTime);
+		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_SECOND);
+	}
+
+	/**
+	 * Convert the time to human readable format
+	 *
+	 * @param string|null $locale
+	 *
+	 * @return string
+	 */
+	public function humanize(string $locale = null): string
+	{
+		$current = clone($this->currentTime);
+
+		$years   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
+		$months  = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
+		$days    = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
+		$hours   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
+		$minutes = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
+
+		$phrase = null;
+
+		if ($years !== 0)
+		{
+			$phrase = lang('Time.years', [abs($years)], $locale);
+			$before = $years < 0;
+		}
+		elseif ($months !== 0)
+		{
+			$phrase = lang('Time.months', [abs($months)], $locale);
+			$before = $months < 0;
+		}
+		elseif ($days !== 0 && (abs($days) >= 7))
+		{
+			$weeks  = ceil($days / 7);
+			$phrase = lang('Time.weeks', [abs($weeks)], $locale);
+			$before = $days < 0;
+		}
+		elseif ($days !== 0)
+		{
+			$phrase = lang('Time.days', [abs($days)], $locale);
+			$before = $days < 0;
+		}
+		elseif ($hours !== 0)
+		{
+			$phrase = lang('Time.hours', [abs($hours)], $locale);
+			$before = $hours < 0;
+		}
+		elseif ($minutes !== 0)
+		{
+			$phrase = lang('Time.minutes', [abs($minutes)], $locale);
+			$before = $minutes < 0;
+		}
+		else
+		{
+			return lang('Time.now', [], $locale);
+		}
+
+		return $before
+			? lang('Time.ago', [$phrase], $locale)
+			: lang('Time.inFuture', [$phrase], $locale);
+	}
+
+	/**
+	 * Allow property-like access to our calculated values.
+	 *
+	 * @param string $name
+	 *
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		$name   = ucfirst(strtolower($name));
+		$method = "get{$name}";
+
+		if (method_exists($this, $method))
+		{
+			return $this->{$method}();
+		}
+
+		return null;
+	}
+
+	/**
+	 * Allow property-like checking for our calculated values.
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean
+	 */
+	public function __isset($name)
+	{
+		$name   = ucfirst(strtolower($name));
+		$method = "get{$name}";
+
+		return method_exists($this, $method);
+	}
+}
diff --git a/system/Images/Exceptions/ImageException.php b/system/Images/Exceptions/ImageException.php
new file mode 100644
index 0000000..451192c
--- /dev/null
+++ b/system/Images/Exceptions/ImageException.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images\Exceptions;
+
+use CodeIgniter\Exceptions\ExceptionInterface;
+use CodeIgniter\Exceptions\FrameworkException;
+
+class ImageException extends FrameworkException implements ExceptionInterface
+{
+	public static function forMissingImage()
+	{
+		return new static(lang('Images.sourceImageRequired'));
+	}
+
+	public static function forFileNotSupported()
+	{
+		return new static(lang('Images.fileNotSupported'));
+	}
+
+	public static function forMissingAngle()
+	{
+		return new static(lang('Images.rotationAngleRequired'));
+	}
+
+	public static function forInvalidDirection(string $dir = null)
+	{
+		return new static(lang('Images.invalidDirection', [$dir]));
+	}
+
+	public static function forInvalidPath()
+	{
+		return new static(lang('Images.invalidPath'));
+	}
+
+	public static function forEXIFUnsupported()
+	{
+		return new static(lang('Images.exifNotSupported'));
+	}
+
+	public static function forInvalidImageCreate(string $extra = null)
+	{
+		return new static(lang('Images.unsupportedImageCreate') . ' ' . $extra);
+	}
+
+	public static function forSaveFailed()
+	{
+		return new static(lang('Images.saveFailed'));
+	}
+
+	public static function forInvalidImageLibraryPath(string $path = null)
+	{
+		return new static(lang('Images.libPathInvalid', [$path]));
+	}
+
+	public static function forImageProcessFailed()
+	{
+		return new static(lang('Images.imageProcessFailed'));
+	}
+}
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
new file mode 100644
index 0000000..b721bce
--- /dev/null
+++ b/system/Images/Handlers/BaseHandler.php
@@ -0,0 +1,901 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images\Handlers;
+
+use CodeIgniter\Images\Exceptions\ImageException;
+use CodeIgniter\Images\Image;
+use CodeIgniter\Images\ImageHandlerInterface;
+use Config\Images;
+use InvalidArgumentException;
+
+/**
+ * Base image handling implementation
+ */
+abstract class BaseHandler implements ImageHandlerInterface
+{
+	/**
+	 * Configuration settings.
+	 *
+	 * @var Images
+	 */
+	protected $config;
+
+	/**
+	 * The image/file instance
+	 *
+	 * @var Image
+	 */
+	protected $image;
+
+	/**
+	 * Whether the image file has been confirmed.
+	 *
+	 * @var boolean
+	 */
+	protected $verified = false;
+
+	/**
+	 * Image width.
+	 *
+	 * @var integer
+	 */
+	protected $width = 0;
+
+	/**
+	 * Image height.
+	 *
+	 * @var integer
+	 */
+	protected $height = 0;
+
+	/**
+	 * File permission mask.
+	 *
+	 * @var integer
+	 */
+	protected $filePermissions = 0644;
+
+	/**
+	 * X-axis.
+	 *
+	 * @var integer|null
+	 */
+	protected $xAxis = 0;
+
+	/**
+	 * Y-axis.
+	 *
+	 * @var integer|null
+	 */
+	protected $yAxis = 0;
+
+	/**
+	 * Master dimensioning.
+	 *
+	 * @var string
+	 */
+	protected $masterDim = 'auto';
+
+	/**
+	 * Default options for text watermarking.
+	 *
+	 * @var array
+	 */
+	protected $textDefaults = [
+		'fontPath'     => null,
+		'fontSize'     => 16,
+		'color'        => 'ffffff',
+		'opacity'      => 1.0,
+		'vAlign'       => 'bottom',
+		'hAlign'       => 'center',
+		'vOffset'      => 0,
+		'hOffset'      => 0,
+		'padding'      => 0,
+		'withShadow'   => false,
+		'shadowColor'  => '000000',
+		'shadowOffset' => 3,
+	];
+
+	/**
+	 * Image types with support for transparency.
+	 *
+	 * @var array
+	 */
+	protected $supportTransparency = [
+		IMAGETYPE_PNG,
+		IMAGETYPE_WEBP,
+	];
+
+	/**
+	 * Temporary image used by the different engines.
+	 *
+	 * @var resource|null
+	 */
+	protected $resource;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Images|null $config
+	 */
+	public function __construct($config = null)
+	{
+		$this->config = $config ?? new Images();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets another image for this handler to work on.
+	 * Keeps us from needing to continually instantiate the handler.
+	 *
+	 * @param string $path
+	 *
+	 * @return $this
+	 */
+	public function withFile(string $path)
+	{
+		// Clear out the old resource so that
+		// it doesn't try to use a previous image
+		$this->resource = null;
+		$this->verified = false;
+
+		$this->image = new Image($path, true);
+
+		$this->image->getProperties(false);
+		$this->width  = $this->image->origWidth;
+		$this->height = $this->image->origHeight;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Make the image resource object if needed
+	 */
+	protected abstract function ensureResource();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the image instance.
+	 *
+	 * @return Image
+	 */
+	public function getFile()
+	{
+		return $this->image;
+	}
+
+	/**
+	 * Verifies that a file has been supplied and it is an image.
+	 *
+	 * @return Image  The image instance
+	 * @throws ImageException
+	 */
+	protected function image(): Image
+	{
+		if ($this->verified)
+		{
+			return $this->image;
+		}
+
+		// Verify withFile has been called
+		if (empty($this->image))
+		{
+			throw ImageException::forMissingImage();
+		}
+
+		// Verify the loaded image is an Image instance
+		if (! $this->image instanceof Image)
+		{
+			throw ImageException::forInvalidPath();
+		}
+
+		// File::__construct has verified the file exists - make sure it is an image
+		if (! is_int($this->image->imageType))
+		{
+			throw ImageException::forFileNotSupported();
+		}
+
+		// Note that the image has been verified
+		$this->verified = true;
+
+		return $this->image;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the temporary image used during the image processing.
+	 * Good for extending the system or doing things this library
+	 * is not intended to do.
+	 *
+	 * @return resource
+	 */
+	public function getResource()
+	{
+		$this->ensureResource();
+		return $this->resource;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Load the temporary image used during the image processing.
+	 * Some functions e.g. save() will only copy and not compress
+	 * your image otherwise.
+	 *
+	 * @return $this
+	 */
+	public function withResource()
+	{
+		$this->ensureResource();
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resize the image
+	 *
+	 * @param integer $width
+	 * @param integer $height
+	 * @param boolean $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
+	 * @param string  $masterDim
+	 *
+	 * @return BaseHandler
+	 */
+	public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
+	{
+		// If the target width/height match the source, then we have nothing to do here.
+		if ($this->image()->origWidth === $width && $this->image()->origHeight === $height)
+		{
+			return $this;
+		}
+
+		$this->width  = $width;
+		$this->height = $height;
+
+		if ($maintainRatio)
+		{
+			$this->masterDim = $masterDim;
+			$this->reproportion();
+		}
+
+		return $this->_resize($maintainRatio);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Crops the image to the desired height and width. If one of the height/width values
+	 * is not provided, that value will be set the appropriate value based on offsets and
+	 * image dimensions.
+	 *
+	 * @param integer|null $width
+	 * @param integer|null $height
+	 * @param integer|null $x             X-axis coord to start cropping from the left of image
+	 * @param integer|null $y             Y-axis coord to start cropping from the top of image
+	 * @param boolean      $maintainRatio
+	 * @param string       $masterDim
+	 *
+	 * @return $this
+	 */
+	public function crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto')
+	{
+		$this->width  = $width;
+		$this->height = $height;
+		$this->xAxis  = $x;
+		$this->yAxis  = $y;
+
+		if ($maintainRatio)
+		{
+			$this->masterDim = $masterDim;
+			$this->reproportion();
+		}
+
+		$result = $this->_crop();
+
+		$this->xAxis = null;
+		$this->yAxis = null;
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Changes the stored image type to indicate the new file format to use when saving.
+	 * Does not touch the actual resource.
+	 *
+	 * @param integer $imageType A PHP imageType constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
+	 *
+	 * @return $this
+	 */
+	public function convert(int $imageType)
+	{
+		$this->image()->imageType = $imageType;
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rotates the image on the current canvas.
+	 *
+	 * @param float $angle
+	 *
+	 * @return $this
+	 */
+	public function rotate(float $angle)
+	{
+		// Allowed rotation values
+		$degs = [
+			90.0,
+			180.0,
+			270.0,
+		];
+
+		if (! in_array($angle, $degs, true))
+		{
+			throw ImageException::forMissingAngle();
+		}
+
+		// cast angle as an int, for our use
+		$angle = (int) $angle;
+
+		// Reassign the width and height
+		if ($angle === 90 || $angle === 270)
+		{
+			$temp         = $this->height;
+			$this->width  = $this->height;
+			$this->height = $temp;
+		}
+
+		// Call the Handler-specific version.
+		$this->_rotate($angle);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flattens transparencies, default white background
+	 *
+	 * @param integer $red
+	 * @param integer $green
+	 * @param integer $blue
+	 *
+	 * @return $this
+	 */
+	public function flatten(int $red = 255, int $green = 255, int $blue = 255)
+	{
+		$this->width  = $this->image()->origWidth;
+		$this->height = $this->image()->origHeight;
+
+		return $this->_flatten($red, $green, $blue);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handler-specific method to flattening an image's transparencies.
+	 *
+	 * @param integer $red
+	 * @param integer $green
+	 * @param integer $blue
+	 *
+	 * @return   $this
+	 * @internal
+	 */
+	protected abstract function _flatten(int $red = 255, int $green = 255, int $blue = 255);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handler-specific method to handle rotating an image in 90 degree increments.
+	 *
+	 * @param integer $angle
+	 *
+	 * @return mixed
+	 */
+	protected abstract function _rotate(int $angle);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flips an image either horizontally or vertically.
+	 *
+	 * @param string $dir Either 'vertical' or 'horizontal'
+	 *
+	 * @return $this
+	 */
+	public function flip(string $dir = 'vertical')
+	{
+		$dir = strtolower($dir);
+
+		if ($dir !== 'vertical' && $dir !== 'horizontal')
+		{
+			throw ImageException::forInvalidDirection($dir);
+		}
+
+		return $this->_flip($dir);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handler-specific method to handle flipping an image along its
+	 * horizontal or vertical axis.
+	 *
+	 * @param string $direction
+	 *
+	 * @return $this
+	 */
+	protected abstract function _flip(string $direction);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overlays a string of text over the image.
+	 *
+	 * Valid options:
+	 *
+	 *  - color         Text Color (hex number)
+	 *  - shadowColor   Color of the shadow (hex number)
+	 *  - hAlign        Horizontal alignment: left, center, right
+	 *  - vAlign        Vertical alignment: top, middle, bottom
+	 *  - hOffset
+	 *  - vOffset
+	 *  - fontPath
+	 *  - fontSize
+	 *  - shadowOffset
+	 *
+	 * @param string $text
+	 * @param array  $options
+	 *
+	 * @return $this
+	 */
+	public function text(string $text, array $options = [])
+	{
+		$options                = array_merge($this->textDefaults, $options);
+		$options['color']       = trim($options['color'], '# ');
+		$options['shadowColor'] = trim($options['shadowColor'], '# ');
+
+		$this->_text($text, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handler-specific method for overlaying text on an image.
+	 *
+	 * @param string $text
+	 * @param array  $options
+	 */
+	protected abstract function _text(string $text, array $options = []);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the actual resizing of the image.
+	 *
+	 * @param boolean $maintainRatio
+	 *
+	 * @return $this
+	 */
+	public abstract function _resize(bool $maintainRatio = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Crops the image.
+	 *
+	 * @return $this
+	 */
+	public abstract function _crop();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return image width.
+	 *
+	 * @return integer
+	 */
+	public abstract function _getWidth();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the height of an image.
+	 *
+	 * @return integer
+	 */
+	public abstract function _getHeight();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reads the EXIF information from the image and modifies the orientation
+	 * so that displays correctly in the browser. This is especially an issue
+	 * with images taken by smartphones who always store the image up-right,
+	 * but set the orientation flag to display it correctly.
+	 *
+	 * @param boolean $silent If true, will ignore exceptions when PHP doesn't support EXIF.
+	 *
+	 * @return $this
+	 */
+	public function reorient(bool $silent = false)
+	{
+		$orientation = $this->getEXIF('Orientation', $silent);
+
+		switch ($orientation)
+		{
+			case 2:
+				return $this->flip('horizontal');
+			case 3:
+				return $this->rotate(180);
+			case 4:
+				return $this->rotate(180)
+								->flip('horizontal');
+			case 5:
+				return $this->rotate(270)
+								->flip('horizontal');
+			case 6:
+				return $this->rotate(270);
+			case 7:
+				return $this->rotate(90)
+								->flip('horizontal');
+			case 8:
+				return $this->rotate(90);
+			default:
+				return $this;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the EXIF information from the image, if possible. Returns
+	 * an array of the information, or null if nothing can be found.
+	 *
+	 * EXIF data is only supported fr JPEG & TIFF formats.
+	 *
+	 * @param string|null $key    If specified, will only return this piece of EXIF data.
+	 * @param boolean     $silent If true, will not throw our own exceptions.
+	 *
+	 * @throws ImageException
+	 *
+	 * @return mixed
+	 */
+	public function getEXIF(string $key = null, bool $silent = false)
+	{
+		if (! function_exists('exif_read_data'))
+		{
+			if ($silent)
+			{
+				return null;
+			}
+
+			throw ImageException::forEXIFUnsupported(); // @codeCoverageIgnore
+		}
+
+		$exif = null; // default
+		switch ($this->image()->imageType)
+		{
+			case IMAGETYPE_JPEG:
+			case IMAGETYPE_TIFF_II:
+				$exif = @exif_read_data($this->image()->getPathname());
+				if (! is_null($key) && is_array($exif))
+				{
+					$exif = $exif[$key] ?? false;
+				}
+		}
+
+		return $exif;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combine cropping and resizing into a single command.
+	 *
+	 * Supported positions:
+	 *  - top-left
+	 *  - top
+	 *  - top-right
+	 *  - left
+	 *  - center
+	 *  - right
+	 *  - bottom-left
+	 *  - bottom
+	 *  - bottom-right
+	 *
+	 * @param integer $width
+	 * @param integer $height
+	 * @param string  $position
+	 *
+	 * @return BaseHandler
+	 */
+	public function fit(int $width, int $height = null, string $position = 'center')
+	{
+		$origWidth  = $this->image()->origWidth;
+		$origHeight = $this->image()->origHeight;
+
+		[$cropWidth, $cropHeight] = $this->calcAspectRatio($width, $height, $origWidth, $origHeight);
+
+		if (is_null($height))
+		{
+			$height = ceil(($width / $cropWidth) * $cropHeight);
+		}
+
+		[$x, $y] = $this->calcCropCoords($cropWidth, $cropHeight, $origWidth, $origHeight, $position);
+
+		return $this->crop($cropWidth, $cropHeight, $x, $y)
+						->resize($width, $height);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Calculate image aspect ratio.
+	 *
+	 * @param integer|float      $width
+	 * @param integer|float|null $height
+	 * @param integer|float      $origWidth
+	 * @param integer|float      $origHeight
+	 *
+	 * @return array
+	 */
+	protected function calcAspectRatio($width, $height = null, $origWidth = 0, $origHeight = 0): array
+	{
+		if (empty($origWidth) || empty($origHeight))
+		{
+			throw new InvalidArgumentException('You must supply the parameters: origWidth, origHeight.');
+		}
+
+		// If $height is null, then we have it easy.
+		// Calc based on full image size and be done.
+		if (is_null($height))
+		{
+			$height = ($width / $origWidth) * $origHeight;
+
+			return [
+				$width,
+				(int) $height,
+			];
+		}
+
+		$xRatio = $width / $origWidth;
+		$yRatio = $height / $origHeight;
+
+		if ($xRatio > $yRatio)
+		{
+			return [
+				$origWidth,
+				(int) ($origWidth * $height / $width),
+			];
+		}
+
+		return [
+			(int) ($origHeight * $width / $height),
+			$origHeight,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Based on the position, will determine the correct x/y coords to
+	 * crop the desired portion from the image.
+	 *
+	 * @param integer|float $width
+	 * @param integer|float $height
+	 * @param integer|float $origWidth
+	 * @param integer|float $origHeight
+	 * @param string        $position
+	 *
+	 * @return array
+	 */
+	protected function calcCropCoords($width, $height, $origWidth, $origHeight, $position): array
+	{
+		$position = strtolower($position);
+
+		$x = $y = 0;
+
+		switch ($position)
+		{
+			case 'top-left':
+				$x = 0;
+				$y = 0;
+				break;
+			case 'top':
+				$x = floor(($origWidth - $width) / 2);
+				$y = 0;
+				break;
+			case 'top-right':
+				$x = $origWidth - $width;
+				$y = 0;
+				break;
+			case 'left':
+				$x = 0;
+				$y = floor(($origHeight - $height) / 2);
+				break;
+			case 'center':
+				$x = floor(($origWidth - $width) / 2);
+				$y = floor(($origHeight - $height) / 2);
+				break;
+			case 'right':
+				$x = ($origWidth - $width);
+				$y = floor(($origHeight - $height) / 2);
+				break;
+			case 'bottom-left':
+				$x = 0;
+				$y = $origHeight - $height;
+				break;
+			case 'bottom':
+				$x = floor(($origWidth - $width) / 2);
+				$y = $origHeight - $height;
+				break;
+			case 'bottom-right':
+				$x = ($origWidth - $width);
+				$y = $origHeight - $height;
+				break;
+		}
+
+		return [
+			$x,
+			$y,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get the version of the image library in use.
+	 *
+	 * @return string
+	 */
+	public abstract function getVersion();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves any changes that have been made to file.
+	 *
+	 * Example:
+	 *    $image->resize(100, 200, true)
+	 *          ->save($target);
+	 *
+	 * @param string|null $target
+	 * @param integer     $quality
+	 *
+	 * @return boolean
+	 */
+	public abstract function save(string $target = null, int $quality = 90);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the driver-specific processing of the image.
+	 *
+	 * @param string $action
+	 *
+	 * @return mixed
+	 */
+	protected abstract function process(string $action);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provide access to the Image class' methods if they don't exist
+	 * on the handler itself.
+	 *
+	 * @param string $name
+	 * @param array  $args
+	 *
+	 * @return mixed
+	 */
+	public function __call(string $name, array $args = [])
+	{
+		if (method_exists($this->image(), $name))
+		{
+			return $this->image()->$name(...$args);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Re-proportion Image Width/Height
+	 *
+	 * When creating thumbs, the desired width/height
+	 * can end up warping the image due to an incorrect
+	 * ratio between the full-sized image and the thumb.
+	 *
+	 * This function lets us re-proportion the width/height
+	 * if users choose to maintain the aspect ratio when resizing.
+	 *
+	 * @return void
+	 */
+	protected function reproportion()
+	{
+		if (($this->width === 0 && $this->height === 0) || $this->image()->origWidth === 0 || $this->image()->origHeight === 0 || (! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) || ! ctype_digit((string) $this->image()->origWidth) || ! ctype_digit((string) $this->image()->origHeight)
+		)
+		{
+			return;
+		}
+
+		// Sanitize
+		$this->width  = (int) $this->width;
+		$this->height = (int) $this->height;
+
+		if ($this->masterDim !== 'width' && $this->masterDim !== 'height')
+		{
+			if ($this->width > 0 && $this->height > 0)
+			{
+				$this->masterDim = ((($this->image()->origHeight / $this->image()->origWidth) - ($this->height / $this->width)) < 0) ? 'width' : 'height';
+			}
+			else
+			{
+				$this->masterDim = ($this->height === 0) ? 'width' : 'height';
+			}
+		}
+		elseif (($this->masterDim === 'width' && $this->width === 0) || ($this->masterDim === 'height' && $this->height === 0)
+		)
+		{
+			return;
+		}
+
+		if ($this->masterDim === 'width')
+		{
+			$this->height = (int) ceil($this->width * $this->image()->origHeight / $this->image()->origWidth);
+		}
+		else
+		{
+			$this->width = (int) ceil($this->image()->origWidth * $this->height / $this->image()->origHeight);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return image width.
+	 *
+	 * accessor for testing; not part of interface
+	 *
+	 * @return integer
+	 */
+	public function getWidth()
+	{
+		return ($this->resource !== null) ? $this->_getWidth() : $this->width;
+	}
+
+	/**
+	 * Return image height.
+	 *
+	 * accessor for testing; not part of interface
+	 *
+	 * @return integer
+	 */
+	public function getHeight()
+	{
+		return ($this->resource !== null) ? $this->_getHeight() : $this->height;
+	}
+}
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
new file mode 100644
index 0000000..f743b2a
--- /dev/null
+++ b/system/Images/Handlers/GDHandler.php
@@ -0,0 +1,600 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images\Handlers;
+
+use CodeIgniter\Images\Exceptions\ImageException;
+use Config\Images;
+
+/**
+ * Image handler for GD package
+ */
+class GDHandler extends BaseHandler
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param  Images|null $config
+	 * @throws ImageException
+	 */
+	public function __construct($config = null)
+	{
+		parent::__construct($config);
+
+		// We should never see this, so can't test it
+		// @codeCoverageIgnoreStart
+		if (! extension_loaded('gd'))
+		{
+			throw ImageException::forMissingExtension('GD');
+		}
+		// @codeCoverageIgnoreEnd
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the rotation of an image resource.
+	 * Doesn't save the image, but replaces the current resource.
+	 *
+	 * @param integer $angle
+	 *
+	 * @return boolean
+	 */
+	protected function _rotate(int $angle): bool
+	{
+		// Create the image handle
+		$srcImg = $this->createImage();
+
+		// Set the background color
+		// This won't work with transparent PNG files so we are
+		// going to have to figure out how to determine the color
+		// of the alpha channel in a future release.
+
+		$white = imagecolorallocate($srcImg, 255, 255, 255);
+
+		// Rotate it!
+		$destImg = imagerotate($srcImg, $angle, $white);
+
+		// Kill the file handles
+		imagedestroy($srcImg);
+
+		$this->resource = $destImg;
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flattens transparencies
+	 *
+	 * @param integer $red
+	 * @param integer $green
+	 * @param integer $blue
+	 *
+	 * @return $this
+	 */
+	public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
+	{
+		$srcImg = $this->createImage();
+
+		if (function_exists('imagecreatetruecolor'))
+		{
+			$create = 'imagecreatetruecolor';
+			$copy   = 'imagecopyresampled';
+		}
+		else
+		{
+			$create = 'imagecreate';
+			$copy   = 'imagecopyresized';
+		}
+		$dest = $create($this->width, $this->height);
+
+		$matte = imagecolorallocate($dest, $red, $green, $blue);
+
+		imagefilledrectangle($dest, 0, 0, $this->width, $this->height, $matte);
+		imagecopy($dest, $srcImg, 0, 0, 0, 0, $this->width, $this->height);
+
+		// Kill the file handles
+		imagedestroy($srcImg);
+
+		$this->resource = $dest;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flips an image along it's vertical or horizontal axis.
+	 *
+	 * @param string $direction
+	 *
+	 * @return $this
+	 */
+	public function _flip(string $direction)
+	{
+		$srcImg = $this->createImage();
+
+		$angle = $direction === 'horizontal' ? IMG_FLIP_HORIZONTAL : IMG_FLIP_VERTICAL;
+
+		imageflip($srcImg, $angle);
+
+		$this->resource = $srcImg;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get GD version
+	 *
+	 * @return mixed
+	 */
+	public function getVersion()
+	{
+		if (function_exists('gd_info'))
+		{
+			$gdVersion = @gd_info();
+
+			return preg_replace('/\D/', '', $gdVersion['GD Version']);
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resizes the image.
+	 *
+	 * @return GDHandler
+	 */
+	public function _resize(bool $maintainRatio = false)
+	{
+		return $this->process('resize');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Crops the image.
+	 *
+	 * @return GDHandler
+	 */
+	public function _crop()
+	{
+		return $this->process('crop');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles all of the grunt work of resizing, etc.
+	 *
+	 * @param string $action
+	 *
+	 * @return $this
+	 */
+	protected function process(string $action)
+	{
+		$origWidth  = $this->image()->origWidth;
+		$origHeight = $this->image()->origHeight;
+
+		if ($action === 'crop')
+		{
+			// Reassign the source width/height if cropping
+			$origWidth  = $this->width;
+			$origHeight = $this->height;
+
+			// Modify the "original" width/height to the new
+			// values so that methods that come after have the
+			// correct size to work with.
+			$this->image()->origHeight = $this->height;
+			$this->image()->origWidth  = $this->width;
+		}
+
+		// Create the image handle
+		$src = $this->createImage();
+
+		if (function_exists('imagecreatetruecolor'))
+		{
+			$create = 'imagecreatetruecolor';
+			$copy   = 'imagecopyresampled';
+		}
+		else
+		{
+			$create = 'imagecreate';
+			$copy   = 'imagecopyresized';
+		}
+
+		$dest = $create($this->width, $this->height);
+
+		// for png and webp we can actually preserve transparency
+		if (in_array($this->image()->imageType, $this->supportTransparency, true))
+		{
+			imagealphablending($dest, false);
+			imagesavealpha($dest, true);
+		}
+
+		$copy($dest, $src, 0, 0, $this->xAxis, $this->yAxis, $this->width, $this->height, $origWidth, $origHeight);
+
+		imagedestroy($src);
+		$this->resource = $dest;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves any changes that have been made to file. If no new filename is
+	 * provided, the existing image is overwritten, otherwise a copy of the
+	 * file is made at $target.
+	 *
+	 * Example:
+	 *    $image->resize(100, 200, true)
+	 *          ->save();
+	 *
+	 * @param string|null $target
+	 * @param integer     $quality
+	 *
+	 * @return boolean
+	 */
+	public function save(string $target = null, int $quality = 90): bool
+	{
+		$original = $target;
+		$target   = empty($target) ? $this->image()->getPathname() : $target;
+
+		// If no new resource has been created, then we're
+		// simply copy the existing one.
+		if (empty($this->resource) && $quality === 100)
+		{
+			if ($original === null)
+			{
+				return true;
+			}
+
+			$name = basename($target);
+			$path = pathinfo($target, PATHINFO_DIRNAME);
+
+			return $this->image()->copy($path, $name);
+		}
+
+		$this->ensureResource();
+
+		switch ($this->image()->imageType)
+		{
+			case IMAGETYPE_GIF:
+				if (! function_exists('imagegif'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
+				}
+
+				if (! @imagegif($this->resource, $target))
+				{
+					throw ImageException::forSaveFailed();
+				}
+				break;
+			case IMAGETYPE_JPEG:
+				if (! function_exists('imagejpeg'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
+				}
+
+				if (! @imagejpeg($this->resource, $target, $quality))
+				{
+					throw ImageException::forSaveFailed();
+				}
+				break;
+			case IMAGETYPE_PNG:
+				if (! function_exists('imagepng'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
+				}
+
+				if (! @imagepng($this->resource, $target))
+				{
+					throw ImageException::forSaveFailed();
+				}
+				break;
+			case IMAGETYPE_WEBP:
+				if (! function_exists('imagewebp'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
+				}
+
+				if (! @imagewebp($this->resource, $target))
+				{
+					throw ImageException::forSaveFailed();
+				}
+				break;
+			default:
+				throw ImageException::forInvalidImageCreate();
+		}
+
+		imagedestroy($this->resource);
+
+		chmod($target, $this->filePermissions);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create Image Resource
+	 *
+	 * This simply creates an image resource handle
+	 * based on the type of image being processed
+	 *
+	 * @param string $path
+	 * @param string $imageType
+	 *
+	 * @return resource|boolean
+	 */
+	protected function createImage(string $path = '', string $imageType = '')
+	{
+		if ($this->resource !== null)
+		{
+			return $this->resource;
+		}
+
+		if ($path === '')
+		{
+			$path = $this->image()->getPathname();
+		}
+
+		if ($imageType === '')
+		{
+			$imageType = $this->image()->imageType;
+		}
+
+		return $this->getImageResource($path, $imageType);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Make the image resource object if needed
+	 */
+	protected function ensureResource()
+	{
+		if ($this->resource === null)
+		{
+			// if valid image type, make corresponding image resource
+			$this->resource = $this->getImageResource(
+				$this->image()->getPathname(), $this->image()->imageType
+			);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Check if image type is supported and return image resource
+	 *
+	 * @param string  $path      Image path
+	 * @param integer $imageType Image type
+	 *
+	 * @return resource|boolean
+	 * @throws ImageException
+	 */
+	protected function getImageResource(string $path, int $imageType)
+	{
+		switch ($imageType)
+		{
+			case IMAGETYPE_GIF:
+				if (! function_exists('imagecreatefromgif'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
+				}
+
+				return imagecreatefromgif($path);
+			case IMAGETYPE_JPEG:
+				if (! function_exists('imagecreatefromjpeg'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
+				}
+
+				return imagecreatefromjpeg($path);
+			case IMAGETYPE_PNG:
+				if (! function_exists('imagecreatefrompng'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
+				}
+
+				return imagecreatefrompng($path);
+			case IMAGETYPE_WEBP:
+				if (! function_exists('imagecreatefromwebp'))
+				{
+					throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
+				}
+
+				return imagecreatefromwebp($path);
+			default:
+				throw ImageException::forInvalidImageCreate('Ima');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Add text overlay to an image.
+	 *
+	 * @param string $text
+	 * @param array  $options
+	 *
+	 * @return void
+	 */
+	protected function _text(string $text, array $options = [])
+	{
+		// Reverse the vertical offset
+		// When the image is positioned at the bottom
+		// we don't want the vertical offset to push it
+		// further down. We want the reverse, so we'll
+		// invert the offset. Note: The horizontal
+		// offset flips itself automatically
+
+		if ($options['vAlign'] === 'bottom')
+		{
+			$options['vOffset'] = $options['vOffset'] * -1;
+		}
+
+		if ($options['hAlign'] === 'right')
+		{
+			$options['hOffset'] = $options['hOffset'] * -1;
+		}
+
+		// Set font width and height
+		// These are calculated differently depending on
+		// whether we are using the true type font or not
+		if (! empty($options['fontPath']))
+		{
+			if (function_exists('imagettfbbox'))
+			{
+				$temp = imagettfbbox($options['fontSize'], 0, $options['fontPath'], $text);
+				$temp = $temp[2] - $temp[0];
+
+				$fontwidth = $temp / strlen($text);
+			}
+			else
+			{
+				$fontwidth = $options['fontSize'] - ($options['fontSize'] / 4);
+			}
+
+			$fontheight = $options['fontSize'];
+		}
+		else
+		{
+			$fontwidth  = imagefontwidth($options['fontSize']);
+			$fontheight = imagefontheight($options['fontSize']);
+		}
+
+		$options['fontheight'] = $fontheight;
+		$options['fontwidth']  = $fontwidth;
+
+		// Set base X and Y axis values
+		$xAxis = $options['hOffset'] + $options['padding'];
+		$yAxis = $options['vOffset'] + $options['padding'];
+
+		// Set vertical alignment
+		if ($options['vAlign'] === 'middle')
+		{
+			// Don't apply padding when you're in the middle of the image.
+			$yAxis += ($this->image()->origHeight / 2) + ($fontheight / 2) - $options['padding'] - $fontheight - $options['shadowOffset'];
+		}
+		elseif ($options['vAlign'] === 'bottom')
+		{
+			$yAxis = ($this->image()->origHeight - $fontheight - $options['shadowOffset'] - ($fontheight / 2)) - $yAxis;
+		}
+
+		// Set horizontal alignment
+		if ($options['hAlign'] === 'right')
+		{
+			$xAxis += ($this->image()->origWidth - ($fontwidth * strlen($text)) - $options['shadowOffset']) - (2 * $options['padding']);
+		}
+		elseif ($options['hAlign'] === 'center')
+		{
+			$xAxis += floor(($this->image()->origWidth - ($fontwidth * strlen($text))) / 2);
+		}
+
+		$options['xAxis'] = $xAxis;
+		$options['yAxis'] = $yAxis;
+
+		if ($options['withShadow'])
+		{
+			// Offset from text
+			$options['xShadow'] = $xAxis + $options['shadowOffset'];
+			$options['yShadow'] = $yAxis + $options['shadowOffset'];
+
+			$this->textOverlay($text, $options, true);
+		}
+
+		$this->textOverlay($text, $options);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handler-specific method for overlaying text on an image.
+	 *
+	 * @param string  $text
+	 * @param array   $options
+	 * @param boolean $isShadow Whether we are drawing the dropshadow or actual text
+	 *
+	 * @return void
+	 */
+	protected function textOverlay(string $text, array $options = [], bool $isShadow = false)
+	{
+		$src = $this->createImage();
+
+		/* Set RGB values for shadow
+		 *
+		 * Get the rest of the string and split it into 2-length
+		 * hex values:
+		 */
+		$opacity = ($options['opacity'] * 127);
+
+		// Allow opacity to be applied to the text
+		imagealphablending($src, true);
+
+		$color = $isShadow ? $options['shadowColor'] : $options['color'];
+
+		// shorthand hex, #f00
+		if (strlen($color) === 3)
+		{
+			$color = implode('', array_map('str_repeat', str_split($color), [2, 2, 2]));
+		}
+
+		$color = str_split(substr($color, 0, 6), 2);
+		$color = imagecolorclosestalpha($src, hexdec($color[0]), hexdec($color[1]), hexdec($color[2]), $opacity);
+
+		$xAxis = $isShadow ? $options['xShadow'] : $options['xAxis'];
+		$yAxis = $isShadow ? $options['yShadow'] : $options['yAxis'];
+
+		// Add the shadow to the source image
+		if (! empty($options['fontPath']))
+		{
+			// We have to add fontheight because imagettftext locates the bottom left corner, not top-left corner.
+			imagettftext($src, $options['fontSize'], 0, $xAxis, $yAxis + $options['fontheight'], $color, $options['fontPath'], $text);
+		}
+		else
+		{
+			imagestring($src, $options['fontSize'], $xAxis, $yAxis, $text, $color);
+		}
+
+		$this->resource = $src;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return image width.
+	 *
+	 * @return integer
+	 */
+	public function _getWidth()
+	{
+		return imagesx($this->resource);
+	}
+
+	/**
+	 * Return image height.
+	 *
+	 * @return integer
+	 */
+	public function _getHeight()
+	{
+		return imagesy($this->resource);
+	}
+}
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
new file mode 100644
index 0000000..53dc66e
--- /dev/null
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -0,0 +1,536 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images\Handlers;
+
+use CodeIgniter\Images\Exceptions\ImageException;
+use Config\Images;
+use Exception;
+use Imagick;
+
+/**
+ * Class ImageMagickHandler
+ *
+ * To make this library as compatible as possible with the broadest
+ * number of installations, we do not use the Imagick extension,
+ * but simply use the command line version.
+ *
+ * hmm - the width & height accessors at the end use the imagick extension.
+ *
+ * FIXME - This needs conversion & unit testing, to use the imagick extension
+ */
+class ImageMagickHandler extends BaseHandler
+{
+	/**
+	 * Stores image resource in memory.
+	 *
+	 * @var string|null
+	 */
+	protected $resource;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param  Images $config
+	 * @throws ImageException
+	 */
+	public function __construct($config = null)
+	{
+		parent::__construct($config);
+
+		// We should never see this, so can't test it
+		// @codeCoverageIgnoreStart
+		if (! (extension_loaded('imagick') || class_exists('Imagick')))
+		{
+			throw ImageException::forMissingExtension('IMAGICK');
+		}
+		// @codeCoverageIgnoreEnd
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the actual resizing of the image.
+	 *
+	 * @param boolean $maintainRatio
+	 *
+	 * @return ImageMagickHandler
+	 * @throws Exception
+	 */
+	public function _resize(bool $maintainRatio = false)
+	{
+		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+		$destination = $this->getResourcePath();
+
+		$escape = '\\';
+		if (stripos(PHP_OS, 'WIN') === 0)
+		{
+			$escape = '';
+		}
+
+		$action = $maintainRatio === true
+			? ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' "' . $source . '" "' . $destination . '"'
+			: ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . "{$escape}! \"" . $source . '" "' . $destination . '"';
+
+		$this->process($action);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Crops the image.
+	 *
+	 * @return boolean|\CodeIgniter\Images\Handlers\ImageMagickHandler
+	 * @throws Exception
+	 */
+	public function _crop()
+	{
+		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+		$destination = $this->getResourcePath();
+
+		$extent = ' ';
+		if ($this->xAxis >= $this->width || $this->yAxis > $this->height)
+		{
+			$extent = ' -background transparent -extent ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' ';
+		}
+
+		$action = ' -crop ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . '+' . ($this->xAxis ?? 0) . '+' . ($this->yAxis ?? 0) . $extent . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+		$this->process($action);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles the rotation of an image resource.
+	 * Doesn't save the image, but replaces the current resource.
+	 *
+	 * @param integer $angle
+	 *
+	 * @return $this
+	 * @throws Exception
+	 */
+	protected function _rotate(int $angle)
+	{
+		$angle = '-rotate ' . $angle;
+
+		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+		$destination = $this->getResourcePath();
+
+		$action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+		$this->process($action);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flattens transparencies, default white background
+	 *
+	 * @param integer $red
+	 * @param integer $green
+	 * @param integer $blue
+	 *
+	 * @return $this
+	 * @throws Exception
+	 */
+	public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
+	{
+		$flatten = "-background 'rgb({$red},{$green},{$blue})' -flatten";
+
+		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+		$destination = $this->getResourcePath();
+
+		$action = ' ' . $flatten . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+		$this->process($action);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flips an image along it's vertical or horizontal axis.
+	 *
+	 * @param string $direction
+	 *
+	 * @return $this
+	 * @throws Exception
+	 */
+	public function _flip(string $direction)
+	{
+		$angle = $direction === 'horizontal' ? '-flop' : '-flip';
+
+		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+		$destination = $this->getResourcePath();
+
+		$action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+		$this->process($action);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get driver version
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		$result = $this->process('-version');
+
+		// The first line has the version in it...
+		preg_match('/(ImageMagick\s[\S]+)/', $result[0], $matches);
+
+		return str_replace('ImageMagick ', '', $matches[0]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles all of the grunt work of resizing, etc.
+	 *
+	 * @param string  $action
+	 * @param integer $quality
+	 *
+	 * @return array  Lines of output from shell command
+	 * @throws Exception
+	 */
+	protected function process(string $action, int $quality = 100): array
+	{
+		// Do we have a vaild library path?
+		if (empty($this->config->libraryPath))
+		{
+			throw ImageException::forInvalidImageLibraryPath($this->config->libraryPath);
+		}
+
+		if ($action !== '-version')
+		{
+			$this->supportedFormatCheck();
+		}
+
+		if (! preg_match('/convert$/i', $this->config->libraryPath))
+		{
+			$this->config->libraryPath = rtrim($this->config->libraryPath, '/') . '/convert';
+		}
+
+		$cmd  = $this->config->libraryPath;
+		$cmd .= $action === '-version' ? ' ' . $action : ' -quality ' . $quality . ' ' . $action;
+
+		$retval = 1;
+		$output = [];
+		// exec() might be disabled
+		if (function_usable('exec'))
+		{
+			@exec($cmd, $output, $retval);
+		}
+
+		// Did it work?
+		if ($retval > 0)
+		{
+			throw ImageException::forImageProcessFailed();
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves any changes that have been made to file. If no new filename is
+	 * provided, the existing image is overwritten, otherwise a copy of the
+	 * file is made at $target.
+	 *
+	 * Example:
+	 *    $image->resize(100, 200, true)
+	 *          ->save();
+	 *
+	 * @param string|null $target
+	 * @param integer     $quality
+	 *
+	 * @return boolean
+	 */
+	public function save(string $target = null, int $quality = 90): bool
+	{
+		$original = $target;
+		$target   = empty($target) ? $this->image()->getPathname() : $target;
+
+		// If no new resource has been created, then we're
+		// simply copy the existing one.
+		if (empty($this->resource) && $quality === 100)
+		{
+			if ($original === null)
+			{
+				return true;
+			}
+
+			$name = basename($target);
+			$path = pathinfo($target, PATHINFO_DIRNAME);
+
+			return $this->image()->copy($path, $name);
+		}
+
+		$this->ensureResource();
+
+		// Copy the file through ImageMagick so that it has
+		// a chance to convert file format.
+		$action = escapeshellarg($this->resource) . ' ' . escapeshellarg($target);
+
+		$result = $this->process($action, $quality);
+
+		unlink($this->resource);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get Image Resource
+	 *
+	 * This simply creates an image resource handle
+	 * based on the type of image being processed.
+	 * Since ImageMagick is used on the cli, we need to
+	 * ensure we have a temporary file on the server
+	 * that we can use.
+	 *
+	 * To ensure we can use all features, like transparency,
+	 * during the process, we'll use a PNG as the temp file type.
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	protected function getResourcePath()
+	{
+		if (! is_null($this->resource))
+		{
+			return $this->resource;
+		}
+
+		$this->resource = WRITEPATH . 'cache/' . time() . '_' . bin2hex(random_bytes(10)) . '.png';
+
+		$name = basename($this->resource);
+		$path = pathinfo($this->resource, PATHINFO_DIRNAME);
+
+		$this->image()->copy($path, $name);
+
+		return $this->resource;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Make the image resource object if needed
+	 *
+	 * @throws Exception
+	 */
+	protected function ensureResource()
+	{
+		$this->getResourcePath();
+
+		$this->supportedFormatCheck();
+	}
+
+	/**
+	 * Check if given image format is supported
+	 *
+	 * @throws ImageException
+	 */
+	protected function supportedFormatCheck()
+	{
+		switch ($this->image()->imageType)
+		{
+			case IMAGETYPE_WEBP:
+				if (! in_array('WEBP', Imagick::queryFormats(), true))
+				{
+					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+				}
+				break;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handler-specific method for overlaying text on an image.
+	 *
+	 * @param string $text
+	 * @param array  $options
+	 *
+	 * @throws Exception
+	 */
+	protected function _text(string $text, array $options = [])
+	{
+		$cmd = '';
+
+		// Reverse the vertical offset
+		// When the image is positioned at the bottom
+		// we don't want the vertical offset to push it
+		// further down. We want the reverse, so we'll
+		// invert the offset. Note: The horizontal
+		// offset flips itself automatically
+		if ($options['vAlign'] === 'bottom')
+		{
+			$options['vOffset'] = $options['vOffset'] * -1;
+		}
+
+		if ($options['hAlign'] === 'right')
+		{
+			$options['hOffset'] = $options['hOffset'] * -1;
+		}
+
+		// Font
+		if (! empty($options['fontPath']))
+		{
+			$cmd .= " -font '{$options['fontPath']}'";
+		}
+
+		if (isset($options['hAlign']) && isset($options['vAlign']))
+		{
+			switch ($options['hAlign'])
+			{
+				case 'left':
+					$xAxis   = $options['hOffset'] + $options['padding'];
+					$yAxis   = $options['vOffset'] + $options['padding'];
+					$gravity = $options['vAlign'] === 'top' ? 'NorthWest' : 'West';
+					if ($options['vAlign'] === 'bottom')
+					{
+						$gravity = 'SouthWest';
+						$yAxis   = $options['vOffset'] - $options['padding'];
+					}
+					break;
+				case 'center':
+					$xAxis   = $options['hOffset'] + $options['padding'];
+					$yAxis   = $options['vOffset'] + $options['padding'];
+					$gravity = $options['vAlign'] === 'top' ? 'North' : 'Center';
+					if ($options['vAlign'] === 'bottom')
+					{
+						$yAxis   = $options['vOffset'] - $options['padding'];
+						$gravity = 'South';
+					}
+					break;
+				case 'right':
+					$xAxis   = $options['hOffset'] - $options['padding'];
+					$yAxis   = $options['vOffset'] + $options['padding'];
+					$gravity = $options['vAlign'] === 'top' ? 'NorthEast' : 'East';
+					if ($options['vAlign'] === 'bottom')
+					{
+						$gravity = 'SouthEast';
+						$yAxis   = $options['vOffset'] - $options['padding'];
+					}
+					break;
+			}
+
+			$xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis; // @phpstan-ignore-line
+			$yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis; // @phpstan-ignore-line
+
+			$cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}"; // @phpstan-ignore-line
+		}
+
+		// Color
+		if (isset($options['color']))
+		{
+			[$r, $g, $b] = sscanf("#{$options['color']}", '#%02x%02x%02x');
+
+			$cmd .= " -fill 'rgba({$r},{$g},{$b},{$options['opacity']})'";
+		}
+
+		// Font Size - use points....
+		if (isset($options['fontSize']))
+		{
+			$cmd .= " -pointsize {$options['fontSize']}";
+		}
+
+		// Text
+		$cmd .= " -annotate 0 '{$text}'";
+
+		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+		$destination = $this->getResourcePath();
+
+		$cmd = " '{$source}' {$cmd} '{$destination}'";
+
+		$this->process($cmd);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the width of an image.
+	 *
+	 * @return integer
+	 */
+	public function _getWidth()
+	{
+		return imagesx(imagecreatefromstring(file_get_contents($this->resource)));
+	}
+
+	/**
+	 * Return the height of an image.
+	 *
+	 * @return integer
+	 */
+	public function _getHeight()
+	{
+		return imagesy(imagecreatefromstring(file_get_contents($this->resource)));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reads the EXIF information from the image and modifies the orientation
+	 * so that displays correctly in the browser. This is especially an issue
+	 * with images taken by smartphones who always store the image up-right,
+	 * but set the orientation flag to display it correctly.
+	 *
+	 * @param boolean $silent If true, will ignore exceptions when PHP doesn't support EXIF.
+	 *
+	 * @return $this
+	 */
+	public function reorient(bool $silent = false)
+	{
+		$orientation = $this->getEXIF('Orientation', $silent);
+
+		switch ($orientation)
+		{
+			case 2:
+				return $this->flip('horizontal');
+			case 3:
+				return $this->rotate(180);
+			case 4:
+				return $this->rotate(180)
+								->flip('horizontal');
+			case 5:
+				return $this->rotate(90)
+								->flip('horizontal');
+			case 6:
+				return $this->rotate(90);
+			case 7:
+				return $this->rotate(270)
+								->flip('horizontal');
+			case 8:
+				return $this->rotate(270);
+			default:
+				return $this;
+		}
+	}
+}
diff --git a/system/Images/Image.php b/system/Images/Image.php
new file mode 100644
index 0000000..82d2f1a
--- /dev/null
+++ b/system/Images/Image.php
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images;
+
+use CodeIgniter\Files\File;
+use CodeIgniter\Images\Exceptions\ImageException;
+
+/**
+ * Encapsulation of an Image file
+ */
+class Image extends File
+{
+	/**
+	 * The original image width in pixels.
+	 *
+	 * @var integer|float
+	 */
+	public $origWidth;
+
+	/**
+	 * The original image height in pixels.
+	 *
+	 * @var integer|float
+	 */
+	public $origHeight;
+
+	/**
+	 * The image type constant.
+	 *
+	 * @see http://php.net/manual/en/image.constants.php
+	 *
+	 * @var integer
+	 */
+	public $imageType;
+
+	/**
+	 * attributes string with size info:
+	 * 'height="100" width="200"'
+	 *
+	 * @var string
+	 */
+	public $sizeStr;
+
+	/**
+	 * The image's mime type, i.e. image/jpeg
+	 *
+	 * @var string
+	 */
+	public $mime;
+
+	/**
+	 * Makes a copy of itself to the new location. If no filename is provided
+	 * it will use the existing filename.
+	 *
+	 * @param string      $targetPath The directory to store the file in
+	 * @param string|null $targetName The new name of the copied file.
+	 * @param integer     $perms      File permissions to be applied after copy.
+	 *
+	 * @return boolean
+	 */
+	public function copy(string $targetPath, string $targetName = null, int $perms = 0644): bool
+	{
+		$targetPath = rtrim($targetPath, '/ ') . '/';
+
+		$targetName = is_null($targetName) ? $this->getFilename() : $targetName;
+
+		if (empty($targetName))
+		{
+			throw ImageException::forInvalidFile($targetName);
+		}
+
+		if (! is_dir($targetPath))
+		{
+			mkdir($targetPath, 0755, true);
+		}
+
+		if (! copy($this->getPathname(), "{$targetPath}{$targetName}"))
+		{
+			throw ImageException::forCopyError($targetPath);
+		}
+
+		chmod("{$targetPath}/{$targetName}", $perms);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get image properties
+	 *
+	 * A helper function that gets info about the file
+	 *
+	 * @param boolean $return
+	 *
+	 * @return array|boolean
+	 */
+	public function getProperties(bool $return = false)
+	{
+		$path = $this->getPathname();
+
+		if (! $vals = getimagesize($path))
+		{
+			throw ImageException::forFileNotSupported();
+		}
+
+		$types = [
+			IMAGETYPE_GIF  => 'gif',
+			IMAGETYPE_JPEG => 'jpeg',
+			IMAGETYPE_PNG  => 'png',
+			IMAGETYPE_WEBP => 'webp',
+		];
+
+		$mime = 'image/' . ($types[$vals[2]] ?? 'jpg');
+
+		if ($return === true)
+		{
+			return [
+				'width'      => $vals[0],
+				'height'     => $vals[1],
+				'image_type' => $vals[2],
+				'size_str'   => $vals[3],
+				'mime_type'  => $mime,
+			];
+		}
+
+		$this->origWidth  = $vals[0];
+		$this->origHeight = $vals[1];
+		$this->imageType  = $vals[2];
+		$this->sizeStr    = $vals[3];
+		$this->mime       = $mime;
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
new file mode 100644
index 0000000..15519f2
--- /dev/null
+++ b/system/Images/ImageHandlerInterface.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images;
+
+/**
+ * Expected behavior of an Image handler
+ */
+interface ImageHandlerInterface
+{
+	/**
+	 * Resize the image
+	 *
+	 * @param integer $width
+	 * @param integer $height
+	 * @param boolean $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
+	 * @param string  $masterDim
+	 *
+	 * @return $this
+	 */
+	public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Crops the image to the desired height and width. If one of the height/width values
+	 * is not provided, that value will be set the appropriate value based on offsets and
+	 * image dimensions.
+	 *
+	 * @param integer|null $width
+	 * @param integer|null $height
+	 * @param integer|null $x             X-axis coord to start cropping from the left of image
+	 * @param integer|null $y             Y-axis coord to start cropping from the top of image
+	 * @param boolean      $maintainRatio
+	 * @param string       $masterDim
+	 *
+	 * @return $this
+	 */
+	public function crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Changes the stored image type to indicate the new file format to use when saving.
+	 * Does not touch the actual resource.
+	 *
+	 * @param integer $imageType A PHP imagetype constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
+	 *
+	 * @return $this
+	 */
+	public function convert(int $imageType);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rotates the image on the current canvas.
+	 *
+	 * @param float $angle
+	 *
+	 * @return $this
+	 */
+	public function rotate(float $angle);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flattens transparencies, default white background
+	 *
+	 * @param integer $red
+	 * @param integer $green
+	 * @param integer $blue
+	 *
+	 * @return $this
+	 */
+	public function flatten(int $red = 255, int $green = 255, int $blue = 255);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reads the EXIF information from the image and modifies the orientation
+	 * so that displays correctly in the browser.
+	 *
+	 * @return ImageHandlerInterface
+	 */
+	public function reorient();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the EXIF information from the image, if possible. Returns
+	 * an array of the information, or null if nothing can be found.
+	 *
+	 * @param string|null $key If specified, will only return this piece of EXIF data.
+	 *
+	 * @return mixed
+	 */
+	public function getEXIF(string $key = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Flip an image horizontally or vertically
+	 *
+	 * @param string $dir Direction to flip, either 'vertical' or 'horizontal'
+	 *
+	 * @return $this
+	 */
+	public function flip(string $dir = 'vertical');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combine cropping and resizing into a single command.
+	 *
+	 * Supported positions:
+	 *  - top-left
+	 *  - top
+	 *  - top-right
+	 *  - left
+	 *  - center
+	 *  - right
+	 *  - bottom-left
+	 *  - bottom
+	 *  - bottom-right
+	 *
+	 * @param integer $width
+	 * @param integer $height
+	 * @param string  $position
+	 *
+	 * @return $this
+	 */
+	public function fit(int $width, int $height, string $position);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overlays a string of text over the image.
+	 *
+	 * Valid options:
+	 *
+	 *  - color         Text Color (hex number)
+	 *  - shadowColor   Color of the shadow (hex number)
+	 *  - hAlign        Horizontal alignment: left, center, right
+	 *  - vAlign        Vertical alignment: top, middle, bottom
+	 *  - hOffset
+	 *  - vOffset
+	 *  - fontPath
+	 *  - fontSize
+	 *  - shadowOffset
+	 *
+	 * @param string $text
+	 * @param array  $options
+	 *
+	 * @return $this
+	 */
+	public function text(string $text, array $options = []);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves any changes that have been made to file.
+	 *
+	 * Example:
+	 *    $image->resize(100, 200, true)
+	 *          ->save($target);
+	 *
+	 * @param string  $target
+	 * @param integer $quality
+	 *
+	 * @return boolean
+	 */
+	public function save(string $target = null, int $quality = 90);
+}
diff --git a/system/Language/Language.php b/system/Language/Language.php
new file mode 100644
index 0000000..be66b8a
--- /dev/null
+++ b/system/Language/Language.php
@@ -0,0 +1,328 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Language;
+
+use Config\Services;
+use MessageFormatter;
+
+/**
+ * Handle system messages and localization.
+ *
+ * Locale-based, built on top of PHP internationalization.
+ */
+class Language
+{
+	/**
+	 * Stores the retrieved language lines
+	 * from files for faster retrieval on
+	 * second use.
+	 *
+	 * @var array
+	 */
+	protected $language = [];
+
+	/**
+	 * The current language/locale to work with.
+	 *
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
+	 * Boolean value whether the intl
+	 * libraries exist on the system.
+	 *
+	 * @var boolean
+	 */
+	protected $intlSupport = false;
+
+	/**
+	 * Stores filenames that have been
+	 * loaded so that we don't load them again.
+	 *
+	 * @var array
+	 */
+	protected $loadedFiles = [];
+
+	//--------------------------------------------------------------------
+
+	public function __construct(string $locale)
+	{
+		$this->locale = $locale;
+
+		if (class_exists('MessageFormatter'))
+		{
+			$this->intlSupport = true;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current locale to use when performing string lookups.
+	 *
+	 * @param string $locale
+	 *
+	 * @return $this
+	 */
+	public function setLocale(string $locale = null)
+	{
+		if (! is_null($locale))
+		{
+			$this->locale = $locale;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * @return string
+	 */
+	public function getLocale(): string
+	{
+		return $this->locale;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the language string for a file, loads the file, if necessary,
+	 * getting the line.
+	 *
+	 * @param string $line Line.
+	 * @param array  $args Arguments.
+	 *
+	 * @return string|string[] Returns line.
+	 */
+	public function getLine(string $line, array $args = [])
+	{
+		// if no file is given, just parse the line
+		if (strpos($line, '.') === false)
+		{
+			return $this->formatMessage($line, $args);
+		}
+
+		// Parse out the file name and the actual alias.
+		// Will load the language file and strings.
+		[$file, $parsedLine] = $this->parseLine($line, $this->locale);
+
+		$output = $this->getTranslationOutput($this->locale, $file, $parsedLine);
+
+		if ($output === null && strpos($this->locale, '-'))
+		{
+			[$locale] = explode('-', $this->locale, 2);
+
+			[$file, $parsedLine] = $this->parseLine($line, $locale);
+
+			$output = $this->getTranslationOutput($locale, $file, $parsedLine);
+		}
+
+		// if still not found, try English
+		if ($output === null)
+		{
+			[$file, $parsedLine] = $this->parseLine($line, 'en');
+
+			$output = $this->getTranslationOutput('en', $file, $parsedLine);
+		}
+
+		$output = $output ?? $line;
+
+		return $this->formatMessage($output, $args);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * @return array|string|null
+	 */
+	protected function getTranslationOutput(string $locale, string $file, string $parsedLine)
+	{
+		$output = $this->language[$locale][$file][$parsedLine] ?? null;
+		if ($output !== null)
+		{
+			return $output;
+		}
+
+		foreach (explode('.', $parsedLine) as $row)
+		{
+			if (! isset($current))
+			{
+				$current = $this->language[$locale][$file] ?? null;
+			}
+
+			$output = $current[$row] ?? null;
+			if (is_array($output))
+			{
+				$current = $output;
+			}
+		}
+
+		if ($output !== null)
+		{
+			return $output;
+		}
+
+		$row = current(explode('.', $parsedLine));
+		$key = substr($parsedLine, strlen($row) + 1);
+
+		return $this->language[$locale][$file][$row][$key] ?? null;
+	}
+
+	/**
+	 * Parses the language string which should include the
+	 * filename as the first segment (separated by period).
+	 *
+	 * @param string $line
+	 * @param string $locale
+	 *
+	 * @return array
+	 */
+	protected function parseLine(string $line, string $locale): array
+	{
+		$file = substr($line, 0, strpos($line, '.'));
+		$line = substr($line, strlen($file) + 1);
+
+		if (! isset($this->language[$locale][$file]) || ! array_key_exists($line, $this->language[$locale][$file]))
+		{
+			$this->load($file, $locale);
+		}
+
+		return [
+			$file,
+			$line,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Advanced message formatting.
+	 *
+	 * @param string|array $message Message.
+	 * @param array	       $args    Arguments.
+	 *
+	 * @return string|array Returns formatted message.
+	 */
+	protected function formatMessage($message, array $args = [])
+	{
+		if (! $this->intlSupport || $args === [])
+		{
+			return $message;
+		}
+
+		if (is_array($message))
+		{
+			foreach ($message as $index => $value)
+			{
+				$message[$index] = $this->formatMessage($value, $args);
+			}
+
+			return $message;
+		}
+
+		return MessageFormatter::formatMessage($this->locale, $message, $args);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a language file in the current locale. If $return is true,
+	 * will return the file's contents, otherwise will merge with
+	 * the existing language lines.
+	 *
+	 * @param string  $file
+	 * @param string  $locale
+	 * @param boolean $return
+	 *
+	 * @return void|array
+	 */
+	protected function load(string $file, string $locale, bool $return = false)
+	{
+		if (! array_key_exists($locale, $this->loadedFiles))
+		{
+			$this->loadedFiles[$locale] = [];
+		}
+
+		if (in_array($file, $this->loadedFiles[$locale], true))
+		{
+			// Don't load it more than once.
+			return [];
+		}
+
+		if (! array_key_exists($locale, $this->language))
+		{
+			$this->language[$locale] = [];
+		}
+
+		if (! array_key_exists($file, $this->language[$locale]))
+		{
+			$this->language[$locale][$file] = [];
+		}
+
+		$path = "Language/{$locale}/{$file}.php";
+
+		$lang = $this->requireFile($path);
+
+		if ($return)
+		{
+			return $lang;
+		}
+
+		$this->loadedFiles[$locale][] = $file;
+
+		// Merge our string
+		$this->language[$locale][$file] = $lang;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A simple method for including files that can be
+	 * overridden during testing.
+	 *
+	 * @param string $path
+	 *
+	 * @return array
+	 */
+	protected function requireFile(string $path): array
+	{
+		$files   = Services::locator()->search($path, 'php', false);
+		$strings = [];
+
+		foreach ($files as $file)
+		{
+			// On some OS's we were seeing failures
+			// on this command returning boolean instead
+			// of array during testing, so we've removed
+			// the require_once for now.
+			if (is_file($file))
+			{
+				$strings[] = require $file;
+			}
+		}
+
+		if (isset($strings[1]))
+		{
+			$strings = array_replace_recursive(...$strings);
+		}
+		elseif (isset($strings[0]))
+		{
+			$strings = $strings[0];
+		}
+
+		return $strings;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Language/en/CLI.php b/system/Language/en/CLI.php
new file mode 100644
index 0000000..ad2bafc
--- /dev/null
+++ b/system/Language/en/CLI.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// CLI language settings
+return [
+	'altCommandPlural'    => 'Did you mean one of these?',
+	'altCommandSingular'  => 'Did you mean this?',
+	'commandNotFound'     => 'Command "{0}" not found.',
+	'generator'           => [
+		'cancelOperation'  => 'Operation has been cancelled.',
+		'className'        => [
+			'command'    => 'Command class name',
+			'config'     => 'Config class name',
+			'controller' => 'Controller class name',
+			'default'    => 'Class name',
+			'entity'     => 'Entity class name',
+			'filter'     => 'Filter class name',
+			'migration'  => 'Migration class name',
+			'model'      => 'Model class name',
+			'seeder'     => 'Seeder class name',
+			'validation' => 'Validation class name',
+		],
+		'commandType'      => 'Command type',
+		'databaseGroup'    => 'Database group',
+		'fileCreate'       => 'File created: {0}',
+		'fileError'        => 'Error while creating file: {0}',
+		'fileExist'        => 'File exists: {0}',
+		'fileOverwrite'    => 'File overwritten: {0}',
+		'parentClass'      => 'Parent class',
+		'returnType'       => 'Return type',
+		'tableName'        => 'Table name',
+		'usingCINamespace' => 'Warning: Using the "CodeIgniter" namespace will generate the file in the system directory.'
+	],
+	'helpArguments'       => 'Arguments:',
+	'helpDescription'     => 'Description:',
+	'helpOptions'         => 'Options:',
+	'helpUsage'           => 'Usage:',
+	'invalidColor'        => 'Invalid {0} color: {1}.',
+	'namespaceNotDefined' => 'Namespace "{0}" is not defined.',
+];
diff --git a/system/Language/en/Cache.php b/system/Language/en/Cache.php
new file mode 100644
index 0000000..5780670
--- /dev/null
+++ b/system/Language/en/Cache.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Cache language settings
+return [
+	'unableToWrite'   => 'Cache unable to write to {0}.',
+	'invalidHandlers' => 'Cache config must have an array of $validHandlers.',
+	'noBackup'        => 'Cache config must have a handler and backupHandler set.',
+	'handlerNotFound' => 'Cache config has an invalid handler or backup handler specified.',
+];
diff --git a/system/Language/en/Cast.php b/system/Language/en/Cast.php
new file mode 100644
index 0000000..6fb9f4b
--- /dev/null
+++ b/system/Language/en/Cast.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Cast language settings
+return [
+	'baseCastMissing'        => 'The "{0}" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class.',
+	'invalidCastMethod'      => 'The "{0}" is invalid cast method, valid methods are: ["get", "set"].',
+	'invalidTimestamp'       => 'Type casting "timestamp" expects a correct timestamp.',
+	'jsonErrorCtrlChar'      => 'Unexpected control character found.',
+	'jsonErrorDepth'         => 'Maximum stack depth exceeded.',
+	'jsonErrorStateMismatch' => 'Underflow or the modes mismatch.',
+	'jsonErrorSyntax'        => 'Syntax error, malformed JSON.',
+	'jsonErrorUnknown'       => 'Unknown error.',
+	'jsonErrorUtf8'          => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
+];
diff --git a/system/Language/en/Cookie.php b/system/Language/en/Cookie.php
new file mode 100644
index 0000000..cc64d46
--- /dev/null
+++ b/system/Language/en/Cookie.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Cookie language settings
+return [
+   'invalidExpiresTime'    => 'Invalid "{0}" type for "Expires" attribute. Expected: string, integer, DateTimeInterface object.',
+   'invalidExpiresValue'   => 'The cookie expiration time is not valid.',
+   'invalidCookieName'     => 'The cookie name "{0}" contains invalid characters.',
+   'emptyCookieName'       => 'The cookie name cannot be empty.',
+   'invalidSecurePrefix'   => 'Using the "__Secure-" prefix requires setting the "Secure" attribute.',
+   'invalidHostPrefix'     => 'Using the "__Host-" prefix must be set with the "Secure" flag, must not have a "Domain" attribute, and the "Path" is set to "/".',
+   'invalidSameSite'       => 'The SameSite value must be None, Lax, Strict or a blank string, {0} given.',
+   'invalidSameSiteNone'   => 'Using the "SameSite=None" attribute requires setting the "Secure" attribute.',
+   'invalidCookieInstance' => '"{0}" class expected cookies array to be instances of "{1}" but got "{2}" at index {3}.',
+   'unknownCookieInstance' => 'Cookie object with name "{0}" and prefix "{1}" was not found in the collection.',
+];
diff --git a/system/Language/en/Core.php b/system/Language/en/Core.php
new file mode 100644
index 0000000..82e0397
--- /dev/null
+++ b/system/Language/en/Core.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Core language settings
+return [
+	'copyError'                    => 'An error was encountered while attempting to replace the file ({0}). Please make sure your file directory is writable.',
+	'enabledZlibOutputCompression' => 'Your zlib.output_compression ini directive is turned on. This will not work well with output buffers.',
+	'invalidFile'                  => 'Invalid file: {0}',
+	'invalidPhpVersion'            => 'Your PHP version must be {0} or higher to run CodeIgniter. Current version: {1}',
+	'missingExtension'             => 'The framework needs the following extension(s) installed and loaded: {0}.',
+	'noHandlers'                   => '{0} must provide at least one Handler.',
+];
diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php
new file mode 100644
index 0000000..4e04aee
--- /dev/null
+++ b/system/Language/en/Database.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Database language settings
+return [
+	'invalidEvent'                     => '{0} is not a valid Model Event callback.',
+	'invalidArgument'                  => 'You must provide a valid {0}.',
+	'invalidAllowedFields'             => 'Allowed fields must be specified for model: {0}',
+	'emptyDataset'                     => 'There is no data to {0}.',
+	'emptyPrimaryKey'                  => 'There is no primary key defined when trying to make {0}.',
+	'failGetFieldData'                 => 'Failed to get field data from database.',
+	'failGetIndexData'                 => 'Failed to get index data from database.',
+	'failGetForeignKeyData'            => 'Failed to get foreign key data from database.',
+	'parseStringFail'                  => 'Parsing key string failed.',
+	'featureUnavailable'               => 'This feature is not available for the database you are using.',
+	'tableNotFound'                    => 'Table `{0}` was not found in the current database.',
+	'noPrimaryKey'                     => '`{0}` model class does not specify a Primary Key.',
+	'noDateFormat'                     => '`{0}` model class does not have a valid dateFormat.',
+	'fieldNotExists'                   => 'Field `{0}` not found.',
+	'forEmptyInputGiven'               => 'Empty statement is given for the field `{0}`',
+	'forFindColumnHaveMultipleColumns' => 'Only single column allowed in Column name.',
+];
diff --git a/system/Language/en/Email.php b/system/Language/en/Email.php
new file mode 100644
index 0000000..2abdd93
--- /dev/null
+++ b/system/Language/en/Email.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Email language settings
+return [
+	'mustBeArray'          => 'The email validation method must be passed an array.',
+	'invalidAddress'       => 'Invalid email address: {0}',
+	'attachmentMissing'    => 'Unable to locate the following email attachment: {0}',
+	'attachmentUnreadable' => 'Unable to open this attachment: {0}',
+	'noFrom'               => 'Cannot send mail with no "From" header.',
+	'noRecipients'         => 'You must include recipients: To, Cc, or Bcc',
+	'sendFailurePHPMail'   => 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.',
+	'sendFailureSendmail'  => 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.',
+	'sendFailureSmtp'      => 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.',
+	'sent'                 => 'Your message has been successfully sent using the following protocol: {0}',
+	'noSocket'             => 'Unable to open a socket to Sendmail. Please check settings.',
+	'noHostname'           => 'You did not specify a SMTP hostname.',
+	'SMTPError'            => 'The following SMTP error was encountered: {0}',
+	'noSMTPAuth'           => 'Error: You must assign a SMTP username and password.',
+	'failedSMTPLogin'      => 'Failed to send AUTH LOGIN command. Error: {0}',
+	'SMTPAuthUsername'     => 'Failed to authenticate username. Error: {0}',
+	'SMTPAuthPassword'     => 'Failed to authenticate password. Error: {0}',
+	'SMTPDataFailure'      => 'Unable to send data: {0}',
+	'exitStatus'           => 'Exit status code: {0}',
+];
diff --git a/system/Language/en/Encryption.php b/system/Language/en/Encryption.php
new file mode 100644
index 0000000..756eeaa
--- /dev/null
+++ b/system/Language/en/Encryption.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Encryption language settings
+return [
+	'noDriverRequested'    => 'No driver requested; Miss Daisy will be so upset!',
+	'noHandlerAvailable'   => 'Unable to find an available {0} encryption handler.',
+	'unKnownHandler'       => '"{0}" cannot be configured.',
+	'starterKeyNeeded'     => 'Encrypter needs a starter key.',
+	'authenticationFailed' => 'Decrypting: authentication failed.',
+	'encryptionFailed'     => 'Encryption failed.',
+];
diff --git a/system/Language/en/Fabricator.php b/system/Language/en/Fabricator.php
new file mode 100644
index 0000000..4e4ecb3
--- /dev/null
+++ b/system/Language/en/Fabricator.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Fabricator language settings
+return [
+	'invalidModel'      => 'Invalid model supplied for fabrication.',
+	'missingFormatters' => 'No valid formatters defined.',
+	'createFailed'      => 'Fabricator failed to insert on table {0}: {1}',
+];
diff --git a/system/Language/en/Files.php b/system/Language/en/Files.php
new file mode 100644
index 0000000..772ad8c
--- /dev/null
+++ b/system/Language/en/Files.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Files language settings
+return [
+	'fileNotFound' => 'File not found: {0}',
+	'cannotMove'   => 'Could not move file {0} to {1} ({2}).',
+];
diff --git a/system/Language/en/Filters.php b/system/Language/en/Filters.php
new file mode 100644
index 0000000..4fc860f
--- /dev/null
+++ b/system/Language/en/Filters.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Filters language settings
+return [
+	'noFilter'           => '{0} filter must have a matching alias defined.',
+	'incorrectInterface' => '{0} must implement CodeIgniter\Filters\FilterInterface.',
+];
diff --git a/system/Language/en/Format.php b/system/Language/en/Format.php
new file mode 100644
index 0000000..383b5b5
--- /dev/null
+++ b/system/Language/en/Format.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Format language settings
+return [
+	'invalidFormatter' => '"{0}" is not a valid Formatter class.',
+	'invalidJSON'      => 'Failed to parse json string, error: "{0}".',
+	'invalidMime'      => 'No Formatter defined for mime type: "{0}".',
+	'missingExtension' => 'The SimpleXML extension is required to format XML.',
+];
diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
new file mode 100644
index 0000000..a70f50d
--- /dev/null
+++ b/system/Language/en/HTTP.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// HTTP language settings
+return [
+	// CurlRequest
+	'missingCurl'                => 'CURL must be enabled to use the CURLRequest class.',
+	'invalidSSLKey'              => 'Cannot set SSL Key. {0} is not a valid file.',
+	'sslCertNotFound'            => 'SSL certificate not found at: {0}',
+	'curlError'                  => '{0} : {1}',
+
+	// IncomingRequest
+	'invalidNegotiationType'     => '{0} is not a valid negotiation type. Must be one of: media, charset, encoding, language.',
+
+	// Message
+	'invalidHTTPProtocol'        => 'Invalid HTTP Protocol Version. Must be one of: {0}',
+
+	// Negotiate
+	'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.',
+
+	// RedirectResponse
+	'invalidRoute'               => '{0} route cannot be found while reverse-routing.',
+
+	// DownloadResponse
+	'cannotSetBinary'            => 'When setting filepath cannot set binary.',
+	'cannotSetFilepath'          => 'When setting binary cannot set filepath: {0}',
+	'notFoundDownloadSource'     => 'Not found download body source.',
+	'cannotSetCache'             => 'It does not support caching for downloading.',
+	'cannotSetStatusCode'        => 'It does not support change status code for downloading. code: {0}, reason: {1}',
+
+	// Response
+	'missingResponseStatus'      => 'HTTP Response is missing a status code',
+	'invalidStatusCode'          => '{0} is not a valid HTTP return status code',
+	'unknownStatusCode'          => 'Unknown HTTP status code provided with no message: {0}',
+
+	// URI
+	'cannotParseURI'             => 'Unable to parse URI: {0}',
+	'segmentOutOfRange'          => 'Request URI segment is out of range: {0}',
+	'invalidPort'                => 'Ports must be between 0 and 65535. Given: {0}',
+	'malformedQueryString'       => 'Query strings may not include URI fragments.',
+
+	// Page Not Found
+	'pageNotFound'               => 'Page Not Found',
+	'emptyController'            => 'No Controller specified.',
+	'controllerNotFound'         => 'Controller or its method is not found: {0}::{1}',
+	'methodNotFound'             => 'Controller method is not found: {0}',
+
+	// CSRF
+	// @deprecated use `Security.disallowedAction`
+	'disallowedAction'           => 'The action you requested is not allowed.',
+
+	// Uploaded file moving
+	'alreadyMoved'               => 'The uploaded file has already been moved.',
+	'invalidFile'                => 'The original file is not a valid file.',
+	'moveFailed'                 => 'Could not move file {0} to {1} ({2})',
+
+	'uploadErrOk'                => 'The file uploaded with success.',
+	'uploadErrIniSize'           => 'The file "%s" exceeds your upload_max_filesize ini directive.',
+	'uploadErrFormSize'          => 'The file "%s" exceeds the upload limit defined in your form.',
+	'uploadErrPartial'           => 'The file "%s" was only partially uploaded.',
+	'uploadErrNoFile'            => 'No file was uploaded.',
+	'uploadErrCantWrite'         => 'The file "%s" could not be written on disk.',
+	'uploadErrNoTmpDir'          => 'File could not be uploaded: missing temporary directory.',
+	'uploadErrExtension'         => 'File upload was stopped by a PHP extension.',
+	'uploadErrUnknown'           => 'The file "%s" was not uploaded due to an unknown error.',
+
+	// SameSite setting
+	// @deprecated
+	'invalidSameSiteSetting'     => 'The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/system/Language/en/Images.php b/system/Language/en/Images.php
new file mode 100644
index 0000000..5ad5ea6
--- /dev/null
+++ b/system/Language/en/Images.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Images language settings
+return [
+	'sourceImageRequired'    => 'You must specify a source image in your preferences.',
+	'gdRequired'             => 'The GD image library is required to use this feature.',
+	'gdRequiredForProps'     => 'Your server must support the GD image library in order to determine the image properties.',
+	'gifNotSupported'        => 'GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.',
+	'jpgNotSupported'        => 'JPG images are not supported.',
+	'pngNotSupported'        => 'PNG images are not supported.',
+	'webpNotSupported'       => 'WEBP images are not supported.',
+	'fileNotSupported'       => 'The supplied file is not a supported image type.',
+	'unsupportedImageCreate' => 'Your server does not support the GD function required to process this type of image.',
+	'jpgOrPngRequired'       => 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.',
+	'rotateUnsupported'      => 'Image rotation does not appear to be supported by your server.',
+	'libPathInvalid'         => 'The path to your image library is not correct. Please set the correct path in your image preferences. {0}',
+	'imageProcessFailed'     => 'Image processing failed. Please verify that your server supports the chosen protocol and that the path to your image library is correct.',
+	'rotationAngleRequired'  => 'An angle of rotation is required to rotate the image.',
+	'invalidPath'            => 'The path to the image is not correct.',
+	'copyFailed'             => 'The image copy routine failed.',
+	'missingFont'            => 'Unable to find a font to use.',
+	'saveFailed'             => 'Unable to save the image. Please make sure the image and file directory are writable.',
+	'invalidDirection'       => 'Flip direction can be only `vertical` or `horizontal`. Given: {0}',
+	'exifNotSupported'       => 'Reading EXIF data is not supported by this PHP installation.',
+];
diff --git a/system/Language/en/Log.php b/system/Language/en/Log.php
new file mode 100644
index 0000000..84f5ae1
--- /dev/null
+++ b/system/Language/en/Log.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Log language settings
+return [
+	'invalidLogLevel'    => '{0} is an invalid log level.',
+	'invalidMessageType' => 'The given message type "{0}" is not supported.',
+];
diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
new file mode 100644
index 0000000..05335cd
--- /dev/null
+++ b/system/Language/en/Migrations.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Migration language settings
+return [
+	// Migration Runner
+	'missingTable'      => 'Migrations table must be set.',
+	'disabled'          => 'Migrations have been loaded but are disabled or setup incorrectly.',
+	'notFound'          => 'Migration file not found: ',
+	'batchNotFound'     => 'Target batch not found: ',
+	'empty'             => 'No Migration files found',
+	'gap'               => 'There is a gap in the migration sequence near version number: ',
+	'classNotFound'     => 'The migration class "%s" could not be found.',
+	'missingMethod'     => 'The migration class is missing an "%s" method.',
+
+	// Migration Command
+	'migHelpLatest'     => "\t\tMigrates database to latest available migration.",
+	'migHelpCurrent'    => "\t\tMigrates database to version set as 'current' in configuration.",
+	'migHelpVersion'    => "\tMigrates database to version {v}.",
+	'migHelpRollback'   => "\tRuns all migrations 'down' to version 0.",
+	'migHelpRefresh'    => "\t\tUninstalls and re-runs all migrations to freshen database.",
+	'migHelpSeed'       => "\tRuns the seeder named [name].",
+	'migCreate'         => "\tCreates a new migration named [name]",
+	'nameMigration'     => 'Name the migration file',
+	'migNumberError'    => 'Migration number must be three digits, and there must not be any gaps in the sequence.',
+	'rollBackConfirm'   => 'Are you sure you want to rollback?',
+	'refreshConfirm'    => 'Are you sure you want to refresh?',
+
+	'latest'            => 'Running all new migrations...',
+	'generalFault'      => 'Migration failed!',
+	'migInvalidVersion' => 'Invalid version number provided.',
+	'toVersionPH'       => 'Migrating to version %s...',
+	'toVersion'         => 'Migrating to current version...',
+	'rollingBack'       => 'Rolling back migrations to batch: ',
+	'noneFound'         => 'No migrations were found.',
+	'migSeeder'         => 'Seeder name',
+	'migMissingSeeder'  => 'You must provide a seeder name.',
+	'nameSeeder'        => 'Name the seeder file',
+	'removed'           => 'Rolling back: ',
+	'added'             => 'Running: ',
+
+	// Migrate Status
+	'namespace'         => 'Namespace',
+	'filename'          => 'Filename',
+	'version'           => 'Version',
+	'group'             => 'Group',
+	'on'                => 'Migrated On: ',
+	'batch'             => 'Batch',
+];
diff --git a/system/Language/en/Number.php b/system/Language/en/Number.php
new file mode 100644
index 0000000..117c892
--- /dev/null
+++ b/system/Language/en/Number.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Number language settings
+return [
+	'terabyteAbbr' => 'TB',
+	'gigabyteAbbr' => 'GB',
+	'megabyteAbbr' => 'MB',
+	'kilobyteAbbr' => 'KB',
+	'bytes'        => 'Bytes',
+
+	// don't forget the space in front of these!
+	'thousand'     => ' thousand',
+	'million'      => ' million',
+	'billion'      => ' billion',
+	'trillion'     => ' trillion',
+	'quadrillion'  => ' quadrillion',
+];
diff --git a/system/Language/en/Pager.php b/system/Language/en/Pager.php
new file mode 100644
index 0000000..f89fb99
--- /dev/null
+++ b/system/Language/en/Pager.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Pager language settings
+return [
+	'pageNavigation'         => 'Page navigation',
+	'first'                  => 'First',
+	'previous'               => 'Previous',
+	'next'                   => 'Next',
+	'last'                   => 'Last',
+	'older'                  => 'Older',
+	'newer'                  => 'Newer',
+	'invalidTemplate'        => '{0} is not a valid Pager template.',
+	'invalidPaginationGroup' => '{0} is not a valid Pagination group.',
+];
diff --git a/system/Language/en/RESTful.php b/system/Language/en/RESTful.php
new file mode 100644
index 0000000..6a8341d
--- /dev/null
+++ b/system/Language/en/RESTful.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// RESTful language settings
+return [
+	'notImplemented' => '"{0}" action not implemented.',
+];
diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php
new file mode 100644
index 0000000..450b1c3
--- /dev/null
+++ b/system/Language/en/Router.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Router language settings
+return [
+	'invalidParameter'    => 'A parameter does not match the expected type.',
+	'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
+];
diff --git a/system/Language/en/Security.php b/system/Language/en/Security.php
new file mode 100644
index 0000000..a09c358
--- /dev/null
+++ b/system/Language/en/Security.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Security language settings
+return [
+	'disallowedAction' => 'The action you requested is not allowed.',
+
+	// @deprecated
+	'invalidSameSite'  => 'The SameSite value must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/system/Language/en/Session.php b/system/Language/en/Session.php
new file mode 100644
index 0000000..606860d
--- /dev/null
+++ b/system/Language/en/Session.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Session language settings
+return [
+	'missingDatabaseTable'   => '`sessionSavePath` must have the table name for the Database Session Handler to work.',
+	'invalidSavePath'        => 'Session: Configured save path "{0}" is not a directory, does not exist or cannot be created.',
+	'writeProtectedSavePath' => 'Session: Configured save path "{0}" is not writable by the PHP process.',
+	'emptySavePath'          => 'Session: No save path configured.',
+	'invalidSavePathFormat'  => 'Session: Invalid Redis save path format: {0}',
+
+	// @deprecated
+	'invalidSameSiteSetting' => 'Session: The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/system/Language/en/Time.php b/system/Language/en/Time.php
new file mode 100644
index 0000000..47117b2
--- /dev/null
+++ b/system/Language/en/Time.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Time language settings
+return [
+	'invalidFormat'  => '"{0}" is not a valid datetime format',
+	'invalidMonth'   => 'Months must be between 1 and 12. Given: {0}',
+	'invalidDay'     => 'Days must be between 1 and 31. Given: {0}',
+	'invalidOverDay' => 'Days must be between 1 and {0}. Given: {1}',
+	'invalidHours'   => 'Hours must be between 0 and 23. Given: {0}',
+	'invalidMinutes' => 'Minutes must be between 0 and 59. Given: {0}',
+	'invalidSeconds' => 'Seconds must be between 0 and 59. Given: {0}',
+	'years'          => '{0, plural, =1{# year} other{# years}}',
+	'months'         => '{0, plural, =1{# month} other{# months}}',
+	'weeks'          => '{0, plural, =1{# week} other{# weeks}}',
+	'days'           => '{0, plural, =1{# day} other{# days}}',
+	'hours'          => '{0, plural, =1{# hour} other{# hours}}',
+	'minutes'        => '{0, plural, =1{# minute} other{# minutes}}',
+	'seconds'        => '{0, plural, =1{# second} other{# seconds}}',
+	'ago'            => '{0} ago',
+	'inFuture'       => 'in {0}',
+	'yesterday'      => 'Yesterday',
+	'tomorrow'       => 'Tomorrow',
+	'now'            => 'Just now',
+];
diff --git a/system/Language/en/Validation.php b/system/Language/en/Validation.php
new file mode 100644
index 0000000..63982a5
--- /dev/null
+++ b/system/Language/en/Validation.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Validation language settings
+return [
+	// Core Messages
+	'noRuleSets'            => 'No rulesets specified in Validation configuration.',
+	'ruleNotFound'          => '{0} is not a valid rule.',
+	'groupNotFound'         => '{0} is not a validation rules group.',
+	'groupNotArray'         => '{0} rule group must be an array.',
+	'invalidTemplate'       => '{0} is not a valid Validation template.',
+
+	// Rule Messages
+	'alpha'                 => 'The {field} field may only contain alphabetical characters.',
+	'alpha_dash'            => 'The {field} field may only contain alphanumeric, underscore, and dash characters.',
+	'alpha_numeric'         => 'The {field} field may only contain alphanumeric characters.',
+	'alpha_numeric_punct'   => 'The {field} field may contain only alphanumeric characters, spaces, and  ~ ! # $ % & * - _ + = | : . characters.',
+	'alpha_numeric_space'   => 'The {field} field may only contain alphanumeric and space characters.',
+	'alpha_space'           => 'The {field} field may only contain alphabetical characters and spaces.',
+	'decimal'               => 'The {field} field must contain a decimal number.',
+	'differs'               => 'The {field} field must differ from the {param} field.',
+	'equals'                => 'The {field} field must be exactly: {param}.',
+	'exact_length'          => 'The {field} field must be exactly {param} characters in length.',
+	'greater_than'          => 'The {field} field must contain a number greater than {param}.',
+	'greater_than_equal_to' => 'The {field} field must contain a number greater than or equal to {param}.',
+	'hex'                   => 'The {field} field may only contain hexidecimal characters.',
+	'in_list'               => 'The {field} field must be one of: {param}.',
+	'integer'               => 'The {field} field must contain an integer.',
+	'is_natural'            => 'The {field} field must only contain digits.',
+	'is_natural_no_zero'    => 'The {field} field must only contain digits and must be greater than zero.',
+	'is_not_unique'         => 'The {field} field must contain a previously existing value in the database.',
+	'is_unique'             => 'The {field} field must contain a unique value.',
+	'less_than'             => 'The {field} field must contain a number less than {param}.',
+	'less_than_equal_to'    => 'The {field} field must contain a number less than or equal to {param}.',
+	'matches'               => 'The {field} field does not match the {param} field.',
+	'max_length'            => 'The {field} field cannot exceed {param} characters in length.',
+	'min_length'            => 'The {field} field must be at least {param} characters in length.',
+	'not_equals'            => 'The {field} field cannot be: {param}.',
+	'not_in_list'           => 'The {field} field must not be one of: {param}.',
+	'numeric'               => 'The {field} field must contain only numbers.',
+	'regex_match'           => 'The {field} field is not in the correct format.',
+	'required'              => 'The {field} field is required.',
+	'required_with'         => 'The {field} field is required when {param} is present.',
+	'required_without'      => 'The {field} field is required when {param} is not present.',
+	'string'                => 'The {field} field must be a valid string.',
+	'timezone'              => 'The {field} field must be a valid timezone.',
+	'valid_base64'          => 'The {field} field must be a valid base64 string.',
+	'valid_email'           => 'The {field} field must contain a valid email address.',
+	'valid_emails'          => 'The {field} field must contain all valid email addresses.',
+	'valid_ip'              => 'The {field} field must contain a valid IP.',
+	'valid_url'             => 'The {field} field must contain a valid URL.',
+	'valid_date'            => 'The {field} field must contain a valid date.',
+
+	// Credit Cards
+	'valid_cc_num'          => '{field} does not appear to be a valid credit card number.',
+
+	// Files
+	'uploaded'              => '{field} is not a valid uploaded file.',
+	'max_size'              => '{field} is too large of a file.',
+	'is_image'              => '{field} is not a valid, uploaded image file.',
+	'mime_in'               => '{field} does not have a valid mime type.',
+	'ext_in'                => '{field} does not have a valid file extension.',
+	'max_dims'              => '{field} is either not an image, or it is too wide or tall.',
+];
diff --git a/system/Language/en/View.php b/system/Language/en/View.php
new file mode 100644
index 0000000..099c074
--- /dev/null
+++ b/system/Language/en/View.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// View language settings
+return [
+	'invalidCellMethod'     => '{class}::{method} is not a valid method.',
+	'missingCellParameters' => '{class}::{method} has no params.',
+	'invalidCellParameter'  => '{0} is not a valid param name.',
+	'noCellClass'           => 'No view cell class provided.',
+	'invalidCellClass'      => 'Unable to locate view cell class: {0}.',
+	'tagSyntaxError'        => 'You have a syntax error in your Parser tags: {0}',
+];
diff --git a/system/Log/Exceptions/LogException.php b/system/Log/Exceptions/LogException.php
new file mode 100644
index 0000000..e2e8855
--- /dev/null
+++ b/system/Log/Exceptions/LogException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class LogException extends FrameworkException
+{
+	public static function forInvalidLogLevel(string $level)
+	{
+		return new static(lang('Log.invalidLogLevel', [$level]));
+	}
+
+	public static function forInvalidMessageType(string $messageType)
+	{
+		return new static(lang('Log.invalidMessageType', [$messageType]));
+	}
+}
diff --git a/system/Log/Handlers/BaseHandler.php b/system/Log/Handlers/BaseHandler.php
new file mode 100644
index 0000000..7f06577
--- /dev/null
+++ b/system/Log/Handlers/BaseHandler.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Handlers;
+
+/**
+ * Base class for logging
+ */
+abstract class BaseHandler implements HandlerInterface
+{
+	/**
+	 * Handles
+	 *
+	 * @var array
+	 */
+	protected $handles;
+
+	/**
+	 * Date format for logging
+	 *
+	 * @var string
+	 */
+	protected $dateFormat = 'Y-m-d H:i:s';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $config
+	 */
+	public function __construct(array $config)
+	{
+		$this->handles = $config['handles'] ?? [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks whether the Handler will handle logging items of this
+	 * log Level.
+	 *
+	 * @param string $level
+	 *
+	 * @return boolean
+	 */
+	public function canHandle(string $level): bool
+	{
+		return in_array($level, $this->handles, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles logging the message.
+	 * If the handler returns false, then execution of handlers
+	 * will stop. Any handlers that have not run, yet, will not
+	 * be run.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 *
+	 * @return boolean
+	 */
+	abstract public function handle($level, $message): bool;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Stores the date format to use while logging messages.
+	 *
+	 * @param string $format
+	 *
+	 * @return HandlerInterface
+	 */
+	public function setDateFormat(string $format): HandlerInterface
+	{
+		$this->dateFormat = $format;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
new file mode 100644
index 0000000..21a1bd7
--- /dev/null
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Handlers;
+
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+/**
+ * Class ChromeLoggerHandler
+ *
+ * Allows for logging items to the Chrome console for debugging.
+ * Requires the ChromeLogger extension installed in your browser.
+ *
+ * @see https://craig.is/writing/chrome-logger
+ */
+class ChromeLoggerHandler extends BaseHandler
+{
+	/**
+	 * Version of this library - for ChromeLogger use.
+	 */
+	const VERSION = 1.0;
+
+	/**
+	 * The number of track frames returned from the backtrace.
+	 *
+	 * @var integer
+	 */
+	protected $backtraceLevel = 0;
+
+	/**
+	 * The final data that is sent to the browser.
+	 *
+	 * @var array
+	 */
+	protected $json = [
+		'version' => self::VERSION,
+		'columns' => [
+			'log',
+			'backtrace',
+			'type',
+		],
+		'rows'    => [],
+	];
+
+	/**
+	 * The header used to pass the data.
+	 *
+	 * @var string
+	 */
+	protected $header = 'X-ChromeLogger-Data';
+
+	/**
+	 * Maps the log levels to the ChromeLogger types.
+	 *
+	 * @var array
+	 */
+	protected $levels = [
+		'emergency' => 'error',
+		'alert'     => 'error',
+		'critical'  => 'error',
+		'error'     => 'error',
+		'warning'   => 'warn',
+		'notice'    => 'warn',
+		'info'      => 'info',
+		'debug'     => 'info',
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $config
+	 */
+	public function __construct(array $config = [])
+	{
+		parent::__construct($config);
+
+		$this->json['request_uri'] = current_url();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles logging the message.
+	 * If the handler returns false, then execution of handlers
+	 * will stop. Any handlers that have not run, yet, will not
+	 * be run.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 *
+	 * @return boolean
+	 */
+	public function handle($level, $message): bool
+	{
+		// Format our message
+		$message = $this->format($message);
+
+		// Generate Backtrace info
+		$backtrace = debug_backtrace(0, $this->backtraceLevel);
+		$backtrace = end($backtrace);
+
+		$backtraceMessage = 'unknown';
+		if (isset($backtrace['file']) && isset($backtrace['line']))
+		{
+			$backtraceMessage = $backtrace['file'] . ':' . $backtrace['line'];
+		}
+
+		// Default to 'log' type.
+		$type = '';
+
+		if (array_key_exists($level, $this->levels))
+		{
+			$type = $this->levels[$level];
+		}
+
+		$this->json['rows'][] = [
+			[$message],
+			$backtraceMessage,
+			$type,
+		];
+
+		$this->sendLogs();
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Converts the object to display nicely in the Chrome Logger UI.
+	 *
+	 * @param mixed $object
+	 *
+	 * @return array
+	 */
+	protected function format($object)
+	{
+		if (! is_object($object))
+		{
+			return $object;
+		}
+
+		// @todo Modify formatting of objects once we can view them in browser.
+		$objectArray = (array) $object;
+
+		$objectArray['___class_name'] = get_class($object);
+
+		return $objectArray;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attaches the header and the content to the passed in request object.
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public function sendLogs(ResponseInterface &$response = null)
+	{
+		if (is_null($response))
+		{
+			$response = Services::response(null, true);
+		}
+
+		$data = base64_encode(utf8_encode(json_encode($this->json)));
+
+		$response->setHeader($this->header, $data);
+	}
+}
diff --git a/system/Log/Handlers/ErrorlogHandler.php b/system/Log/Handlers/ErrorlogHandler.php
new file mode 100644
index 0000000..fb5d1a4
--- /dev/null
+++ b/system/Log/Handlers/ErrorlogHandler.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Handlers;
+
+use CodeIgniter\Log\Exceptions\LogException;
+
+/**
+ * Log handler that writes to PHP's `error_log()`
+ */
+class ErrorlogHandler extends BaseHandler
+{
+	/**
+	 * Message is sent to PHP's system logger, using the Operating System's
+	 * system logging mechanism or a file, depending on what the error_log
+	 * configuration directive is set to.
+	 */
+	public const TYPE_OS = 0;
+
+	/**
+	 * Message is sent directly to the SAPI logging handler.
+	 */
+	public const TYPE_SAPI = 4;
+
+	/**
+	 * Says where the error should go. Currently supported are
+	 * 0 (`TYPE_OS`) and 4 (`TYPE_SAPI`).
+	 *
+	 * @var integer
+	 */
+	protected $messageType = 0;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param mixed[] $config
+	 */
+	public function __construct(array $config = [])
+	{
+		parent::__construct($config);
+
+		$messageType = $config['messageType'] ?? self::TYPE_OS;
+
+		if (! is_int($messageType) || ! in_array($messageType, [self::TYPE_OS, self::TYPE_SAPI], true))
+		{
+			throw LogException::forInvalidMessageType(print_r($messageType, true));
+		}
+
+		$this->messageType = $messageType;
+	}
+
+	/**
+	 * Handles logging the message.
+	 * If the handler returns false, then execution of handlers
+	 * will stop. Any handlers that have not run, yet, will not
+	 * be run.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 *
+	 * @return boolean
+	 */
+	public function handle($level, $message): bool
+	{
+		$message = strtoupper($level) . ' --> ' . $message . "\n";
+
+		return $this->errorLog($message, $this->messageType);
+	}
+
+	/**
+	 * Extracted call to `error_log()` in order to be tested.
+	 *
+	 * @param string  $message
+	 * @param integer $messageType
+	 *
+	 * @return boolean
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected function errorLog(string $message, int $messageType): bool
+	{
+		return error_log($message, $messageType);
+	}
+}
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
new file mode 100644
index 0000000..362758f
--- /dev/null
+++ b/system/Log/Handlers/FileHandler.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Handlers;
+
+use DateTime;
+use Exception;
+
+/**
+ * Log error messages to file system
+ */
+class FileHandler extends BaseHandler
+{
+	/**
+	 * Folder to hold logs
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * Extension to use for log files
+	 *
+	 * @var string
+	 */
+	protected $fileExtension;
+
+	/**
+	 * Permissions for new log files
+	 *
+	 * @var integer
+	 */
+	protected $filePermissions;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $config
+	 */
+	public function __construct(array $config = [])
+	{
+		parent::__construct($config);
+
+		$this->path = empty($config['path']) ? WRITEPATH . 'logs/' : $config['path'];
+
+		$this->fileExtension = empty($config['fileExtension']) ? 'log' : $config['fileExtension'];
+		$this->fileExtension = ltrim($this->fileExtension, '.');
+
+		$this->filePermissions = $config['filePermissions'] ?? 0644;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles logging the message.
+	 * If the handler returns false, then execution of handlers
+	 * will stop. Any handlers that have not run, yet, will not
+	 * be run.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function handle($level, $message): bool
+	{
+		$filepath = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
+
+		$msg = '';
+
+		if (! is_file($filepath))
+		{
+			$newfile = true;
+
+			// Only add protection to php files
+			if ($this->fileExtension === 'php')
+			{
+				$msg .= "<?php defined('SYSTEMPATH') || exit('No direct script access allowed'); ?>\n\n";
+			}
+		}
+
+		if (! $fp = @fopen($filepath, 'ab'))
+		{
+			return false;
+		}
+
+		// Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
+		if (strpos($this->dateFormat, 'u') !== false)
+		{
+			$microtimeFull  = microtime(true);
+			$microtimeShort = sprintf('%06d', ($microtimeFull - floor($microtimeFull)) * 1000000);
+			$date           = new DateTime(date('Y-m-d H:i:s.' . $microtimeShort, (int) $microtimeFull));
+			$date           = $date->format($this->dateFormat);
+		}
+		else
+		{
+			$date = date($this->dateFormat);
+		}
+
+		$msg .= strtoupper($level) . ' - ' . $date . ' --> ' . $message . "\n";
+
+		flock($fp, LOCK_EX);
+
+		$result = null;
+
+		for ($written = 0, $length = strlen($msg); $written < $length; $written += $result)
+		{
+			if (($result = fwrite($fp, substr($msg, $written))) === false)
+			{
+				// if we get this far, we'll never see this during travis-ci
+				// @codeCoverageIgnoreStart
+				break;
+				// @codeCoverageIgnoreEnd
+			}
+		}
+
+		flock($fp, LOCK_UN);
+		fclose($fp);
+
+		if (isset($newfile) && $newfile === true)
+		{
+			chmod($filepath, $this->filePermissions);
+		}
+
+		return is_int($result);
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Log/Handlers/HandlerInterface.php b/system/Log/Handlers/HandlerInterface.php
new file mode 100644
index 0000000..ec29cf8
--- /dev/null
+++ b/system/Log/Handlers/HandlerInterface.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Handlers;
+
+/**
+ * Expected behavior for a Log handler
+ */
+interface HandlerInterface
+{
+	/**
+	 * Handles logging the message.
+	 * If the handler returns false, then execution of handlers
+	 * will stop. Any handlers that have not run, yet, will not
+	 * be run.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 *
+	 * @return boolean
+	 */
+	public function handle($level, $message): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks whether the Handler will handle logging items of this
+	 * log Level.
+	 *
+	 * @param string $level
+	 *
+	 * @return boolean
+	 */
+	public function canHandle(string $level): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the preferred date format to use when logging.
+	 *
+	 * @param string $format
+	 *
+	 * @return HandlerInterface
+	 */
+	public function setDateFormat(string $format);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
new file mode 100644
index 0000000..c457545
--- /dev/null
+++ b/system/Log/Logger.php
@@ -0,0 +1,513 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log;
+
+use CodeIgniter\Log\Exceptions\LogException;
+use CodeIgniter\Log\Handlers\HandlerInterface;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Throwable;
+
+/**
+ * The CodeIgntier Logger
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data, the only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ */
+class Logger implements LoggerInterface
+{
+	/**
+	 * Used by the logThreshold Config setting to define
+	 * which errors to show.
+	 *
+	 * @var array<string, integer>
+	 */
+	protected $logLevels = [
+		'emergency' => 1,
+		'alert'     => 2,
+		'critical'  => 3,
+		'error'     => 4,
+		'warning'   => 5,
+		'notice'    => 6,
+		'info'      => 7,
+		'debug'     => 8,
+	];
+
+	/**
+	 * Array of levels to be logged.
+	 * The rest will be ignored.
+	 * Set in Config/logger.php
+	 *
+	 * @var array
+	 */
+	protected $loggableLevels = [];
+
+	/**
+	 * File permissions
+	 *
+	 * @var integer
+	 */
+	protected $filePermissions = 0644;
+
+	/**
+	 * Format of the timestamp for log files.
+	 *
+	 * @var string
+	 */
+	protected $dateFormat = 'Y-m-d H:i:s';
+
+	/**
+	 * Filename Extension
+	 *
+	 * @var string
+	 */
+	protected $fileExt;
+
+	/**
+	 * Caches instances of the handlers.
+	 *
+	 * @var array
+	 */
+	protected $handlers = [];
+
+	/**
+	 * Holds the configuration for each handler.
+	 * The key is the handler's class name. The
+	 * value is an associative array of configuration
+	 * items.
+	 *
+	 * @var array
+	 */
+	protected $handlerConfig = [];
+
+	/**
+	 * Caches logging calls for debugbar.
+	 *
+	 * @var array
+	 */
+	public $logCache;
+
+	/**
+	 * Should we cache our logged items?
+	 *
+	 * @var boolean
+	 */
+	protected $cacheLogs = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param  \Config\Logger $config
+	 * @param  boolean        $debug
+	 * @throws RuntimeException
+	 */
+	public function __construct($config, bool $debug = CI_DEBUG)
+	{
+		$this->loggableLevels = is_array($config->threshold) ? $config->threshold : range(1, (int) $config->threshold);
+
+		// Now convert loggable levels to strings.
+		// We only use numbers to make the threshold setting convenient for users.
+		if ($this->loggableLevels)
+		{
+			$temp = [];
+			foreach ($this->loggableLevels as $level)
+			{
+				$temp[] = array_search((int) $level, $this->logLevels, true);
+			}
+
+			$this->loggableLevels = $temp;
+			unset($temp);
+		}
+
+		$this->dateFormat = $config->dateFormat ?? $this->dateFormat;
+
+		if (! is_array($config->handlers) || empty($config->handlers))
+		{
+			throw LogException::forNoHandlers('LoggerConfig');
+		}
+
+		// Save the handler configuration for later.
+		// Instances will be created on demand.
+		$this->handlerConfig = $config->handlers;
+
+		$this->cacheLogs = $debug;
+		if ($this->cacheLogs)
+		{
+			$this->logCache = [];
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function emergency($message, array $context = []): bool
+	{
+		return $this->log('emergency', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function alert($message, array $context = []): bool
+	{
+		return $this->log('alert', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function critical($message, array $context = []): bool
+	{
+		return $this->log('critical', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function error($message, array $context = []): bool
+	{
+		return $this->log('error', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function warning($message, array $context = []): bool
+	{
+		return $this->log('warning', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function notice($message, array $context = []): bool
+	{
+		return $this->log('notice', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function info($message, array $context = []): bool
+	{
+		return $this->log('info', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function debug($message, array $context = []): bool
+	{
+		return $this->log('debug', $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed  $level
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function log($level, $message, array $context = []): bool
+	{
+		if (is_numeric($level))
+		{
+			$level = array_search((int) $level, $this->logLevels, true);
+		}
+
+		// Is the level a valid level?
+		if (! array_key_exists($level, $this->logLevels))
+		{
+			throw LogException::forInvalidLogLevel($level);
+		}
+
+		// Does the app want to log this right now?
+		if (! in_array($level, $this->loggableLevels, true))
+		{
+			return false;
+		}
+
+		// Parse our placeholders
+		$message = $this->interpolate($message, $context);
+
+		if (! is_string($message))
+		{
+			$message = print_r($message, true);
+		}
+
+		if ($this->cacheLogs)
+		{
+			$this->logCache[] = [
+				'level' => $level,
+				'msg'   => $message,
+			];
+		}
+
+		foreach ($this->handlerConfig as $className => $config)
+		{
+			if (! array_key_exists($className, $this->handlers))
+			{
+				$this->handlers[$className] = new $className($config);
+			}
+
+			/**
+			 * @var HandlerInterface
+			 */
+			$handler = $this->handlers[$className];
+
+			if (! $handler->canHandle($level))
+			{
+				continue;
+			}
+
+			// If the handler returns false, then we
+			// don't execute any other handlers.
+			if (! $handler->setDateFormat($this->dateFormat)->handle($level, $message))
+			{
+				break;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replaces any placeholders in the message with variables
+	 * from the context, as well as a few special items like:
+	 *
+	 * {session_vars}
+	 * {post_vars}
+	 * {get_vars}
+	 * {env}
+	 * {env:foo}
+	 * {file}
+	 * {line}
+	 *
+	 * @param mixed $message
+	 * @param array $context
+	 *
+	 * @return mixed
+	 */
+	protected function interpolate($message, array $context = [])
+	{
+		if (! is_string($message))
+		{
+			return $message;
+		}
+
+		// build a replacement array with braces around the context keys
+		$replace = [];
+
+		foreach ($context as $key => $val)
+		{
+			// Verify that the 'exception' key is actually an exception
+			// or error, both of which implement the 'Throwable' interface.
+			if ($key === 'exception' && $val instanceof Throwable)
+			{
+				$val = $val->getMessage() . ' ' . $this->cleanFileNames($val->getFile()) . ':' . $val->getLine();
+			}
+
+			// todo - sanitize input before writing to file?
+			$replace['{' . $key . '}'] = $val;
+		}
+
+		// Add special placeholders
+		$replace['{post_vars}'] = '$_POST: ' . print_r($_POST, true);
+		$replace['{get_vars}']  = '$_GET: ' . print_r($_GET, true);
+		$replace['{env}']       = ENVIRONMENT;
+
+		// Allow us to log the file/line that we are logging from
+		if (strpos($message, '{file}') !== false)
+		{
+			[$file, $line] = $this->determineFile();
+
+			$replace['{file}'] = $file;
+			$replace['{line}'] = $line;
+		}
+
+		// Match up environment variables in {env:foo} tags.
+		if (strpos($message, 'env:') !== false)
+		{
+			preg_match('/env:[^}]+/', $message, $matches);
+
+			if ($matches)
+			{
+				foreach ($matches as $str)
+				{
+					$key                 = str_replace('env:', '', $str);
+					$replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';
+				}
+			}
+		}
+
+		if (isset($_SESSION))
+		{
+			$replace['{session_vars}'] = '$_SESSION: ' . print_r($_SESSION, true);
+		}
+
+		// interpolate replacement values into the message and return
+		return strtr($message, $replace);
+	}
+
+	/**
+	 * Determines the file and line that the logging call
+	 * was made from by analyzing the backtrace.
+	 * Find the earliest stack frame that is part of our logging system.
+	 *
+	 * @return array
+	 */
+	public function determineFile(): array
+	{
+		$logFunctions = [
+			'log_message',
+			'log',
+			'error',
+			'debug',
+			'info',
+			'warning',
+			'critical',
+			'emergency',
+			'alert',
+			'notice',
+		];
+
+		// Generate Backtrace info
+		$trace = \debug_backtrace(0);
+
+		// So we search from the bottom (earliest) of the stack frames
+		$stackFrames = \array_reverse($trace);
+
+		// Find the first reference to a Logger class method
+		foreach ($stackFrames as $frame)
+		{
+			if (\in_array($frame['function'], $logFunctions, true))
+			{
+				$file = isset($frame['file']) ? $this->cleanFileNames($frame['file']) : 'unknown';
+				$line = $frame['line'] ?? 'unknown';
+				return [
+					$file,
+					$line,
+				];
+			}
+		}
+
+		return [
+			'unknown',
+			'unknown',
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH
+	 * with the actual var. i.e.
+	 *
+	 *  /var/www/site/app/Controllers/Home.php
+	 *      becomes:
+	 *  APPPATH/Controllers/Home.php
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	protected function cleanFileNames(string $file): string
+	{
+		$file = str_replace(APPPATH, 'APPPATH/', $file);
+		$file = str_replace(SYSTEMPATH, 'SYSTEMPATH/', $file);
+
+		return str_replace(FCPATH, 'FCPATH/', $file);
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Model.php b/system/Model.php
new file mode 100644
index 0000000..7558c61
--- /dev/null
+++ b/system/Model.php
@@ -0,0 +1,898 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use BadMethodCallException;
+use Closure;
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Database\Query;
+use CodeIgniter\Exceptions\ModelException;
+use CodeIgniter\I18n\Time;
+use CodeIgniter\Validation\ValidationInterface;
+use Config\Database;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionProperty;
+
+/**
+ * Class Model
+ *
+ * The Model class extends BaseModel and provides additional
+ * convenient features that makes working with a SQL database
+ * table less painful.
+ *
+ * It will:
+ *      - automatically connect to database
+ *      - allow intermingling calls to the builder
+ *      - removes the need to use Result object directly in most cases
+ *
+ * @mixin    BaseBuilder
+ * @property BaseConnection $db
+ */
+class Model extends BaseModel
+{
+	/**
+	 * Name of database table
+	 *
+	 * @var string
+	 */
+	protected $table;
+
+	/**
+	 * The table's primary key.
+	 *
+	 * @var string
+	 */
+	protected $primaryKey = 'id';
+
+	/**
+	 * Whether primary key uses auto increment.
+	 *
+	 * @var boolean
+	 */
+	protected $useAutoIncrement = true;
+
+	/**
+	 * Query Builder object
+	 *
+	 * @var BaseBuilder|null
+	 */
+	protected $builder;
+
+	/**
+	 * Holds information passed in via 'set'
+	 * so that we can capture it (not the builder)
+	 * and ensure it gets validated first.
+	 *
+	 * @var array
+	 */
+	protected $tempData = [];
+
+	/**
+	 * Escape array that maps usage of escape
+	 * flag for every parameter.
+	 *
+	 * @var array
+	 */
+	protected $escape = [];
+
+	/**
+	 * Model constructor.
+	 *
+	 * @param ConnectionInterface|null $db         DB Connection
+	 * @param ValidationInterface|null $validation Validation
+	 */
+	public function __construct(ConnectionInterface &$db = null, ValidationInterface $validation = null)
+	{
+		/**
+		 * @var BaseConnection $db
+		 */
+		$db = $db ?? Database::connect($this->DBGroup);
+
+		$this->db = &$db;
+
+		parent::__construct($validation);
+	}
+
+	/**
+	 * Specify the table associated with a model
+	 *
+	 * @param string $table Table
+	 *
+	 * @return $this
+	 */
+	public function setTable(string $table)
+	{
+		$this->table = $table;
+
+		return $this;
+	}
+
+	/**
+	 * Fetches the row of database from $this->table with a primary key
+	 * matching $id. This methods works only with dbCalls
+	 * This methods works only with dbCalls
+	 *
+	 * @param boolean                   $singleton Single or multiple results
+	 * @param array|integer|string|null $id        One primary key or an array of primary keys
+	 *
+	 * @return array|object|null    The resulting row of data, or null.
+	 */
+	protected function doFind(bool $singleton, $id = null)
+	{
+		$builder = $this->builder();
+
+		if ($this->tempUseSoftDeletes)
+		{
+			$builder->where($this->table . '.' . $this->deletedField, null);
+		}
+
+		if (is_array($id))
+		{
+			$row = $builder->whereIn($this->table . '.' . $this->primaryKey, $id)
+				->get()
+				->getResult($this->tempReturnType);
+		}
+		elseif ($singleton)
+		{
+			$row = $builder->where($this->table . '.' . $this->primaryKey, $id)
+				->get()
+				->getFirstRow($this->tempReturnType);
+		}
+		else
+		{
+			$row = $builder->get()->getResult($this->tempReturnType);
+		}
+
+		return $row;
+	}
+
+	/**
+	 * Fetches the column of database from $this->table
+	 * This methods works only with dbCalls
+	 *
+	 * @param string $columnName Column Name
+	 *
+	 * @return array|null The resulting row of data, or null if no data found.
+	 */
+	protected function doFindColumn(string $columnName)
+	{
+		return $this->select($columnName)->asArray()->find(); // @phpstan-ignore-line
+	}
+
+	/**
+	 * Works with the current Query Builder instance to return
+	 * all results, while optionally limiting them.
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer $limit  Limit
+	 * @param integer $offset Offset
+	 *
+	 * @return array
+	 */
+	protected function doFindAll(int $limit = 0, int $offset = 0)
+	{
+		$builder = $this->builder();
+
+		if ($this->tempUseSoftDeletes)
+		{
+			$builder->where($this->table . '.' . $this->deletedField, null);
+		}
+
+		return $builder->limit($limit, $offset)
+			->get()
+			->getResult($this->tempReturnType);
+	}
+
+	/**
+	 * Returns the first row of the result set. Will take any previous
+	 * Query Builder calls into account when determining the result set.
+	 * This methods works only with dbCalls
+	 *
+	 * @return array|object|null
+	 */
+	protected function doFirst()
+	{
+		$builder = $this->builder();
+
+		if ($this->tempUseSoftDeletes)
+		{
+			$builder->where($this->table . '.' . $this->deletedField, null);
+		}
+		elseif ($this->useSoftDeletes && empty($builder->QBGroupBy) && $this->primaryKey)
+		{
+			$builder->groupBy($this->table . '.' . $this->primaryKey);
+		}
+
+		// Some databases, like PostgreSQL, need order
+		// information to consistently return correct results.
+		if ($builder->QBGroupBy && empty($builder->QBOrderBy) && $this->primaryKey)
+		{
+			$builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
+		}
+
+		return $builder->limit(1, 0)->get()->getFirstRow($this->tempReturnType);
+	}
+
+	/**
+	 * Inserts data into the current table.
+	 * This methods works only with dbCalls
+	 *
+	 * @param array $data Data
+	 *
+	 * @return Query|boolean
+	 */
+	protected function doInsert(array $data)
+	{
+		$escape       = $this->escape;
+		$this->escape = [];
+
+		// Require non empty primaryKey when
+		// not using auto-increment feature
+		if (! $this->useAutoIncrement && empty($data[$this->primaryKey]))
+		{
+			throw DataException::forEmptyPrimaryKey('insert');
+		}
+
+		$builder = $this->builder();
+
+		// Must use the set() method to ensure to set the correct escape flag
+		foreach ($data as $key => $val)
+		{
+			$builder->set($key, $val, $escape[$key] ?? null);
+		}
+
+		$result = $builder->insert();
+
+		// If insertion succeeded then save the insert ID
+		if ($result)
+		{
+			$this->insertID = ! $this->useAutoIncrement ? $data[$this->primaryKey] : $this->db->insertID();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Compiles batch insert strings and runs the queries, validating each row prior.
+	 * This methods works only with dbCalls
+	 *
+	 * @param array|null   $set       An associative array of insert values
+	 * @param boolean|null $escape    Whether to escape values and identifiers
+	 * @param integer      $batchSize The size of the batch to run
+	 * @param boolean      $testing   True means only number of records is returned, false will execute the query
+	 *
+	 * @return integer|boolean Number of rows inserted or FALSE on failure
+	 */
+	protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
+	{
+		if (is_array($set))
+		{
+			foreach ($set as $row)
+			{
+				// Require non empty primaryKey when
+				// not using auto-increment feature
+				if (! $this->useAutoIncrement && empty($row[$this->primaryKey]))
+				{
+					throw DataException::forEmptyPrimaryKey('insertBatch');
+				}
+			}
+		}
+
+		return $this->builder()->testMode($testing)->insertBatch($set, $escape, $batchSize);
+	}
+
+	/**
+	 * Updates a single record in $this->table.
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer|array|string|null $id   ID
+	 * @param array|null                $data Data
+	 *
+	 * @return boolean
+	 */
+	protected function doUpdate($id = null, $data = null): bool
+	{
+		$escape       = $this->escape;
+		$this->escape = [];
+
+		$builder = $this->builder();
+
+		if ($id)
+		{
+			$builder = $builder->whereIn($this->table . '.' . $this->primaryKey, $id);
+		}
+
+		// Must use the set() method to ensure to set the correct escape flag
+		foreach ($data as $key => $val)
+		{
+			$builder->set($key, $val, $escape[$key] ?? null);
+		}
+
+		return $builder->update();
+	}
+
+	/**
+	 * Compiles an update string and runs the query
+	 * This methods works only with dbCalls
+	 *
+	 * @param array|null  $set       An associative array of update values
+	 * @param string|null $index     The where key
+	 * @param integer     $batchSize The size of the batch to run
+	 * @param boolean     $returnSQL True means SQL is returned, false will execute the query
+	 *
+	 * @return mixed    Number of rows affected or FALSE on failure
+	 *
+	 * @throws DatabaseException
+	 */
+	protected function doUpdateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
+	{
+		return $this->builder()->testMode($returnSQL)->updateBatch($set, $index, $batchSize);
+	}
+
+	/**
+	 * Deletes a single record from $this->table where $id matches
+	 * the table's primaryKey
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer|string|array|null $id    The rows primary key(s)
+	 * @param boolean                   $purge Allows overriding the soft deletes setting.
+	 *
+	 * @return string|boolean
+	 *
+	 * @throws DatabaseException
+	 */
+	protected function doDelete($id = null, bool $purge = false)
+	{
+		$builder = $this->builder();
+
+		if ($id)
+		{
+			$builder = $builder->whereIn($this->primaryKey, $id);
+		}
+
+		if ($this->useSoftDeletes && ! $purge)
+		{
+			if (empty($builder->getCompiledQBWhere()))
+			{
+				if (CI_DEBUG)
+				{
+					throw new DatabaseException(
+						'Deletes are not allowed unless they contain a "where" or "like" clause.'
+					);
+				}
+
+				return false; // @codeCoverageIgnore
+			}
+
+			$set[$this->deletedField] = $this->setDate();
+
+			if ($this->useTimestamps && $this->updatedField)
+			{
+				$set[$this->updatedField] = $this->setDate();
+			}
+
+			return $builder->update($set);
+		}
+
+		return $builder->delete();
+	}
+
+	/**
+	 * Permanently deletes all rows that have been marked as deleted
+	 * through soft deletes (deleted = 1)
+	 * This methods works only with dbCalls
+	 *
+	 * @return boolean|mixed
+	 */
+	protected function doPurgeDeleted()
+	{
+		return $this->builder()
+			->where($this->table . '.' . $this->deletedField . ' IS NOT NULL')
+			->delete();
+	}
+
+	/**
+	 * Works with the find* methods to return only the rows that
+	 * have been deleted.
+	 * This methods works only with dbCalls
+	 *
+	 * @return void
+	 */
+	protected function doOnlyDeleted()
+	{
+		$this->builder()->where($this->table . '.' . $this->deletedField . ' IS NOT NULL');
+	}
+
+	/**
+	 * Compiles a replace into string and runs the query
+	 * This methods works only with dbCalls
+	 *
+	 * @param array|null $data      Data
+	 * @param boolean    $returnSQL Set to true to return Query String
+	 *
+	 * @return mixed
+	 */
+	protected function doReplace(array $data = null, bool $returnSQL = false)
+	{
+		return $this->builder()->testMode($returnSQL)->replace($data);
+	}
+
+	/**
+	 * Grabs the last error(s) that occurred from the Database connection.
+	 * The return array should be in the following format:
+	 *  ['source' => 'message']
+	 * This methods works only with dbCalls
+	 *
+	 * @return array<string,string>
+	 */
+	protected function doErrors()
+	{
+		// $error is always ['code' => string|int, 'message' => string]
+		$error = $this->db->error();
+
+		if ((int) $error['code'] === 0)
+		{
+			return [];
+		}
+
+		return [get_class($this->db) => $error['message']];
+	}
+
+	/**
+	 * Returns the id value for the data array or object
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return integer|array|string|null
+	 *
+	 * @deprecated Use getIdValue() instead. Will be removed in version 5.0.
+	 */
+	protected function idValue($data)
+	{
+		return $this->getIdValue($data);
+	}
+
+	/**
+	 * Returns the id value for the data array or object
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return integer|array|string|null
+	 */
+	public function getIdValue($data)
+	{
+		if (is_object($data) && isset($data->{$this->primaryKey}))
+		{
+			return $data->{$this->primaryKey};
+		}
+
+		if (is_array($data) && ! empty($data[$this->primaryKey]))
+		{
+			return $data[$this->primaryKey];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Loops over records in batches, allowing you to operate on them.
+	 * Works with $this->builder to get the Compiled select to
+	 * determine the rows to operate on.
+	 * This methods works only with dbCalls
+	 *
+	 * @param integer $size     Size
+	 * @param Closure $userFunc Callback Function
+	 *
+	 * @return void
+	 *
+	 * @throws DataException
+	 */
+	public function chunk(int $size, Closure $userFunc)
+	{
+		$total  = $this->builder()->countAllResults(false);
+		$offset = 0;
+
+		while ($offset <= $total)
+		{
+			$builder = clone $this->builder();
+			$rows    = $builder->get($size, $offset);
+
+			if (! $rows)
+			{
+				throw DataException::forEmptyDataset('chunk');
+			}
+
+			$rows = $rows->getResult($this->tempReturnType);
+
+			$offset += $size;
+
+			if (empty($rows))
+			{
+				continue;
+			}
+
+			foreach ($rows as $row)
+			{
+				if ($userFunc($row) === false)
+				{
+					return;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Override countAllResults to account for soft deleted accounts.
+	 *
+	 * @param boolean $reset Reset
+	 * @param boolean $test  Test
+	 *
+	 * @return mixed
+	 */
+	public function countAllResults(bool $reset = true, bool $test = false)
+	{
+		if ($this->tempUseSoftDeletes)
+		{
+			$this->builder()->where($this->table . '.' . $this->deletedField, null);
+		}
+
+		// When $reset === false, the $tempUseSoftDeletes will be
+		// dependant on $useSoftDeletes value because we don't
+		// want to add the same "where" condition for the second time
+		$this->tempUseSoftDeletes = $reset
+			? $this->useSoftDeletes
+			: ($this->useSoftDeletes ? false : $this->useSoftDeletes);
+
+		return $this->builder()->testMode($test)->countAllResults($reset);
+	}
+
+	/**
+	 * Provides a shared instance of the Query Builder.
+	 *
+	 * @param string|null $table Table name
+	 *
+	 * @return BaseBuilder
+	 * @throws ModelException
+	 */
+	public function builder(?string $table = null)
+	{
+		// Check for an existing Builder
+		if ($this->builder instanceof BaseBuilder)
+		{
+			// Make sure the requested table matches the builder
+			if ($table && $this->builder->getTable() !== $table)
+			{
+				return $this->db->table($table);
+			}
+
+			return $this->builder;
+		}
+
+		// We're going to force a primary key to exist
+		// so we don't have overly convoluted code,
+		// and future features are likely to require them.
+		if (empty($this->primaryKey))
+		{
+			throw ModelException::forNoPrimaryKey(static::class);
+		}
+
+		$table = empty($table) ? $this->table : $table;
+
+		// Ensure we have a good db connection
+		if (! $this->db instanceof BaseConnection)
+		{
+			$this->db = Database::connect($this->DBGroup);
+		}
+
+		$builder = $this->db->table($table);
+
+		// Only consider it "shared" if the table is correct
+		if ($table === $this->table)
+		{
+			$this->builder = $builder;
+		}
+
+		return $builder;
+	}
+
+	/**
+	 * Captures the builder's set() method so that we can validate the
+	 * data here. This allows it to be used with any of the other
+	 * builder methods and still get validated data, like replace.
+	 *
+	 * @param mixed        $key    Field name, or an array of field/value pairs
+	 * @param string|null  $value  Field value, if $key is a single field
+	 * @param boolean|null $escape Whether to escape values and identifiers
+	 *
+	 * @return $this
+	 */
+	public function set($key, ?string $value = '', ?bool $escape = null)
+	{
+		$data = is_array($key) ? $key : [$key => $value];
+
+		foreach (array_keys($data) as $k)
+		{
+			$this->tempData['escape'][$k] = $escape;
+		}
+
+		$this->tempData['data'] = array_merge($this->tempData['data'] ?? [], $data);
+
+		return $this;
+	}
+
+	/**
+	 * This method is called on save to determine if entry have to be updated
+	 * If this method return false insert operation will be executed
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return boolean
+	 */
+	protected function shouldUpdate($data) : bool
+	{
+		// When useAutoIncrement feature is disabled check
+		// in the database if given record already exists
+		return parent::shouldUpdate($data) &&
+			($this->useAutoIncrement
+				? true
+				: $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1
+			);
+	}
+
+	/**
+	 * Inserts data into the database. If an object is provided,
+	 * it will attempt to convert it to an array.
+	 *
+	 * @param array|object|null $data     Data
+	 * @param boolean           $returnID Whether insert ID should be returned or not.
+	 *
+	 * @return BaseResult|object|integer|string|false
+	 *
+	 * @throws ReflectionException
+	 */
+	public function insert($data = null, bool $returnID = true)
+	{
+		if (! empty($this->tempData['data']))
+		{
+			if (empty($data))
+			{
+				$data = $this->tempData['data'] ?? null;
+			}
+			else
+			{
+				$data = $this->transformDataToArray($data, 'insert');
+				$data = array_merge($this->tempData['data'], $data);
+			}
+		}
+
+		$this->escape   = $this->tempData['escape'] ?? [];
+		$this->tempData = [];
+
+		return parent::insert($data, $returnID);
+	}
+
+	/**
+	 * Updates a single record in the database. If an object is provided,
+	 * it will attempt to convert it into an array.
+	 *
+	 * @param integer|array|string|null $id   ID
+	 * @param array|object|null         $data Data
+	 *
+	 * @return boolean
+	 *
+	 * @throws ReflectionException
+	 */
+	public function update($id = null, $data = null): bool
+	{
+		if (! empty($this->tempData['data']))
+		{
+			if (empty($data))
+			{
+				$data = $this->tempData['data'] ?? null;
+			}
+			else
+			{
+				$data = $this->transformDataToArray($data, 'update');
+				$data = array_merge($this->tempData['data'], $data);
+			}
+		}
+
+		$this->escape   = $this->tempData['escape'] ?? [];
+		$this->tempData = [];
+
+		return parent::update($id, $data);
+	}
+
+	/**
+	 * Takes a class an returns an array of it's public and protected
+	 * properties as an array with raw values.
+	 *
+	 * @param string|object $data        Data
+	 * @param boolean       $onlyChanged Only Changed Property
+	 * @param boolean       $recursive   If true, inner entities will be casted as array as well
+	 *
+	 * @return array|null Array
+	 *
+	 * @throws ReflectionException
+	 */
+	protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
+	{
+		$properties = parent::objectToRawArray($data, $onlyChanged);
+
+		// Always grab the primary key otherwise updates will fail.
+		if (method_exists($data, 'toRawArray') && (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
+				&& ! empty($data->{$this->primaryKey})))
+		{
+			$properties[$this->primaryKey] = $data->{$this->primaryKey};
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Provides/instantiates the builder/db connection and model's table/primary key names and return type.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	public function __get(string $name)
+	{
+		if (parent::__isset($name))
+		{
+			return parent::__get($name);
+		}
+
+		if (isset($this->builder()->$name))
+		{
+			return $this->builder()->$name;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Checks for the existence of properties across this model, builder, and db connection.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return boolean
+	 */
+	public function __isset(string $name): bool
+	{
+		if (parent::__isset($name))
+		{
+			return true;
+		}
+		return isset($this->builder()->$name);
+	}
+
+	/**
+	 * Provides direct access to method in the builder (if available)
+	 * and the database connection.
+	 *
+	 * @param string $name   Name
+	 * @param array  $params Params
+	 *
+	 * @return $this|null
+	 */
+	public function __call(string $name, array $params)
+	{
+		$result = parent::__call($name, $params);
+
+		if ($result === null && method_exists($builder = $this->builder(), $name))
+		{
+			$result = $builder->{$name}(...$params);
+		}
+
+		if (empty($result))
+		{
+			if (! method_exists($this->builder(), $name))
+			{
+				$className = static::class;
+
+				throw new BadMethodCallException('Call to undefined method ' . $className . '::' . $name);
+			}
+
+			return $result;
+		}
+
+		if ($result instanceof BaseBuilder)
+		{
+			return $this;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Takes a class an returns an array of it's public and protected
+	 * properties as an array suitable for use in creates and updates.
+	 *
+	 * @param string|object $data        Data
+	 * @param string|null   $primaryKey  Primary Key
+	 * @param string        $dateFormat  Date Format
+	 * @param boolean       $onlyChanged Only Changed
+	 *
+	 * @return array
+	 *
+	 * @throws ReflectionException
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @deprecated since 4.1
+	 */
+	public static function classToArray($data, $primaryKey = null, string $dateFormat = 'datetime', bool $onlyChanged = true): array
+	{
+		if (method_exists($data, 'toRawArray'))
+		{
+			$properties = $data->toRawArray($onlyChanged);
+
+			// Always grab the primary key otherwise updates will fail.
+			if (! empty($properties) && ! empty($primaryKey) && ! in_array($primaryKey, $properties, true) && ! empty($data->{$primaryKey}))
+			{
+				$properties[$primaryKey] = $data->{$primaryKey};
+			}
+		}
+		else
+		{
+			$mirror = new ReflectionClass($data);
+			$props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
+
+			$properties = [];
+
+			// Loop over each property,
+			// saving the name/value in a new array we can return.
+			foreach ($props as $prop)
+			{
+				// Must make protected values accessible.
+				$prop->setAccessible(true);
+				$properties[$prop->getName()] = $prop->getValue($data);
+			}
+		}
+
+		// Convert any Time instances to appropriate $dateFormat
+		if ($properties)
+		{
+			foreach ($properties as $key => $value)
+			{
+				if ($value instanceof Time)
+				{
+					switch ($dateFormat)
+					{
+						case 'datetime':
+							$converted = $value->format('Y-m-d H:i:s');
+							break;
+						case 'date':
+							$converted = $value->format('Y-m-d');
+							break;
+						case 'int':
+							$converted = $value->getTimestamp();
+							break;
+						default:
+							$converted = (string) $value;
+					}
+
+					$properties[$key] = $converted;
+				}
+			}
+		}
+
+		return $properties;
+	}
+}
diff --git a/system/Modules/Modules.php b/system/Modules/Modules.php
new file mode 100644
index 0000000..4c1d87c
--- /dev/null
+++ b/system/Modules/Modules.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Modules;
+
+/**
+ * Modules Class
+ *
+ * @link https://codeigniter.com/user_guide/general/modules.html
+ */
+class Modules
+{
+	/**
+	 * Auto-Discover
+	 *
+	 * @var boolean
+	 */
+	public $enabled = true;
+
+	/**
+	 * Auto-Discovery Within Composer Packages
+	 *
+	 * @var boolean
+	 */
+	public $discoverInComposer = true;
+
+	/**
+	 * Auto-Discover Rules Handler
+	 *
+	 * @var array
+	 */
+	public $aliases = [];
+
+	/**
+	 * Should the application auto-discover the requested resource.
+	 *
+	 * @param string $alias
+	 *
+	 * @return boolean
+	 */
+	public function shouldDiscover(string $alias): bool
+	{
+		if (! $this->enabled)
+		{
+			return false;
+		}
+
+		return in_array(strtolower($alias), $this->aliases, true);
+	}
+}
diff --git a/system/Pager/Exceptions/PagerException.php b/system/Pager/Exceptions/PagerException.php
new file mode 100644
index 0000000..d0f0edd
--- /dev/null
+++ b/system/Pager/Exceptions/PagerException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Pager\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class PagerException extends FrameworkException
+{
+	public static function forInvalidTemplate(string $template = null)
+	{
+		return new static(lang('Pager.invalidTemplate', [$template]));
+	}
+
+	public static function forInvalidPaginationGroup(string $group = null)
+	{
+		return new static(lang('Pager.invalidPaginationGroup', [$group]));
+	}
+}
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
new file mode 100644
index 0000000..7b15b31
--- /dev/null
+++ b/system/Pager/Pager.php
@@ -0,0 +1,567 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Pager;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Pager\Exceptions\PagerException;
+use CodeIgniter\View\RendererInterface;
+use Config\Pager as PagerConfig;
+
+/**
+ * Class Pager
+ *
+ * The Pager class provides semi-automatic and manual methods for creating
+ * pagination links and reading the current url's query variable, "page"
+ * to determine the current page. This class can support multiple
+ * paginations on a single page.
+ */
+class Pager implements PagerInterface
+{
+	/**
+	 * The group data.
+	 *
+	 * @var array
+	 */
+	protected $groups = [];
+
+	/**
+	 * URI segment for groups if provided.
+	 *
+	 * @var array
+	 */
+	protected $segment = [];
+
+	/**
+	 * Our configuration instance.
+	 *
+	 * @var PagerConfig
+	 */
+	protected $config;
+
+	/**
+	 * The view engine to render the links with.
+	 *
+	 * @var RendererInterface
+	 */
+	protected $view;
+
+	/**
+	 * List of only permitted queries
+	 *
+	 * @var array
+	 */
+	protected $only = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param PagerConfig       $config
+	 * @param RendererInterface $view
+	 */
+	public function __construct(PagerConfig $config, RendererInterface $view)
+	{
+		$this->config = $config;
+		$this->view   = $view;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles creating and displaying the
+	 *
+	 * @param string $group
+	 * @param string $template The output template alias to render.
+	 *
+	 * @return string
+	 */
+	public function links(string $group = 'default', string $template = 'default_full'): string
+	{
+		$this->ensureGroup($group);
+
+		return $this->displayLinks($group, $template);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates simple Next/Previous links, instead of full pagination.
+	 *
+	 * @param string $group
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	public function simpleLinks(string $group = 'default', string $template = 'default_simple'): string
+	{
+		$this->ensureGroup($group);
+
+		return $this->displayLinks($group, $template);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows for a simple, manual, form of pagination where all of the data
+	 * is provided by the user. The URL is the current URI.
+	 *
+	 * @param integer      $page
+	 * @param integer|null $perPage
+	 * @param integer      $total
+	 * @param string       $template The output template alias to render.
+	 * @param integer      $segment  (whether page number is provided by URI segment)
+	 * @param string|null  $group    optional group (i.e. if we'd like to define custom path)
+	 *
+	 * @return string
+	 */
+	public function makeLinks(int $page, ?int $perPage, int $total, string $template = 'default_full', int $segment = 0, ?string $group = 'default'): string
+	{
+		$group = $group === '' ? 'default' : $group;
+
+		$this->store($group, $page, $perPage ?? $this->config->perPage, $total, $segment);
+
+		return $this->displayLinks($group, $template);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the actual work of displaying the view file. Used internally
+	 * by links(), simpleLinks(), and makeLinks().
+	 *
+	 * @param string $group
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function displayLinks(string $group, string $template): string
+	{
+		if (! array_key_exists($template, $this->config->templates))
+		{
+			throw PagerException::forInvalidTemplate($template);
+		}
+		$pager = new PagerRenderer($this->getDetails($group));
+
+		return $this->view->setVar('pager', $pager)
+						->render($this->config->templates[$template]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores a set of pagination data for later display. Most commonly used
+	 * by the model to automate the process.
+	 *
+	 * @param string       $group
+	 * @param integer      $page
+	 * @param integer|null $perPage
+	 * @param integer      $total
+	 * @param integer      $segment
+	 *
+	 * @return $this
+	 */
+	public function store(string $group, int $page, ?int $perPage, int $total, int $segment = 0)
+	{
+		if ($segment)
+		{
+			$this->setSegment($segment, $group);
+		}
+
+		$this->ensureGroup($group, $perPage);
+
+		if ($segment > 0 && $this->groups[$group]['currentPage'] > 0)
+		{
+			$page = $this->groups[$group]['currentPage'];
+		}
+
+		$perPage   = $perPage ?? $this->config->perPage;
+		$pageCount = (int) ceil($total / $perPage);
+
+		$this->groups[$group]['currentPage'] = $page > $pageCount ? $pageCount : $page;
+		$this->groups[$group]['perPage']     = $perPage;
+		$this->groups[$group]['total']       = $total;
+		$this->groups[$group]['pageCount']   = $pageCount;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets segment for a group.
+	 *
+	 * @param integer $number
+	 * @param string  $group
+	 *
+	 * @return mixed
+	 */
+	public function setSegment(int $number, string $group = 'default')
+	{
+		$this->segment[$group] = $number;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the path that an aliased group of links will use.
+	 *
+	 * @param string $path
+	 * @param string $group
+	 *
+	 * @return mixed
+	 */
+	public function setPath(string $path, string $group = 'default')
+	{
+		$this->ensureGroup($group);
+
+		$this->groups[$group]['uri']->setPath($path);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of items in data store.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getTotal(string $group = 'default'): int
+	{
+		$this->ensureGroup($group);
+
+		return $this->groups[$group]['total'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of pages.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getPageCount(string $group = 'default'): int
+	{
+		$this->ensureGroup($group);
+
+		return $this->groups[$group]['pageCount'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of the current page of results.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getCurrentPage(string $group = 'default'): int
+	{
+		$this->ensureGroup($group);
+
+		return $this->groups[$group]['currentPage'] ?: 1;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Tells whether this group of results has any more pages of results.
+	 *
+	 * @param string $group
+	 *
+	 * @return boolean
+	 */
+	public function hasMore(string $group = 'default'): bool
+	{
+		$this->ensureGroup($group);
+
+		return ($this->groups[$group]['currentPage'] * $this->groups[$group]['perPage']) < $this->groups[$group]['total'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last page, if we have a total that we can calculate with.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer|null
+	 */
+	public function getLastPage(string $group = 'default')
+	{
+		$this->ensureGroup($group);
+
+		if (! is_numeric($this->groups[$group]['total']) || ! is_numeric($this->groups[$group]['perPage']))
+		{
+			return null;
+		}
+
+		return (int) ceil($this->groups[$group]['total'] / $this->groups[$group]['perPage']);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the first page # that should be shown.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getFirstPage(string $group = 'default'): int
+	{
+		$this->ensureGroup($group);
+
+		// @todo determine based on a 'surroundCount' value
+		return 1;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns the URI for a specific page for the specified group.
+	 *
+	 * @param integer|null $page
+	 * @param string       $group
+	 * @param boolean      $returnObject
+	 *
+	 * @return string|URI
+	 */
+	public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false)
+	{
+		$this->ensureGroup($group);
+
+		/**
+		 * @var URI $uri
+		 */
+		$uri = $this->groups[$group]['uri'];
+
+		$segment = $this->segment[$group] ?? 0;
+
+		if ($segment)
+		{
+			$uri->setSegment($segment, $page);
+		}
+		else
+		{
+			$uri->addQuery($this->groups[$group]['pageSelector'], $page);
+		}
+
+		if ($this->only)
+		{
+			$query = array_intersect_key($_GET, array_flip($this->only));
+
+			if (! $segment)
+			{
+				$query[$this->groups[$group]['pageSelector']] = $page;
+			}
+
+			$uri->setQueryArray($query);
+		}
+
+		return $returnObject === true ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the full URI to the next page of results, or null.
+	 *
+	 * @param string  $group
+	 * @param boolean $returnObject
+	 *
+	 * @return string|null
+	 */
+	public function getNextPageURI(string $group = 'default', bool $returnObject = false)
+	{
+		$this->ensureGroup($group);
+
+		$last = $this->getLastPage($group);
+		$curr = $this->getCurrentPage($group);
+		$page = null;
+
+		if (! empty($last) && ! empty($curr) && $last === $curr)
+		{
+			return null;
+		}
+
+		if ($last > $curr)
+		{
+			$page = $curr + 1;
+		}
+
+		return $this->getPageURI($page, $group, $returnObject);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the full URL to the previous page of results, or null.
+	 *
+	 * @param string  $group
+	 * @param boolean $returnObject
+	 *
+	 * @return string|null
+	 */
+	public function getPreviousPageURI(string $group = 'default', bool $returnObject = false)
+	{
+		$this->ensureGroup($group);
+
+		$first = $this->getFirstPage($group);
+		$curr  = $this->getCurrentPage($group);
+		$page  = null;
+
+		if (! empty($first) && ! empty($curr) && $first === $curr)
+		{
+			return null;
+		}
+
+		if ($first < $curr)
+		{
+			$page = $curr - 1;
+		}
+
+		return $this->getPageURI($page, $group, $returnObject);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of results per page that should be shown.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getPerPage(string $group = 'default'): int
+	{
+		$this->ensureGroup($group);
+
+		return (int) $this->groups[$group]['perPage'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array with details about the results, including
+	 * total, per_page, current_page, last_page, next_url, prev_url, from, to.
+	 * Does not include the actual data. This data is suitable for adding
+	 * a 'data' object to with the result set and converting to JSON.
+	 *
+	 * @param string $group
+	 *
+	 * @return array
+	 */
+	public function getDetails(string $group = 'default'): array
+	{
+		if (! array_key_exists($group, $this->groups))
+		{
+			throw PagerException::forInvalidPaginationGroup($group);
+		}
+
+		$newGroup = $this->groups[$group];
+
+		$newGroup['next']     = $this->getNextPageURI($group);
+		$newGroup['previous'] = $this->getPreviousPageURI($group);
+		$newGroup['segment']  = $this->segment[$group] ?? 0;
+
+		return $newGroup;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets only allowed queries on pagination links.
+	 *
+	 * @param array $queries
+	 *
+	 * @return Pager
+	 */
+	public function only(array $queries):Pager
+	{
+		$this->only = $queries;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures that an array exists for the group specified.
+	 *
+	 * @param string  $group
+	 * @param integer $perPage
+	 */
+	protected function ensureGroup(string $group, int $perPage = null)
+	{
+		if (array_key_exists($group, $this->groups))
+		{
+			return;
+		}
+
+		$this->groups[$group] = [
+			'uri'          => clone current_url(true),
+			'hasMore'      => false,
+			'total'        => null,
+			'perPage'      => $perPage ?? $this->config->perPage,
+			'pageCount'    => 1,
+			'pageSelector' => $group === 'default' ? 'page' : 'page_' . $group,
+		];
+
+		$this->calculateCurrentPage($group);
+
+		if ($_GET)
+		{
+			$this->groups[$group]['uri'] = $this->groups[$group]['uri']->setQueryArray($_GET);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Calculating the current page
+	 *
+	 * @param string $group
+	 */
+	protected function calculateCurrentPage(string $group)
+	{
+		if (array_key_exists($group, $this->segment))
+		{
+			try
+			{
+				$this->groups[$group]['currentPage'] = (int) $this->groups[$group]['uri']->setSilent(false)->getSegment($this->segment[$group]);
+			}
+			catch (HTTPException $e)
+			{
+				$this->groups[$group]['currentPage'] = 1;
+			}
+		}
+		else
+		{
+			$pageSelector = $this->groups[$group]['pageSelector'];
+
+			$page = (int) ($_GET[$pageSelector] ?? 1);
+
+			$this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
+		}
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
new file mode 100644
index 0000000..0b06ef8
--- /dev/null
+++ b/system/Pager/PagerInterface.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Pager;
+
+use CodeIgniter\HTTP\URI;
+
+/**
+ * Expected behavior for a Pager
+ */
+interface PagerInterface
+{
+	/**
+	 * Handles creating and displaying the
+	 *
+	 * @param string $group
+	 * @param string $template The output template alias to render.
+	 *
+	 * @return string
+	 */
+	public function links(string $group = 'default', string $template = 'default'): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates simple Next/Previous links, instead of full pagination.
+	 *
+	 * @param string $group
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	public function simpleLinks(string $group = 'default', string $template = 'default'): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows for a simple, manual, form of pagination where all of the data
+	 * is provided by the user. The URL is the current URI.
+	 *
+	 * @param integer $page
+	 * @param integer $perPage
+	 * @param integer $total
+	 * @param string  $template The output template alias to render.
+	 *
+	 * @return string
+	 */
+	public function makeLinks(int $page, int $perPage, int $total, string $template = 'default'): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores a set of pagination data for later display. Most commonly used
+	 * by the model to automate the process.
+	 *
+	 * @param string  $group
+	 * @param integer $page
+	 * @param integer $perPage
+	 * @param integer $total
+	 *
+	 * @return mixed
+	 */
+	public function store(string $group, int $page, int $perPage, int $total);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the path that an aliased group of links will use.
+	 *
+	 * @param string $path
+	 * @param string $group
+	 *
+	 * @return mixed
+	 */
+	public function setPath(string $path, string $group = 'default');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of pages.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getPageCount(string $group = 'default'): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of the current page of results.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getCurrentPage(string $group = 'default'): int;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Returns the URI for a specific page for the specified group.
+	 *
+	 * @param integer|null $page
+	 * @param string       $group
+	 * @param boolean      $returnObject
+	 *
+	 * @return string|URI
+	 */
+	public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Tells whether this group of results has any more pages of results.
+	 *
+	 * @param string $group
+	 *
+	 * @return boolean
+	 */
+	public function hasMore(string $group = 'default'): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the first page.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getFirstPage(string $group = 'default');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last page, if we have a total that we can calculate with.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer|null
+	 */
+	public function getLastPage(string $group = 'default');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the full URI to the next page of results, or null.
+	 *
+	 * @param string $group
+	 *
+	 * @return string|null
+	 */
+	public function getNextPageURI(string $group = 'default');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the full URL to the previous page of results, or null.
+	 *
+	 * @param string $group
+	 *
+	 * @return string|null
+	 */
+	public function getPreviousPageURI(string $group = 'default');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of results per page that should be shown.
+	 *
+	 * @param string $group
+	 *
+	 * @return integer
+	 */
+	public function getPerPage(string $group = 'default'): int;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array with details about the results, including
+	 * total, per_page, current_page, last_page, next_url, prev_url, from, to.
+	 * Does not include the actual data. This data is suitable for adding
+	 * a 'data' object to with the result set and converting to JSON.
+	 *
+	 * @param string $group
+	 *
+	 * @return array
+	 */
+	public function getDetails(string $group = 'default'): array;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
new file mode 100644
index 0000000..f1a4599
--- /dev/null
+++ b/system/Pager/PagerRenderer.php
@@ -0,0 +1,467 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Pager;
+
+use CodeIgniter\HTTP\URI;
+
+/**
+ * Class PagerRenderer
+ *
+ * This class is passed to the view that describes the pagination,
+ * and is used to get the link information and provide utility
+ * methods needed to work with pagination.
+ */
+class PagerRenderer
+{
+	/**
+	 * First page number.
+	 *
+	 * @var integer
+	 */
+	protected $first;
+
+	/**
+	 * Last page number.
+	 *
+	 * @var integer
+	 */
+	protected $last;
+
+	/**
+	 * Current page number.
+	 *
+	 * @var integer
+	 */
+	protected $current;
+
+	/**
+	 * Total number of items.
+	 *
+	 * @var integer
+	 */
+	protected $total;
+
+	/**
+	 * Total number of pages.
+	 *
+	 * @var integer
+	 */
+	protected $pageCount;
+
+	/**
+	 * URI base for pagination links
+	 *
+	 * @var URI
+	 */
+	protected $uri;
+
+	/**
+	 * Segment number used for pagination.
+	 *
+	 * @var integer
+	 */
+	protected $segment;
+
+	/**
+	 * Name of $_GET parameter
+	 *
+	 * @var string
+	 */
+	protected $pageSelector;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param array $details
+	 */
+	public function __construct(array $details)
+	{
+		$this->first        = 1;
+		$this->last         = $details['pageCount'];
+		$this->current      = $details['currentPage'];
+		$this->total        = $details['total'];
+		$this->uri          = $details['uri'];
+		$this->pageCount    = $details['pageCount'];
+		$this->segment      = $details['segment'] ?? 0;
+		$this->pageSelector = $details['pageSelector'] ?? 'page';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the total number of links that should appear on either
+	 * side of the current page. Adjusts the first and last counts
+	 * to reflect it.
+	 *
+	 * @param integer|null $count
+	 *
+	 * @return PagerRenderer
+	 */
+	public function setSurroundCount(int $count = null)
+	{
+		$this->updatePages($count);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if there is a "previous" page before our "first" page.
+	 *
+	 * @return boolean
+	 */
+	public function hasPrevious(): bool
+	{
+		return $this->first > 1;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a URL to the "previous" page. The previous page is NOT the
+	 * page before the current page, but is the page just before the
+	 * "first" page.
+	 *
+	 * You MUST call hasPrevious() first, or this value may be invalid.
+	 *
+	 * @return string|null
+	 */
+	public function getPrevious()
+	{
+		if (! $this->hasPrevious())
+		{
+			return null;
+		}
+
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, $this->first - 1);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, $this->first - 1);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if there is a "next" page after our "last" page.
+	 *
+	 * @return boolean
+	 */
+	public function hasNext(): bool
+	{
+		return $this->pageCount > $this->last;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a URL to the "next" page. The next page is NOT, the
+	 * page after the current page, but is the page that follows the
+	 * "last" page.
+	 *
+	 * You MUST call hasNext() first, or this value may be invalid.
+	 *
+	 * @return string|null
+	 */
+	public function getNext()
+	{
+		if (! $this->hasNext())
+		{
+			return null;
+		}
+
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, $this->last + 1);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, $this->last + 1);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the URI of the first page.
+	 *
+	 * @return string
+	 */
+	public function getFirst(): string
+	{
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, 1);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, 1);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the URI of the last page.
+	 *
+	 * @return string
+	 */
+	public function getLast(): string
+	{
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, $this->pageCount);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, $this->pageCount);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the URI of the current page.
+	 *
+	 * @return string
+	 */
+	public function getCurrent(): string
+	{
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, $this->current);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, $this->current);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of links that should be displayed. Each link
+	 * is represented by another array containing of the URI the link
+	 * should go to, the title (number) of the link, and a boolean
+	 * value representing whether this link is active or not.
+	 *
+	 * @return array
+	 */
+	public function links(): array
+	{
+		$links = [];
+
+		$uri = clone $this->uri;
+
+		for ($i = $this->first; $i <= $this->last; $i ++)
+		{
+			$uri     = $this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i);
+			$links[] = [
+				'uri'    => URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment()),
+				'title'  => (int) $i,
+				'active' => ($i === $this->current),
+			];
+		}
+
+		return $links;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Updates the first and last pages based on $surroundCount,
+	 * which is the number of links surrounding the active page
+	 * to show.
+	 *
+	 * @param integer|null $count The new "surroundCount"
+	 */
+	protected function updatePages(int $count = null)
+	{
+		if (is_null($count))
+		{
+			return;
+		}
+
+		$this->first = $this->current - $count > 0 ? (int) ($this->current - $count) : 1;
+		$this->last  = $this->current + $count <= $this->pageCount ? (int) ($this->current + $count) : (int) $this->pageCount;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if there is a "previous" page before our "first" page.
+	 *
+	 * @return boolean
+	 */
+	public function hasPreviousPage(): bool
+	{
+		return $this->current > 1;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a URL to the "previous" page.
+	 *
+	 * You MUST call hasPreviousPage() first, or this value may be invalid.
+	 *
+	 * @return string|null
+	 */
+	public function getPreviousPage()
+	{
+		if (! $this->hasPreviousPage())
+		{
+			return null;
+		}
+
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, $this->current - 1);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, $this->current - 1);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if there is a "next" page after our "last" page.
+	 *
+	 * @return boolean
+	 */
+	public function hasNextPage(): bool
+	{
+		return $this->current < $this->last;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a URL to the "next" page.
+	 *
+	 * You MUST call hasNextPage() first, or this value may be invalid.
+	 *
+	 * @return string|null
+	 */
+	public function getNextPage()
+	{
+		if (! $this->hasNextPage())
+		{
+			return null;
+		}
+
+		$uri = clone $this->uri;
+
+		if ($this->segment === 0)
+		{
+			$uri->addQuery($this->pageSelector, $this->current + 1);
+		}
+		else
+		{
+			$uri->setSegment($this->segment, $this->current + 1);
+		}
+
+		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+	}
+
+	/**
+	 * Returns the page number of the first page.
+	 *
+	 * @return integer
+	 */
+	public function getFirstPageNumber(): int
+	{
+		return $this->first;
+	}
+
+	/**
+	 * Returns the page number of the current page.
+	 *
+	 * @return integer
+	 */
+	public function getCurrentPageNumber(): int
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Returns the page number of the last page.
+	 *
+	 * @return integer
+	 */
+	public function getLastPageNumber(): int
+	{
+		return $this->last;
+	}
+
+	/**
+	 * Returns total number of pages.
+	 *
+	 * @return integer
+	 */
+	public function getPageCount(): int
+	{
+		return $this->pageCount;
+	}
+
+	/**
+	 * Returns the previous page number.
+	 *
+	 * @return integer|null
+	 */
+	public function getPreviousPageNumber(): ?int
+	{
+		return ($this->current === 1) ? null : $this->current - 1;
+	}
+
+	/**
+	 * Returns the next page number.
+	 *
+	 * @return integer|null
+	 */
+	public function getNextPageNumber(): ?int
+	{
+		return ($this->current === $this->pageCount) ? null : $this->current + 1;
+	}
+}
diff --git a/system/Pager/Views/default_full.php b/system/Pager/Views/default_full.php
new file mode 100644
index 0000000..0001143
--- /dev/null
+++ b/system/Pager/Views/default_full.php
@@ -0,0 +1,47 @@
+<?php
+
+use CodeIgniter\Pager\PagerRenderer;
+
+/**
+ * @var PagerRenderer $pager
+ */
+$pager->setSurroundCount(2);
+?>
+
+<nav aria-label="<?= lang('Pager.pageNavigation') ?>">
+	<ul class="pagination">
+		<?php if ($pager->hasPrevious()) : ?>
+			<li>
+				<a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
+					<span aria-hidden="true"><?= lang('Pager.first') ?></span>
+				</a>
+			</li>
+			<li>
+				<a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
+					<span aria-hidden="true"><?= lang('Pager.previous') ?></span>
+				</a>
+			</li>
+		<?php endif ?>
+
+		<?php foreach ($pager->links() as $link) : ?>
+			<li <?= $link['active'] ? 'class="active"' : '' ?>>
+				<a href="<?= $link['uri'] ?>">
+					<?= $link['title'] ?>
+				</a>
+			</li>
+		<?php endforeach ?>
+
+		<?php if ($pager->hasNext()) : ?>
+			<li>
+				<a href="<?= $pager->getNext() ?>" aria-label="<?= lang('Pager.next') ?>">
+					<span aria-hidden="true"><?= lang('Pager.next') ?></span>
+				</a>
+			</li>
+			<li>
+				<a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
+					<span aria-hidden="true"><?= lang('Pager.last') ?></span>
+				</a>
+			</li>
+		<?php endif ?>
+	</ul>
+</nav>
diff --git a/system/Pager/Views/default_head.php b/system/Pager/Views/default_head.php
new file mode 100644
index 0000000..edeb092
--- /dev/null
+++ b/system/Pager/Views/default_head.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Pager\PagerRenderer;
+
+ /**
+ * @var PagerRenderer $pager
+ */
+$pager->setSurroundCount(0);
+
+if ($pager->hasPrevious())
+{
+	echo '<link rel="prev" href="' . $pager->getPrevious() . '">' . PHP_EOL;
+}
+
+echo '<link rel="canonical" href="' . $pager->getCurrent() . '">' . PHP_EOL;
+
+if ($pager->hasNext())
+{
+	echo '<link rel="next" href="' . $pager->getNext() . '">' . PHP_EOL;
+}
diff --git a/system/Pager/Views/default_simple.php b/system/Pager/Views/default_simple.php
new file mode 100644
index 0000000..fc00ce8
--- /dev/null
+++ b/system/Pager/Views/default_simple.php
@@ -0,0 +1,23 @@
+<?php
+
+use CodeIgniter\Pager\PagerRenderer;
+
+/**
+ * @var PagerRenderer $pager
+ */
+$pager->setSurroundCount(0);
+?>
+<nav>
+	<ul class="pager">
+		<li <?= $pager->hasPrevious() ? '' : 'class="disabled"' ?>>
+			<a href="<?= $pager->getPrevious() ?? '#' ?>" aria-label="<?= lang('Pager.previous') ?>">
+				<span aria-hidden="true"><?= lang('Pager.newer') ?></span>
+			</a>
+		</li>
+		<li <?= $pager->hasNext() ? '' : 'class="disabled"' ?>>
+			<a href="<?= $pager->getnext() ?? '#' ?>" aria-label="<?= lang('Pager.next') ?>">
+				<span aria-hidden="true"><?= lang('Pager.older') ?></span>
+			</a>
+		</li>
+	</ul>
+</nav>
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
new file mode 100644
index 0000000..376f004
--- /dev/null
+++ b/system/RESTful/BaseResource.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\RESTful;
+
+use CodeIgniter\Controller;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
+
+abstract class BaseResource extends Controller
+{
+	/**
+	 * @var string|null The model that holding this resource's data
+	 */
+	protected $modelName;
+
+	/**
+	 * @var object|null The model that holding this resource's data
+	 */
+	protected $model;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger
+	 */
+	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+	{
+		parent::initController($request, $response, $logger);
+
+		// instantiate our model, if needed
+		$this->setModel($this->modelName);
+	}
+
+	/**
+	 * Set or change the model this controller is bound to.
+	 * Given either the name or the object, determine the other.
+	 *
+	 * @param object|string|null $which
+	 *
+	 * @return void
+	 */
+	public function setModel($which = null)
+	{
+		// save what we have been given
+		if ($which)
+		{
+			$this->model     = is_object($which) ? $which : null;
+			$this->modelName = is_object($which) ? null : $which;
+		}
+
+		// make a model object if needed
+		if (empty($this->model) && ! empty($this->modelName) && class_exists($this->modelName))
+		{
+			$this->model = model($this->modelName);
+		}
+
+		// determine model name if needed
+		if (! empty($this->model) && empty($this->modelName))
+		{
+			$this->modelName = get_class($this->model);
+		}
+	}
+}
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
new file mode 100644
index 0000000..5289f81
--- /dev/null
+++ b/system/RESTful/ResourceController.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\RESTful;
+
+use CodeIgniter\API\ResponseTrait;
+
+/**
+ * An extendable controller to provide a RESTful API for a resource.
+ */
+class ResourceController extends BaseResource
+{
+	use ResponseTrait;
+
+	/**
+	 * Return an array of resource objects, themselves in array format
+	 *
+	 * @return mixed
+	 */
+	public function index()
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['index']), 501);
+	}
+
+	/**
+	 * Return the properties of a resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function show($id = null)
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['show']), 501);
+	}
+
+	/**
+	 * Return a new resource object, with default properties
+	 *
+	 * @return mixed
+	 */
+	public function new()
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['new']), 501);
+	}
+
+	/**
+	 * Create a new resource object, from "posted" parameters
+	 *
+	 * @return mixed
+	 */
+	public function create()
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['create']), 501);
+	}
+
+	/**
+	 * Return the editable properties of a resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function edit($id = null)
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['edit']), 501);
+	}
+
+	/**
+	 * Add or update a model resource, from "posted" properties
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function update($id = null)
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['update']), 501);
+	}
+
+	/**
+	 * Delete the designated resource object from the model
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function delete($id = null)
+	{
+		return $this->fail(lang('RESTful.notImplemented', ['delete']), 501);
+	}
+
+	/**
+	 * Set/change the expected response representation for returned objects
+	 *
+	 * @param string $format
+	 *
+	 * @return void
+	 */
+	public function setFormat(string $format = 'json')
+	{
+		if (in_array($format, ['json', 'xml'], true))
+		{
+			$this->format = $format;
+		}
+	}
+}
diff --git a/system/RESTful/ResourcePresenter.php b/system/RESTful/ResourcePresenter.php
new file mode 100644
index 0000000..22dcc3c
--- /dev/null
+++ b/system/RESTful/ResourcePresenter.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\RESTful;
+
+/**
+ * An extendable controller to help provide a UI for a resource.
+ */
+class ResourcePresenter extends BaseResource
+{
+	/**
+	 * Present a view of resource objects
+	 *
+	 * @return mixed
+	 */
+	public function index()
+	{
+		return lang('RESTful.notImplemented', ['index']);
+	}
+
+	/**
+	 * Present a view to present a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function show($id = null)
+	{
+		return lang('RESTful.notImplemented', ['show']);
+	}
+
+	/**
+	 * Present a view to present a new single resource object
+	 *
+	 * @return mixed
+	 */
+	public function new()
+	{
+		return lang('RESTful.notImplemented', ['new']);
+	}
+
+	/**
+	 * Process the creation/insertion of a new resource object.
+	 * This should be a POST.
+	 *
+	 * @return mixed
+	 */
+	public function create()
+	{
+		return lang('RESTful.notImplemented', ['create']);
+	}
+
+	/**
+	 * Present a view to edit the properties of a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function edit($id = null)
+	{
+		return lang('RESTful.notImplemented', ['edit']);
+	}
+
+	/**
+	 * Process the updating, full or partial, of a specific resource object.
+	 * This should be a POST.
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function update($id = null)
+	{
+		return lang('RESTful.notImplemented', ['update']);
+	}
+
+	/**
+	 * Present a view to confirm the deletion of a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function remove($id = null)
+	{
+		return lang('RESTful.notImplemented', ['remove']);
+	}
+
+	/**
+	 * Process the deletion of a specific resource object
+	 *
+	 * @param mixed $id
+	 *
+	 * @return mixed
+	 */
+	public function delete($id = null)
+	{
+		return lang('RESTful.notImplemented', ['delete']);
+	}
+}
diff --git a/system/Router/Exceptions/RedirectException.php b/system/Router/Exceptions/RedirectException.php
new file mode 100644
index 0000000..a98beb4
--- /dev/null
+++ b/system/Router/Exceptions/RedirectException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Exceptions;
+
+use Exception;
+
+/**
+ * RedirectException
+ */
+class RedirectException extends Exception
+{
+	/**
+	 * Status code for redirects
+	 *
+	 * @var integer
+	 */
+	protected $code = 302;
+}
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
new file mode 100644
index 0000000..4c74245
--- /dev/null
+++ b/system/Router/Exceptions/RouterException.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+/**
+ * RouterException
+ */
+class RouterException extends FrameworkException
+{
+	/**
+	 * Thrown when the actual parameter type does not match
+	 * the expected types.
+	 *
+	 * @return RouterException
+	 */
+	public static function forInvalidParameterType()
+	{
+		return new static(lang('Router.invalidParameterType'));
+	}
+
+	/**
+	 * Thrown when a default route is not set.
+	 *
+	 * @return RouterException
+	 */
+	public static function forMissingDefaultRoute()
+	{
+		return new static(lang('Router.missingDefaultRoute'));
+	}
+
+	/**
+	 * Throw when controller or its method is not found.
+	 *
+	 * @param string $controller
+	 * @param string $method
+	 *
+	 * @return RouterException
+	 */
+	public static function forControllerNotFound(string $controller, string $method)
+	{
+		return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
+	}
+
+	/**
+	 * Throw when route is not valid.
+	 *
+	 * @param string $route
+	 *
+	 * @return RouterException
+	 */
+	public static function forInvalidRoute(string $route)
+	{
+		return new static(lang('HTTP.invalidRoute', [$route]));
+	}
+}
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
new file mode 100644
index 0000000..b7d586e
--- /dev/null
+++ b/system/Router/RouteCollection.php
@@ -0,0 +1,1631 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use Closure;
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Router\Exceptions\RouterException;
+use Config\Modules;
+use Config\Services;
+use InvalidArgumentException;
+
+/**
+ * Class RouteCollection
+ *
+ * @todo Implement nested resource routing (See CakePHP)
+ */
+class RouteCollection implements RouteCollectionInterface
+{
+	/**
+	 * The namespace to be added to any Controllers.
+	 * Defaults to the global namespaces (\)
+	 *
+	 * @var string
+	 */
+	protected $defaultNamespace = '\\';
+
+	/**
+	 * The name of the default controller to use
+	 * when no other controller is specified.
+	 *
+	 * Not used here. Pass-thru value for Router class.
+	 *
+	 * @var string
+	 */
+	protected $defaultController = 'Home';
+
+	/**
+	 * The name of the default method to use
+	 * when no other method has been specified.
+	 *
+	 * Not used here. Pass-thru value for Router class.
+	 *
+	 * @var string
+	 */
+	protected $defaultMethod = 'index';
+
+	/**
+	 * The placeholder used when routing 'resources'
+	 * when no other placeholder has been specified.
+	 *
+	 * @var string
+	 */
+	protected $defaultPlaceholder = 'any';
+
+	/**
+	 * Whether to convert dashes to underscores in URI.
+	 *
+	 * Not used here. Pass-thru value for Router class.
+	 *
+	 * @var boolean
+	 */
+	protected $translateURIDashes = false;
+
+	/**
+	 * Whether to match URI against Controllers
+	 * when it doesn't match defined routes.
+	 *
+	 * Not used here. Pass-thru value for Router class.
+	 *
+	 * @var boolean
+	 */
+	protected $autoRoute = true;
+
+	/**
+	 * A callable that will be shown
+	 * when the route cannot be matched.
+	 *
+	 * @var string|Closure
+	 */
+	protected $override404;
+
+	/**
+	 * Defined placeholders that can be used
+	 * within the
+	 *
+	 * @var array
+	 */
+	protected $placeholders = [
+		'any'      => '.*',
+		'segment'  => '[^/]+',
+		'alphanum' => '[a-zA-Z0-9]+',
+		'num'      => '[0-9]+',
+		'alpha'    => '[a-zA-Z]+',
+		'hash'     => '[^/]+',
+	];
+
+	/**
+	 * An array of all routes and their mappings.
+	 *
+	 * @var array
+	 */
+	protected $routes = [
+		'*'       => [],
+		'options' => [],
+		'get'     => [],
+		'head'    => [],
+		'post'    => [],
+		'put'     => [],
+		'delete'  => [],
+		'trace'   => [],
+		'connect' => [],
+		'cli'     => [],
+	];
+
+	/**
+	 * Array of routes options
+	 *
+	 * @var array
+	 */
+	protected $routesOptions = [];
+
+	/**
+	 * The current method that the script is being called by.
+	 *
+	 * @var string
+	 */
+	protected $HTTPVerb = '*';
+
+	/**
+	 * The default list of HTTP methods (and CLI for command line usage)
+	 * that is allowed if no other method is provided.
+	 *
+	 * @var array
+	 */
+	protected $defaultHTTPMethods = [
+		'options',
+		'get',
+		'head',
+		'post',
+		'put',
+		'delete',
+		'trace',
+		'connect',
+		'cli',
+	];
+
+	/**
+	 * The name of the current group, if any.
+	 *
+	 * @var string|null
+	 */
+	protected $group;
+
+	/**
+	 * The current subdomain.
+	 *
+	 * @var string|null
+	 */
+	protected $currentSubdomain;
+
+	/**
+	 * Stores copy of current options being
+	 * applied during creation.
+	 *
+	 * @var array|null
+	 */
+	protected $currentOptions;
+
+	/**
+	 * A little performance booster.
+	 *
+	 * @var boolean
+	 */
+	protected $didDiscover = false;
+
+	/**
+	 * Handle to the file locator to use.
+	 *
+	 * @var FileLocator
+	 */
+	protected $fileLocator;
+
+	/**
+	 * Handle to the modules config.
+	 *
+	 * @var Modules
+	 */
+	protected $moduleConfig;
+
+	/**
+	 * Flag for sorting routes by priority.
+	 *
+	 * @var boolean
+	 */
+	protected $prioritize = false;
+
+	/**
+	 * Route priority detection flag.
+	 *
+	 * @var boolean
+	 */
+	protected $prioritizeDetected = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param FileLocator $locator
+	 * @param Modules     $moduleConfig
+	 */
+	public function __construct(FileLocator $locator, Modules $moduleConfig)
+	{
+		$this->fileLocator  = $locator;
+		$this->moduleConfig = $moduleConfig;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Registers a new constraint with the system. Constraints are used
+	 * by the routes as placeholders for regular expressions to make defining
+	 * the routes more human-friendly.
+	 *
+	 * You can pass an associative array as $placeholder, and have
+	 * multiple placeholders added at once.
+	 *
+	 * @param string|array $placeholder
+	 * @param string|null  $pattern
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function addPlaceholder($placeholder, string $pattern = null): RouteCollectionInterface
+	{
+		if (! is_array($placeholder))
+		{
+			$placeholder = [$placeholder => $pattern];
+		}
+
+		$this->placeholders = array_merge($this->placeholders, $placeholder);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets the default namespace to use for Controllers when no other
+	 * namespace has been specified.
+	 *
+	 * @param string $value
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setDefaultNamespace(string $value): RouteCollectionInterface
+	{
+		$this->defaultNamespace = filter_var($value, FILTER_SANITIZE_STRING);
+		$this->defaultNamespace = rtrim($this->defaultNamespace, '\\') . '\\';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets the default controller to use when no other controller has been
+	 * specified.
+	 *
+	 * @param string $value
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setDefaultController(string $value): RouteCollectionInterface
+	{
+		$this->defaultController = filter_var($value, FILTER_SANITIZE_STRING);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets the default method to call on the controller when no other
+	 * method has been set in the route.
+	 *
+	 * @param string $value
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setDefaultMethod(string $value): RouteCollectionInterface
+	{
+		$this->defaultMethod = filter_var($value, FILTER_SANITIZE_STRING);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Tells the system whether to convert dashes in URI strings into
+	 * underscores. In some search engines, including Google, dashes
+	 * create more meaning and make it easier for the search engine to
+	 * find words and meaning in the URI for better SEO. But it
+	 * doesn't work well with PHP method names....
+	 *
+	 * @param boolean $value
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setTranslateURIDashes(bool $value): RouteCollectionInterface
+	{
+		$this->translateURIDashes = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * If TRUE, the system will attempt to match the URI against
+	 * Controllers by matching each segment against folders/files
+	 * in APPPATH/Controllers, when a match wasn't found against
+	 * defined routes.
+	 *
+	 * If FALSE, will stop searching and do NO automatic routing.
+	 *
+	 * @param boolean $value
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setAutoRoute(bool $value): RouteCollectionInterface
+	{
+		$this->autoRoute = $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets the class/method that should be called if routing doesn't
+	 * find a match. It can be either a closure or the controller/method
+	 * name exactly like a route is defined: Users::index
+	 *
+	 * This setting is passed to the Router class and handled there.
+	 *
+	 * @param callable|null $callable
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function set404Override($callable = null): RouteCollectionInterface
+	{
+		$this->override404 = $callable;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the 404 Override setting, which can be null, a closure
+	 * or the controller/string.
+	 *
+	 * @return string|Closure|null
+	 */
+	public function get404Override()
+	{
+		return $this->override404;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will attempt to discover any additional routes, either through
+	 * the local PSR4 namespaces, or through selected Composer packages.
+	 */
+	protected function discoverRoutes()
+	{
+		if ($this->didDiscover)
+		{
+			return;
+		}
+
+		// We need this var in local scope
+		// so route files can access it.
+		$routes = $this;
+
+		if ($this->moduleConfig->shouldDiscover('routes'))
+		{
+			$files = $this->fileLocator->search('Config/Routes.php');
+
+			foreach ($files as $file)
+			{
+				// Don't include our main file again...
+				if ($file === APPPATH . 'Config/Routes.php')
+				{
+					continue;
+				}
+
+				include $file;
+			}
+		}
+
+		$this->didDiscover = true;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets the default constraint to be used in the system. Typically
+	 * for use with the 'resource' method.
+	 *
+	 * @param string $placeholder
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setDefaultConstraint(string $placeholder): RouteCollectionInterface
+	{
+		if (array_key_exists($placeholder, $this->placeholders))
+		{
+			$this->defaultPlaceholder = $placeholder;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the default controller. With Namespace.
+	 *
+	 * @return string
+	 */
+	public function getDefaultController(): string
+	{
+		return $this->defaultController;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the default method to use within the controller.
+	 *
+	 * @return string
+	 */
+	public function getDefaultMethod(): string
+	{
+		return $this->defaultMethod;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the default namespace as set in the Routes config file.
+	 *
+	 * @return string
+	 */
+	public function getDefaultNamespace(): string
+	{
+		return $this->defaultNamespace;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current value of the translateURIDashes setting.
+	 *
+	 * @return boolean
+	 */
+	public function shouldTranslateURIDashes(): bool
+	{
+		return $this->translateURIDashes;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the flag that tells whether to autoRoute URI against Controllers.
+	 *
+	 * @return boolean
+	 */
+	public function shouldAutoRoute(): bool
+	{
+		return $this->autoRoute;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the raw array of available routes.
+	 *
+	 * @param string|null $verb
+	 *
+	 * @return array
+	 */
+	public function getRoutes(string $verb = null): array
+	{
+		if (empty($verb))
+		{
+			$verb = $this->getHTTPVerb();
+		}
+
+		// Since this is the entry point for the Router,
+		// take a moment to do any route discovery
+		// we might need to do.
+		$this->discoverRoutes();
+
+		$routes     = [];
+		$collection = [];
+
+		if (isset($this->routes[$verb]))
+		{
+			// Keep current verb's routes at the beginning so they're matched
+			// before any of the generic, "add" routes.
+			if (isset($this->routes['*']))
+			{
+				$extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);
+				$collection = array_merge($this->routes[$verb], $extraRules);
+			}
+			foreach ($collection as $r)
+			{
+				$key          = key($r['route']);
+				$routes[$key] = $r['route'][$key];
+			}
+		}
+
+		// sorting routes by priority
+		if ($this->prioritizeDetected && $this->prioritize && $routes !== [])
+		{
+			$order = [];
+
+			foreach ($routes as $key => $value)
+			{
+				$key                    = $key === '/' ? $key : ltrim($key, '/ ');
+				$priority               = $this->getRoutesOptions($key, $verb)['priority'] ?? 0;
+				$order[$priority][$key] = $value;
+			}
+
+			ksort($order);
+			$routes = array_merge(...$order);
+		}
+
+		return $routes;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns one or all routes options
+	 *
+	 * @param string|null $from
+	 * @param string|null $verb
+	 *
+	 * @return array
+	 */
+	public function getRoutesOptions(string $from = null, string $verb = null): array
+	{
+		$options = $this->loadRoutesOptions($verb);
+
+		return $from ? $options[$from] ?? [] : $options;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current HTTP Verb being used.
+	 *
+	 * @return string
+	 */
+	public function getHTTPVerb(): string
+	{
+		return $this->HTTPVerb;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current HTTP verb.
+	 * Used primarily for testing.
+	 *
+	 * @param string $verb
+	 *
+	 * @return $this
+	 */
+	public function setHTTPVerb(string $verb)
+	{
+		$this->HTTPVerb = $verb;
+
+		return $this;
+	}
+
+	/**
+	 * A shortcut method to add a number of routes at a single time.
+	 * It does not allow any options to be set on the route, or to
+	 * define the method used.
+	 *
+	 * @param array      $routes
+	 * @param array|null $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function map(array $routes = [], array $options = null): RouteCollectionInterface
+	{
+		foreach ($routes as $from => $to)
+		{
+			$this->add($from, $to, $options);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Adds a single route to the collection.
+	 *
+	 * Example:
+	 *      $routes->add('news', 'Posts::index');
+	 *
+	 * @param string       $from
+	 * @param array|string $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function add(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('*', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a temporary redirect from one route to another. Used for
+	 * redirecting traffic from old, non-existing routes to the new
+	 * moved routes.
+	 *
+	 * @param string  $from   The pattern to match against
+	 * @param string  $to     Either a route name or a URI to redirect to
+	 * @param integer $status The HTTP status code that should be returned with this redirect
+	 *
+	 * @return RouteCollection
+	 */
+	public function addRedirect(string $from, string $to, int $status = 302)
+	{
+		// Use the named route's pattern if this is a named route.
+		if (array_key_exists($to, $this->routes['*']))
+		{
+			$to = $this->routes['*'][$to]['route'];
+		}
+		elseif (array_key_exists($to, $this->routes['get']))
+		{
+			$to = $this->routes['get'][$to]['route'];
+		}
+
+		$this->create('*', $from, $to, ['redirect' => $status]);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the route is a redirecting route.
+	 *
+	 * @param string $from
+	 *
+	 * @return boolean
+	 */
+	public function isRedirect(string $from): bool
+	{
+		foreach ($this->routes['*'] as $name => $route)
+		{
+			// Named route?
+			if ($name === $from || key($route['route']) === $from)
+			{
+				return isset($route['redirect']) && is_numeric($route['redirect']);
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Grabs the HTTP status code from a redirecting Route.
+	 *
+	 * @param string $from
+	 *
+	 * @return integer
+	 */
+	public function getRedirectCode(string $from): int
+	{
+		foreach ($this->routes['*'] as $name => $route)
+		{
+			// Named route?
+			if ($name === $from || key($route['route']) === $from)
+			{
+				return $route['redirect'] ?? 0;
+			}
+		}
+
+		return 0;
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Grouping Routes
+	//--------------------------------------------------------------------
+
+	/**
+	 * Group a series of routes under a single URL segment. This is handy
+	 * for grouping items into an admin area, like:
+	 *
+	 * Example:
+	 *     // Creates route: admin/users
+	 *     $route->group('admin', function() {
+	 *            $route->resource('users');
+	 *     });
+	 *
+	 * @param string         $name      The name to group/prefix the routes with.
+	 * @param array|callable ...$params
+	 *
+	 * @return void
+	 */
+	public function group(string $name, ...$params)
+	{
+		$oldGroup   = $this->group;
+		$oldOptions = $this->currentOptions;
+
+		// To register a route, we'll set a flag so that our router
+		// so it will see the group name.
+		// If the group name is empty, we go on using the previously built group name.
+		$this->group = $name ? ltrim($oldGroup . '/' . $name, '/') : $oldGroup;
+
+		$callback = array_pop($params);
+
+		if ($params && is_array($params[0]))
+		{
+			$this->currentOptions = array_shift($params);
+		}
+
+		if (is_callable($callback))
+		{
+			$callback($this);
+		}
+
+		$this->group          = $oldGroup;
+		$this->currentOptions = $oldOptions;
+	}
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// HTTP Verb-based routing
+	//--------------------------------------------------------------------
+	// Routing works here because, as the routes Config file is read in,
+	// the various HTTP verb-based routes will only be added to the in-memory
+	// routes if it is a call that should respond to that verb.
+	//
+	// The options array is typically used to pass in an 'as' or var, but may
+	// be expanded in the future. See the docblock for 'add' method above for
+	// current list of globally available options.
+	//
+	/**
+	 * Creates a collections of HTTP-verb based routes for a controller.
+	 *
+	 * Possible Options:
+	 *      'controller'    - Customize the name of the controller used in the 'to' route
+	 *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
+	 *      'websafe'   -	- '1' if only GET and POST HTTP verbs are supported
+	 *
+	 * Example:
+	 *
+	 *      $route->resource('photos');
+	 *
+	 *      // Generates the following routes:
+	 *      HTTP Verb | Path        | Action        | Used for...
+	 *      ----------+-------------+---------------+-----------------
+	 *      GET         /photos             index           an array of photo objects
+	 *      GET         /photos/new         new             an empty photo object, with default properties
+	 *      GET         /photos/{id}/edit   edit            a specific photo object, editable properties
+	 *      GET         /photos/{id}        show            a specific photo object, all properties
+	 *      POST        /photos             create          a new photo object, to add to the resource
+	 *      DELETE      /photos/{id}        delete          deletes the specified photo object
+	 *      PUT/PATCH   /photos/{id}        update          replacement properties for existing photo
+	 *
+	 *  If 'websafe' option is present, the following paths are also available:
+	 *
+	 *      POST		/photos/{id}/delete delete
+	 *      POST        /photos/{id}        update
+	 *
+	 * @param string     $name    The name of the resource/controller to route to.
+	 * @param array|null $options An list of possible ways to customize the routing.
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function resource(string $name, array $options = null): RouteCollectionInterface
+	{
+		// In order to allow customization of the route the
+		// resources are sent to, we need to have a new name
+		// to store the values in.
+		$newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+		// If a new controller is specified, then we replace the
+		// $name value with the name of the new controller.
+		if (isset($options['controller']))
+		{
+			$newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+		}
+
+		// In order to allow customization of allowed id values
+		// we need someplace to store them.
+		$id = $this->placeholders[$this->defaultPlaceholder] ?? '(:segment)';
+
+		if (isset($options['placeholder']))
+		{
+			$id = $options['placeholder'];
+		}
+
+		// Make sure we capture back-references
+		$id = '(' . trim($id, '()') . ')';
+
+		$methods = isset($options['only']) ? (is_string($options['only']) ? explode(',', $options['only']) : $options['only']) : ['index', 'show', 'create', 'update', 'delete', 'new', 'edit'];
+
+		if (isset($options['except']))
+		{
+			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
+			foreach ($methods as $i => $method)
+			{
+				if (in_array($method, $options['except'], true))
+				{
+					unset($methods[$i]);
+				}
+			}
+		}
+
+		if (in_array('index', $methods, true))
+		{
+			$this->get($name, $newName . '::index', $options);
+		}
+		if (in_array('new', $methods, true))
+		{
+			$this->get($name . '/new', $newName . '::new', $options);
+		}
+		if (in_array('edit', $methods, true))
+		{
+			$this->get($name . '/' . $id . '/edit', $newName . '::edit/$1', $options);
+		}
+		if (in_array('show', $methods, true))
+		{
+			$this->get($name . '/' . $id, $newName . '::show/$1', $options);
+		}
+		if (in_array('create', $methods, true))
+		{
+			$this->post($name, $newName . '::create', $options);
+		}
+		if (in_array('update', $methods, true))
+		{
+			$this->put($name . '/' . $id, $newName . '::update/$1', $options);
+			$this->patch($name . '/' . $id, $newName . '::update/$1', $options);
+		}
+		if (in_array('delete', $methods, true))
+		{
+			$this->delete($name . '/' . $id, $newName . '::delete/$1', $options);
+		}
+
+		// Web Safe? delete needs checking before update because of method name
+		if (isset($options['websafe']))
+		{
+			if (in_array('delete', $methods, true))
+			{
+				$this->post($name . '/' . $id . '/delete', $newName . '::delete/$1', $options);
+			}
+			if (in_array('update', $methods, true))
+			{
+				$this->post($name . '/' . $id, $newName . '::update/$1', $options);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Creates a collections of HTTP-verb based routes for a presenter controller.
+	 *
+	 * Possible Options:
+	 *      'controller'    - Customize the name of the controller used in the 'to' route
+	 *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
+	 *
+	 * Example:
+	 *
+	 *      $route->presenter('photos');
+	 *
+	 *      // Generates the following routes:
+	 *      HTTP Verb | Path        | Action        | Used for...
+	 *      ----------+-------------+---------------+-----------------
+	 *      GET         /photos             index           showing all array of photo objects
+	 *      GET         /photos/show/{id}   show            showing a specific photo object, all properties
+	 *      GET         /photos/new         new             showing a form for an empty photo object, with default properties
+	 *      POST        /photos/create      create          processing the form for a new photo
+	 *      GET         /photos/edit/{id}   edit            show an editing form for a specific photo object, editable properties
+	 *      POST        /photos/update/{id} update          process the editing form data
+	 *      GET         /photos/remove/{id} remove          show a form to confirm deletion of a specific photo object
+	 *      POST        /photos/delete/{id} delete          deleting the specified photo object
+	 *
+	 * @param string     $name    The name of the controller to route to.
+	 * @param array|null $options An list of possible ways to customize the routing.
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function presenter(string $name, array $options = null): RouteCollectionInterface
+	{
+		// In order to allow customization of the route the
+		// resources are sent to, we need to have a new name
+		// to store the values in.
+		$newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+		// If a new controller is specified, then we replace the
+		// $name value with the name of the new controller.
+		if (isset($options['controller']))
+		{
+			$newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+		}
+
+		// In order to allow customization of allowed id values
+		// we need someplace to store them.
+		$id = $this->placeholders[$this->defaultPlaceholder] ?? '(:segment)';
+
+		if (isset($options['placeholder']))
+		{
+			$id = $options['placeholder'];
+		}
+
+		// Make sure we capture back-references
+		$id = '(' . trim($id, '()') . ')';
+
+		$methods = isset($options['only']) ? (is_string($options['only']) ? explode(',', $options['only']) : $options['only']) : ['index', 'show', 'new', 'create', 'edit', 'update', 'remove', 'delete'];
+
+		if (isset($options['except']))
+		{
+			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
+			foreach ($methods as $i => $method)
+			{
+				if (in_array($method, $options['except'], true))
+				{
+					unset($methods[$i]);
+				}
+			}
+		}
+
+		if (in_array('index', $methods, true))
+		{
+			$this->get($name, $newName . '::index', $options);
+		}
+		if (in_array('show', $methods, true))
+		{
+			$this->get($name . '/show/' . $id, $newName . '::show/$1', $options);
+		}
+		if (in_array('new', $methods, true))
+		{
+			$this->get($name . '/new', $newName . '::new', $options);
+		}
+		if (in_array('create', $methods, true))
+		{
+			$this->post($name . '/create', $newName . '::create', $options);
+		}
+		if (in_array('edit', $methods, true))
+		{
+			$this->get($name . '/edit/' . $id, $newName . '::edit/$1', $options);
+		}
+		if (in_array('update', $methods, true))
+		{
+			$this->post($name . '/update/' . $id, $newName . '::update/$1', $options);
+		}
+		if (in_array('remove', $methods, true))
+		{
+			$this->get($name . '/remove/' . $id, $newName . '::remove/$1', $options);
+		}
+		if (in_array('delete', $methods, true))
+		{
+			$this->post($name . '/delete/' . $id, $newName . '::delete/$1', $options);
+		}
+		if (in_array('show', $methods, true))
+		{
+			$this->get($name . '/' . $id, $newName . '::show/$1', $options);
+		}
+		if (in_array('create', $methods, true))
+		{
+			$this->post($name, $newName . '::create', $options);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a single route to match for multiple HTTP Verbs.
+	 *
+	 * Example:
+	 *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
+	 *
+	 * @param array        $verbs
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function match(array $verbs = [], string $from = '', $to = '', array $options = null): RouteCollectionInterface
+	{
+		if (empty($from) || empty($to))
+		{
+			throw new InvalidArgumentException('You must supply the parameters: from, to.');
+		}
+
+		foreach ($verbs as $verb)
+		{
+			$verb = strtolower($verb);
+
+			$this->{$verb}($from, $to, $options);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to GET requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function get(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('get', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to POST requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function post(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('post', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to PUT requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function put(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('put', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to DELETE requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function delete(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('delete', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to HEAD requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function head(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('head', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to PATCH requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function patch(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('patch', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to OPTIONS requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function options(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('options', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Specifies a route that is only available to command-line requests.
+	 *
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function cli(string $from, $to, array $options = null): RouteCollectionInterface
+	{
+		$this->create('cli', $from, $to, $options);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Limits the routes to a specified ENVIRONMENT or they won't run.
+	 *
+	 * @param string  $env
+	 * @param Closure $callback
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function environment(string $env, Closure $callback): RouteCollectionInterface
+	{
+		if (ENVIRONMENT === $env)
+		{
+			$callback($this);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to look up a route based on its destination.
+	 *
+	 * If a route exists:
+	 *
+	 *      'path/(:any)/(:any)' => 'Controller::method/$1/$2'
+	 *
+	 * This method allows you to know the Controller and method
+	 * and get the route that leads to it.
+	 *
+	 *      // Equals 'path/$param1/$param2'
+	 *      reverseRoute('Controller::method', $param1, $param2);
+	 *
+	 * @param string $search
+	 * @param mixed  ...$params
+	 *
+	 * @return string|false
+	 */
+	public function reverseRoute(string $search, ...$params)
+	{
+		// Named routes get higher priority.
+		foreach ($this->routes as $collection)
+		{
+			if (array_key_exists($search, $collection))
+			{
+				$route = $this->fillRouteParams(key($collection[$search]['route']), $params);
+				return $this->localizeRoute($route);
+			}
+		}
+
+		// If it's not a named route, then loop over
+		// all routes to find a match.
+		foreach ($this->routes as $collection)
+		{
+			foreach ($collection as $route)
+			{
+				$from = key($route['route']);
+				$to   = $route['route'][$from];
+
+				// ignore closures
+				if (! is_string($to))
+				{
+					continue;
+				}
+
+				// Lose any namespace slash at beginning of strings
+				// to ensure more consistent match.
+				$to     = ltrim($to, '\\');
+				$search = ltrim($search, '\\');
+
+				// If there's any chance of a match, then it will
+				// be with $search at the beginning of the $to string.
+				if (strpos($to, $search) !== 0)
+				{
+					continue;
+				}
+
+				// Ensure that the number of $params given here
+				// matches the number of back-references in the route
+				if (substr_count($to, '$') !== count($params))
+				{
+					continue;
+				}
+
+				$route = $this->fillRouteParams($from, $params);
+				return $this->localizeRoute($route);
+			}
+		}
+
+		// If we're still here, then we did not find a match.
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replaces the {locale} tag with the current application locale
+	 *
+	 * @param string $route
+	 *
+	 * @return string
+	 */
+	protected function localizeRoute(string $route) :string
+	{
+		return strtr($route, ['{locale}' => Services::request()->getLocale()]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks a route (using the "from") to see if it's filtered or not.
+	 *
+	 * @param string      $search
+	 * @param string|null $verb
+	 *
+	 * @return boolean
+	 */
+	public function isFiltered(string $search, string $verb = null): bool
+	{
+		$options = $this->loadRoutesOptions($verb);
+
+		return isset($options[$search]['filter']);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the filter that should be applied for a single route, along
+	 * with any parameters it might have. Parameters are found by splitting
+	 * the parameter name on a colon to separate the filter name from the parameter list,
+	 * and the splitting the result on commas. So:
+	 *
+	 *    'role:admin,manager'
+	 *
+	 * has a filter of "role", with parameters of ['admin', 'manager'].
+	 *
+	 * @param string      $search
+	 * @param string|null $verb
+	 *
+	 * @return string
+	 */
+	public function getFilterForRoute(string $search, string $verb = null): string
+	{
+		$options = $this->loadRoutesOptions($verb);
+
+		return $options[$search]['filter'] ?? '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given a
+	 *
+	 * @param string     $from
+	 * @param array|null $params
+	 *
+	 * @return string
+	 * @throws RouterException
+	 */
+	protected function fillRouteParams(string $from, array $params = null): string
+	{
+		// Find all of our back-references in the original route
+		preg_match_all('/\(([^)]+)\)/', $from, $matches);
+
+		if (empty($matches[0]))
+		{
+			return '/' . ltrim($from, '/');
+		}
+
+		// Build our resulting string, inserting the $params in
+		// the appropriate places.
+		foreach ($matches[0] as $index => $pattern)
+		{
+			if (! preg_match('#^' . $pattern . '$#u', $params[$index]))
+			{
+				throw RouterException::forInvalidParameterType();
+			}
+
+			// Ensure that the param we're inserting matches
+			// the expected param type.
+			$pos  = strpos($from, $pattern);
+			$from = substr_replace($from, $params[$index], $pos, strlen($pattern));
+		}
+
+		return '/' . ltrim($from, '/');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does the heavy lifting of creating an actual route. You must specify
+	 * the request method(s) that this route will work for. They can be separated
+	 * by a pipe character "|" if there is more than one.
+	 *
+	 * @param string       $verb
+	 * @param string       $from
+	 * @param string|array $to
+	 * @param array|null   $options
+	 */
+	protected function create(string $verb, string $from, $to, array $options = null)
+	{
+		$overwrite = false;
+		$prefix    = is_null($this->group) ? '' : $this->group . '/';
+
+		$from = filter_var($prefix . $from, FILTER_SANITIZE_STRING);
+
+		// While we want to add a route within a group of '/',
+		// it doesn't work with matching, so remove them...
+		if ($from !== '/')
+		{
+			$from = trim($from, '/');
+		}
+
+		$options = array_merge($this->currentOptions ?? [], $options ?? []);
+
+		// Route priority detect
+		if (isset($options['priority']))
+		{
+			$options['priority'] = abs((int) $options['priority']);
+
+			if ($options['priority'] > 0)
+			{
+				$this->prioritizeDetected = true;
+			}
+		}
+
+		// Hostname limiting?
+		if (! empty($options['hostname']))
+		{
+			// @todo determine if there's a way to whitelist hosts?
+			if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname']))
+			{
+				return;
+			}
+
+			$overwrite = true;
+		}
+
+		// Limiting to subdomains?
+		elseif (! empty($options['subdomain']))
+		{
+			// If we don't match the current subdomain, then
+			// we don't need to add the route.
+			if (! $this->checkSubdomains($options['subdomain']))
+			{
+				return;
+			}
+
+			$overwrite = true;
+		}
+
+		// Are we offsetting the binds?
+		// If so, take care of them here in one
+		// fell swoop.
+		if (isset($options['offset']) && is_string($to))
+		{
+			// Get a constant string to work with.
+			$to = preg_replace('/(\$\d+)/', '$X', $to);
+
+			for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i ++)
+			{
+				$to = preg_replace_callback(
+						'/\$X/', function ($m) use ($i) {
+							return '$' . $i;
+						}, $to, 1
+				);
+			}
+		}
+
+		// Replace our regex pattern placeholders with the actual thing
+		// so that the Router doesn't need to know about any of this.
+		foreach ($this->placeholders as $tag => $pattern)
+		{
+			$from = str_ireplace(':' . $tag, $pattern, $from);
+		}
+
+		//If is redirect, No processing
+		if (! isset($options['redirect']) && is_string($to))
+		{
+			// If no namespace found, add the default namespace
+			if (strpos($to, '\\') === false || strpos($to, '\\') > 0)
+				{
+					$namespace = $options['namespace'] ?? $this->defaultNamespace;
+					$to        = trim($namespace, '\\') . '\\' . $to;
+			}
+			// Always ensure that we escape our namespace so we're not pointing to
+			// \CodeIgniter\Routes\Controller::method.
+			$to = '\\' . ltrim($to, '\\');
+		}
+
+		$name = $options['as'] ?? $from;
+
+		// Don't overwrite any existing 'froms' so that auto-discovered routes
+		// do not overwrite any app/Config/Routes settings. The app
+		// routes should always be the "source of truth".
+		// this works only because discovered routes are added just prior
+		// to attempting to route the request.
+		if (isset($this->routes[$verb][$name]) && ! $overwrite)
+		{
+			return;
+		}
+
+		$this->routes[$verb][$name] = [
+			'route' => [$from => $to],
+		];
+
+		$this->routesOptions[$verb][$from] = $options;
+
+		// Is this a redirect?
+		if (isset($options['redirect']) && is_numeric($options['redirect']))
+		{
+			$this->routes['*'][$name]['redirect'] = $options['redirect'];
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compares the subdomain(s) passed in against the current subdomain
+	 * on this page request.
+	 *
+	 * @param mixed $subdomains
+	 *
+	 * @return boolean
+	 */
+	private function checkSubdomains($subdomains): bool
+	{
+		// CLI calls can't be on subdomain.
+		if (! isset($_SERVER['HTTP_HOST']))
+		{
+			return false;
+		}
+
+		if (is_null($this->currentSubdomain))
+		{
+			$this->currentSubdomain = $this->determineCurrentSubdomain();
+		}
+
+		if (! is_array($subdomains))
+		{
+			$subdomains = [$subdomains];
+		}
+
+		// Routes can be limited to any sub-domain. In that case, though,
+		// it does require a sub-domain to be present.
+		if (! empty($this->currentSubdomain) && in_array('*', $subdomains, true))
+		{
+			return true;
+		}
+
+		return in_array($this->currentSubdomain, $subdomains, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Examines the HTTP_HOST to get a best match for the subdomain. It
+	 * won't be perfect, but should work for our needs.
+	 *
+	 * It's especially not perfect since it's possible to register a domain
+	 * with a period (.) as part of the domain name.
+	 *
+	 * @return mixed
+	 */
+	private function determineCurrentSubdomain()
+	{
+		// We have to ensure that a scheme exists
+		// on the URL else parse_url will mis-interpret
+		// 'host' as the 'path'.
+		$url = $_SERVER['HTTP_HOST'];
+		if (strpos($url, 'http') !== 0)
+		{
+			$url = 'http://' . $url;
+		}
+
+		$parsedUrl = parse_url($url);
+
+		$host = explode('.', $parsedUrl['host']);
+
+		if ($host[0] === 'www')
+		{
+			unset($host[0]);
+		}
+
+		// Get rid of any domains, which will be the last
+		unset($host[count($host)]);
+
+		// Account for .co.uk, .co.nz, etc. domains
+		if (end($host) === 'co')
+		{
+			$host = array_slice($host, 0, -1);
+		}
+
+		// If we only have 1 part left, then we don't have a sub-domain.
+		if (count($host) === 1)
+		{
+			// Set it to false so we don't make it back here again.
+			return false;
+		}
+
+		return array_shift($host);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reset the routes, so that a test case can provide the
+	 * explicit ones needed for it.
+	 */
+	public function resetRoutes()
+	{
+		$this->routes = ['*' => []];
+		foreach ($this->defaultHTTPMethods as $verb)
+		{
+			$this->routes[$verb] = [];
+		}
+
+		$this->prioritizeDetected = false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Load routes options based on verb
+	 *
+	 * @param string|null $verb
+	 *
+	 * @return array
+	 */
+	protected function loadRoutesOptions(string $verb = null): array
+	{
+		$verb = $verb ?: $this->getHTTPVerb();
+
+		$options = $this->routesOptions[$verb] ?? [];
+
+		if (isset($this->routesOptions['*']))
+		{
+			foreach ($this->routesOptions['*'] as $key => $val)
+			{
+				if (isset($options[$key]))
+				{
+					$extraOptions  = array_diff_key($val, $options[$key]);
+					$options[$key] = array_merge($options[$key], $extraOptions);
+				}
+				else
+				{
+					$options[$key] = $val;
+				}
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Enable or Disable sorting routes by priority
+	 *
+	 * @param boolean $enabled The value status
+	 *
+	 * @return $this
+	 */
+	public function setPrioritize(bool $enabled = true)
+	{
+		$this->prioritize = $enabled;
+
+		return $this;
+	}
+}
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
new file mode 100644
index 0000000..1e9260a
--- /dev/null
+++ b/system/Router/RouteCollectionInterface.php
@@ -0,0 +1,247 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use Closure;
+
+/**
+ * Interface RouteCollectionInterface
+ *
+ * A Route Collection's sole job is to hold a series of routes. The required
+ * number of methods is kept very small on purpose, but implementors may
+ * add a number of additional methods to customize how the routes are defined.
+ *
+ * The RouteCollection provides the Router with the routes so that it can determine
+ * which controller should be ran.
+ */
+interface RouteCollectionInterface
+{
+	/**
+	 * Adds a single route to the collection.
+	 *
+	 * @param string       $from
+	 * @param array|string $to
+	 * @param array        $options
+	 *
+	 * @return mixed
+	 */
+	public function add(string $from, $to, array $options = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new constraint with the system. Constraints are used
+	 * by the routes as placeholders for regular expressions to make defining
+	 * the routes more human-friendly.
+	 *
+	 * You can pass an associative array as $placeholder, and have
+	 * multiple placeholders added at once.
+	 *
+	 * @param string|array $placeholder
+	 * @param string       $pattern
+	 *
+	 * @return mixed
+	 */
+	public function addPlaceholder($placeholder, string $pattern = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default namespace to use for Controllers when no other
+	 * namespace has been specified.
+	 *
+	 * @param string $value
+	 *
+	 * @return mixed
+	 */
+	public function setDefaultNamespace(string $value);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default controller to use when no other controller has been
+	 * specified.
+	 *
+	 * @param string $value
+	 *
+	 * @return mixed
+	 */
+	public function setDefaultController(string $value);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default method to call on the controller when no other
+	 * method has been set in the route.
+	 *
+	 * @param string $value
+	 *
+	 * @return mixed
+	 */
+	public function setDefaultMethod(string $value);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Tells the system whether to convert dashes in URI strings into
+	 * underscores. In some search engines, including Google, dashes
+	 * create more meaning and make it easier for the search engine to
+	 * find words and meaning in the URI for better SEO. But it
+	 * doesn't work well with PHP method names....
+	 *
+	 * @param boolean $value
+	 *
+	 * @return mixed
+	 */
+	public function setTranslateURIDashes(bool $value);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If TRUE, the system will attempt to match the URI against
+	 * Controllers by matching each segment against folders/files
+	 * in APPPATH/Controllers, when a match wasn't found against
+	 * defined routes.
+	 *
+	 * If FALSE, will stop searching and do NO automatic routing.
+	 *
+	 * @param boolean $value
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function setAutoRoute(bool $value): self;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the class/method that should be called if routing doesn't
+	 * find a match. It can be either a closure or the controller/method
+	 * name exactly like a route is defined: Users::index
+	 *
+	 * This setting is passed to the Router class and handled there.
+	 *
+	 * @param callable|null $callable
+	 *
+	 * @return RouteCollectionInterface
+	 */
+	public function set404Override($callable = null): self;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the 404 Override setting, which can be null, a closure
+	 * or the controller/string.
+	 *
+	 * @return string|Closure|null
+	 */
+	public function get404Override();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the default controller. With Namespace.
+	 *
+	 * @return string
+	 */
+	public function getDefaultController();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the default method to use within the controller.
+	 *
+	 * @return string
+	 */
+	public function getDefaultMethod();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current value of the translateURIDashes setting.
+	 *
+	 * @return mixed
+	 */
+	public function shouldTranslateURIDashes();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the flag that tells whether to autoRoute URI against Controllers.
+	 *
+	 * @return boolean
+	 */
+	public function shouldAutoRoute();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the raw array of available routes.
+	 *
+	 * @return mixed
+	 */
+	public function getRoutes();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current HTTP Verb being used.
+	 *
+	 * @return string
+	 */
+	public function getHTTPVerb();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to look up a route based on it's destination.
+	 *
+	 * If a route exists:
+	 *
+	 *      'path/(:any)/(:any)' => 'Controller::method/$1/$2'
+	 *
+	 * This method allows you to know the Controller and method
+	 * and get the route that leads to it.
+	 *
+	 *      // Equals 'path/$param1/$param2'
+	 *      reverseRoute('Controller::method', $param1, $param2);
+	 *
+	 * @param string $search
+	 * @param array  ...$params
+	 *
+	 * @return string|false
+	 */
+	public function reverseRoute(string $search, ...$params);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the route is a redirecting route.
+	 *
+	 * @param string $from
+	 *
+	 * @return boolean
+	 */
+	public function isRedirect(string $from): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Grabs the HTTP status code from a redirecting Route.
+	 *
+	 * @param string $from
+	 *
+	 * @return integer
+	 */
+	public function getRedirectCode(string $from): int;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Router/Router.php b/system/Router/Router.php
new file mode 100644
index 0000000..dcadd8b
--- /dev/null
+++ b/system/Router/Router.php
@@ -0,0 +1,764 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\Router\Exceptions\RedirectException;
+use CodeIgniter\Router\Exceptions\RouterException;
+
+/**
+ * Request router.
+ */
+class Router implements RouterInterface
+{
+	/**
+	 * A RouteCollection instance.
+	 *
+	 * @var RouteCollectionInterface
+	 */
+	protected $collection;
+
+	/**
+	 * Sub-directory that contains the requested controller class.
+	 * Primarily used by 'autoRoute'.
+	 *
+	 * @var string|null
+	 */
+	protected $directory;
+
+	/**
+	 * The name of the controller class.
+	 *
+	 * @var string
+	 */
+	protected $controller;
+
+	/**
+	 * The name of the method to use.
+	 *
+	 * @var string
+	 */
+	protected $method;
+
+	/**
+	 * An array of binds that were collected
+	 * so they can be sent to closure routes.
+	 *
+	 * @var array
+	 */
+	protected $params = [];
+
+	/**
+	 * The name of the front controller.
+	 *
+	 * @var string
+	 */
+	protected $indexPage = 'index.php';
+
+	/**
+	 * Whether dashes in URI's should be converted
+	 * to underscores when determining method names.
+	 *
+	 * @var boolean
+	 */
+	protected $translateURIDashes = false;
+
+	/**
+	 * The route that was matched for this request.
+	 *
+	 * @var array|null
+	 */
+	protected $matchedRoute;
+
+	/**
+	 * The options set for the matched route.
+	 *
+	 * @var array|null
+	 */
+	protected $matchedRouteOptions;
+
+	/**
+	 * The locale that was detected in a route.
+	 *
+	 * @var string
+	 */
+	protected $detectedLocale;
+
+	/**
+	 * The filter info from Route Collection
+	 * if the matched route should be filtered.
+	 *
+	 * @var string|null
+	 */
+	protected $filterInfo;
+
+	//--------------------------------------------------------------------
+	/**
+	 * Stores a reference to the RouteCollection object.
+	 *
+	 * @param RouteCollectionInterface $routes
+	 * @param Request                  $request
+	 */
+	public function __construct(RouteCollectionInterface $routes, Request $request = null)
+	{
+		$this->collection = $routes;
+
+		$this->controller = $this->collection->getDefaultController();
+		$this->method     = $this->collection->getDefaultMethod();
+
+		// @phpstan-ignore-next-line
+		$this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * @param string|null $uri
+	 *
+	 * @return mixed|string
+	 * @throws RedirectException
+	 * @throws PageNotFoundException
+	 */
+	public function handle(string $uri = null)
+	{
+		$this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
+
+		// If we cannot find a URI to match against, then
+		// everything runs off of it's default settings.
+		if ($uri === null || $uri === '')
+		{
+			return strpos($this->controller, '\\') === false
+				? $this->collection->getDefaultNamespace() . $this->controller
+				: $this->controller;
+		}
+
+		// Decode URL-encoded string
+		$uri = urldecode($uri);
+
+		// Restart filterInfo
+		$this->filterInfo = null;
+
+		if ($this->checkRoutes($uri))
+		{
+			if ($this->collection->isFiltered($this->matchedRoute[0]))
+			{
+				$this->filterInfo = $this->collection->getFilterForRoute($this->matchedRoute[0]);
+			}
+
+			return $this->controller;
+		}
+
+		// Still here? Then we can try to match the URI against
+		// Controllers/directories, but the application may not
+		// want this, like in the case of API's.
+		if (! $this->collection->shouldAutoRoute())
+		{
+			throw new PageNotFoundException("Can't find a route for '{$uri}'.");
+		}
+
+		$this->autoRoute($uri);
+
+		return $this->controllerName();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the filter info for the matched route, if any.
+	 *
+	 * @return string
+	 */
+	public function getFilter()
+	{
+		return $this->filterInfo;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the matched controller.
+	 *
+	 * @return mixed
+	 */
+	public function controllerName()
+	{
+		return $this->translateURIDashes
+			? str_replace('-', '_', $this->controller)
+			: $this->controller;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the method to run in the
+	 * chosen container.
+	 *
+	 * @return string
+	 */
+	public function methodName(): string
+	{
+		return $this->translateURIDashes
+			? str_replace('-', '_', $this->method)
+			: $this->method;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the 404 Override settings from the Collection.
+	 * If the override is a string, will split to controller/index array.
+	 */
+	public function get404Override()
+	{
+		$route = $this->collection->get404Override();
+
+		if (is_string($route))
+		{
+			$routeArray = explode('::', $route);
+
+			return [
+				$routeArray[0], // Controller
+				$routeArray[1] ?? 'index',   // Method
+			];
+		}
+
+		if (is_callable($route))
+		{
+			return $route;
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the binds that have been matched and collected
+	 * during the parsing process as an array, ready to send to
+	 * instance->method(...$params).
+	 *
+	 * @return array
+	 */
+	public function params(): array
+	{
+		return $this->params;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the sub-directory the controller is in,
+	 * if any. Relative to APPPATH.'Controllers'.
+	 *
+	 * Only used when auto-routing is turned on.
+	 *
+	 * @return string
+	 */
+	public function directory(): string
+	{
+		return ! empty($this->directory) ? $this->directory : '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the routing information that was matched for this
+	 * request, if a route was defined.
+	 *
+	 * @return array|null
+	 */
+	public function getMatchedRoute()
+	{
+		return $this->matchedRoute;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns all options set for the matched route
+	 *
+	 * @return array|null
+	 */
+	public function getMatchedRouteOptions()
+	{
+		return $this->matchedRouteOptions;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the value that should be used to match the index.php file. Defaults
+	 * to index.php but this allows you to modify it in case your are using
+	 * something like mod_rewrite to remove the page. This allows you to set
+	 * it a blank.
+	 *
+	 * @param string $page
+	 *
+	 * @return $this
+	 */
+	public function setIndexPage($page): self
+	{
+		$this->indexPage = $page;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Tells the system whether we should translate URI dashes or not
+	 * in the URI from a dash to an underscore.
+	 *
+	 * @param boolean|false $val
+	 *
+	 * @return $this
+	 */
+	public function setTranslateURIDashes(bool $val = false): self
+	{
+		$this->translateURIDashes = $val;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns true/false based on whether the current route contained
+	 * a {locale} placeholder.
+	 *
+	 * @return boolean
+	 */
+	public function hasLocale()
+	{
+		return (bool) $this->detectedLocale;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the detected locale, if any, or null.
+	 *
+	 * @return string
+	 */
+	public function getLocale()
+	{
+		return $this->detectedLocale;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Compares the uri string against the routes that the
+	 * RouteCollection class defined for us, attempting to find a match.
+	 * This method will modify $this->controller, etal as needed.
+	 *
+	 * @param string $uri The URI path to compare against the routes
+	 *
+	 * @return boolean Whether the route was matched or not.
+	 * @throws RedirectException
+	 */
+	protected function checkRoutes(string $uri): bool
+	{
+		$routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
+
+		// Don't waste any time
+		if (empty($routes))
+		{
+			return false;
+		}
+
+		$uri = $uri === '/'
+			? $uri
+			: ltrim($uri, '/ ');
+
+		// Loop through the route array looking for wildcards
+		foreach ($routes as $key => $val)
+		{
+			// Reset localeSegment
+			$localeSegment = null;
+
+			$key = $key === '/'
+				? $key
+				: ltrim($key, '/ ');
+
+			$matchedKey = $key;
+
+			// Are we dealing with a locale?
+			if (strpos($key, '{locale}') !== false)
+			{
+				$localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $key), true);
+
+				// Replace it with a regex so it
+				// will actually match.
+				$key = str_replace('/', '\/', $key);
+				$key = str_replace('{locale}', '[^\/]+', $key);
+			}
+
+			// Does the RegEx match?
+			if (preg_match('#^' . $key . '$#u', $uri, $matches))
+			{
+				// Is this route supposed to redirect to another?
+				if ($this->collection->isRedirect($key))
+				{
+					throw new RedirectException(is_array($val) ? key($val) : $val, $this->collection->getRedirectCode($key));
+				}
+				// Store our locale so CodeIgniter object can
+				// assign it to the Request.
+				if (isset($localeSegment))
+				{
+					// The following may be inefficient, but doesn't upset NetBeans :-/
+					$temp                 = (explode('/', $uri));
+					$this->detectedLocale = $temp[$localeSegment];
+				}
+
+				// Are we using Closures? If so, then we need
+				// to collect the params into an array
+				// so it can be passed to the controller method later.
+				if (! is_string($val) && is_callable($val))
+				{
+					$this->controller = $val;
+
+					// Remove the original string from the matches array
+					array_shift($matches);
+
+					$this->params = $matches;
+
+					$this->matchedRoute = [
+						$matchedKey,
+						$val,
+					];
+
+					$this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
+
+					return true;
+				}
+				// Are we using the default method for back-references?
+
+				// Support resource route when function with subdirectory
+				// ex: $routes->resource('Admin/Admins');
+				if (strpos($val, '$') !== false && strpos($key, '(') !== false && strpos($key, '/') !== false)
+				{
+					$replacekey = str_replace('/(.*)', '', $key);
+					$val        = preg_replace('#^' . $key . '$#u', $val, $uri);
+					$val        = str_replace($replacekey, str_replace('/', '\\', $replacekey), $val);
+				}
+				elseif (strpos($val, '$') !== false && strpos($key, '(') !== false)
+				{
+					$val = preg_replace('#^' . $key . '$#u', $val, $uri);
+				}
+				elseif (strpos($val, '/') !== false)
+				{
+					[
+						$controller,
+						$method,
+					] = explode('::', $val);
+
+					// Only replace slashes in the controller, not in the method.
+					$controller = str_replace('/', '\\', $controller);
+
+					$val = $controller . '::' . $method;
+				}
+
+				$this->setRequest(explode('/', $val));
+
+				$this->matchedRoute = [
+					$matchedKey,
+					$val,
+				];
+
+				$this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to match a URI path against Controllers and directories
+	 * found in APPPATH/Controllers, to find a matching route.
+	 *
+	 * @param string $uri
+	 */
+	public function autoRoute(string $uri)
+	{
+		$segments = explode('/', $uri);
+
+		$segments = $this->scanControllers($segments);
+
+		// If we don't have any segments left - try the default controller;
+		// WARNING: Directories get shifted out of the segments array.
+		if (empty($segments))
+		{
+			$this->setDefaultController();
+		}
+		// If not empty, then the first segment should be the controller
+		else
+		{
+			$this->controller = ucfirst(array_shift($segments));
+		}
+
+		$controllerName = $this->controllerName();
+		if (! $this->isValidSegment($controllerName))
+		{
+			throw new PageNotFoundException($this->controller . ' is not a valid controller name');
+		}
+
+		// Use the method name if it exists.
+		// If it doesn't, no biggie - the default method name
+		// has already been set.
+		if (! empty($segments))
+		{
+			$this->method = array_shift($segments) ?: $this->method;
+		}
+
+		if (! empty($segments))
+		{
+			$this->params = $segments;
+		}
+
+		$defaultNamespace = $this->collection->getDefaultNamespace();
+		if ($this->collection->getHTTPVerb() !== 'cli')
+		{
+			$controller = '\\' . $defaultNamespace;
+
+			$controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
+			$controller .= $controllerName;
+
+			$controller = strtolower($controller);
+			$methodName = strtolower($this->methodName());
+
+			foreach ($this->collection->getRoutes('cli') as $route)
+			{
+				if (is_string($route))
+				{
+					$route = strtolower($route);
+					if (strpos($route, $controller . '::' . $methodName) === 0)
+					{
+						throw new PageNotFoundException();
+					}
+
+					if ($route === $controller)
+					{
+						throw new PageNotFoundException();
+					}
+				}
+			}
+		}
+
+		// Load the file so that it's available for CodeIgniter.
+		$file = APPPATH . 'Controllers/' . $this->directory . $controllerName . '.php';
+		if (is_file($file))
+		{
+			include_once $file;
+		}
+
+		// Ensure the controller stores the fully-qualified class name
+		// We have to check for a length over 1, since by default it will be '\'
+		if (strpos($this->controller, '\\') === false && strlen($defaultNamespace) > 1)
+		{
+			$this->controller = '\\' . ltrim(str_replace('/', '\\', $defaultNamespace . $this->directory . $controllerName), '\\');
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
+	 *
+	 * @param array $segments URI segments
+	 *
+	 * @return array returns an array of remaining uri segments that don't map onto a directory
+	 *
+	 * @deprecated this function name does not properly describe its behavior so it has been deprecated
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected function validateRequest(array $segments): array
+	{
+		return $this->scanControllers($segments);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
+	 *
+	 * @param array $segments URI segments
+	 *
+	 * @return array returns an array of remaining uri segments that don't map onto a directory
+	 */
+	protected function scanControllers(array $segments): array
+	{
+		$segments = array_filter($segments, function ($segment) {
+			return $segment !== '';
+		});
+		// numerically reindex the array, removing gaps
+		$segments = array_values($segments);
+
+		// if a prior directory value has been set, just return segments and get out of here
+		if (isset($this->directory))
+		{
+			return $segments;
+		}
+
+		// Loop through our segments and return as soon as a controller
+		// is found or when such a directory doesn't exist
+		$c = count($segments);
+		while ($c-- > 0)
+		{
+			$segmentConvert = ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
+			// as soon as we encounter any segment that is not PSR-4 compliant, stop searching
+			if (! $this->isValidSegment($segmentConvert))
+			{
+				return $segments;
+			}
+
+			$test = APPPATH . 'Controllers/' . $this->directory . $segmentConvert;
+
+			// as long as each segment is *not* a controller file but does match a directory, add it to $this->directory
+			if (! is_file($test . '.php') && is_dir($test))
+			{
+				$this->setDirectory($segmentConvert, true, false);
+				array_shift($segments);
+				continue;
+			}
+
+			return $segments;
+		}
+
+		// This means that all segments were actually directories
+		return $segments;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the sub-directory that the controller is in.
+	 *
+	 * @param string|null $dir
+	 * @param boolean     $append
+	 * @param boolean     $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+	 */
+	public function setDirectory(string $dir = null, bool $append = false, bool $validate = true)
+	{
+		if (empty($dir))
+		{
+			$this->directory = null;
+			return;
+		}
+
+		if ($validate)
+		{
+			$segments = explode('/', trim($dir, '/'));
+			foreach ($segments as $segment)
+			{
+				if (! $this->isValidSegment($segment))
+				{
+					return;
+				}
+			}
+		}
+
+		if ($append !== true || empty($this->directory))
+		{
+			$this->directory = trim($dir, '/') . '/';
+		}
+		else
+		{
+			$this->directory .= trim($dir, '/') . '/';
+		}
+	}
+
+	/**
+	 * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
+	 *
+	 * regex comes from https://www.php.net/manual/en/language.variables.basics.php
+	 *
+	 * @param  string $segment
+	 * @return boolean
+	 */
+	private function isValidSegment(string $segment): bool
+	{
+		return (bool) preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $segment);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Set request route
+	 *
+	 * Takes an array of URI segments as input and sets the class/method
+	 * to be called.
+	 *
+	 * @param array $segments URI segments
+	 */
+	protected function setRequest(array $segments = [])
+	{
+		// If we don't have any segments - try the default controller;
+		if (empty($segments))
+		{
+			$this->setDefaultController();
+
+			return;
+		}
+
+		[$controller, $method] = array_pad(explode('::', $segments[0]), 2, null);
+
+		$this->controller = $controller;
+
+		// $this->method already contains the default method name,
+		// so don't overwrite it with emptiness.
+		if (! empty($method))
+		{
+			$this->method = $method;
+		}
+
+		array_shift($segments);
+
+		$this->params = $segments;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default controller based on the info set in the RouteCollection.
+	 */
+	protected function setDefaultController()
+	{
+		if (empty($this->controller))
+		{
+			throw RouterException::forMissingDefaultRoute();
+		}
+
+		// Is the method being specified?
+		if (sscanf($this->controller, '%[^/]/%s', $class, $this->method) !== 2)
+		{
+			$this->method = 'index';
+		}
+
+		if (! is_file(APPPATH . 'Controllers/' . $this->directory . ucfirst($class) . '.php'))
+		{
+			return;
+		}
+
+		$this->controller = ucfirst($class);
+
+		log_message('info', 'Used the default controller.');
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
new file mode 100644
index 0000000..d5522e1
--- /dev/null
+++ b/system/Router/RouterInterface.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use CodeIgniter\HTTP\Request;
+
+/**
+ * Expected behavior of a Router.
+ */
+interface RouterInterface
+{
+	/**
+	 * Stores a reference to the RouteCollection object.
+	 *
+	 * @param RouteCollectionInterface $routes
+	 * @param Request                  $request
+	 */
+	public function __construct(RouteCollectionInterface $routes, Request $request = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Scans the URI and attempts to match the current URI to the
+	 * one of the defined routes in the RouteCollection.
+	 *
+	 * @param string $uri
+	 *
+	 * @return mixed
+	 */
+	public function handle(string $uri = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the matched controller.
+	 *
+	 * @return mixed
+	 */
+	public function controllerName();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the name of the method to run in the
+	 * chosen container.
+	 *
+	 * @return mixed
+	 */
+	public function methodName();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the binds that have been matched and collected
+	 * during the parsing process as an array, ready to send to
+	 * instance->method(...$params).
+	 *
+	 * @return mixed
+	 */
+	public function params();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the value that should be used to match the index.php file. Defaults
+	 * to index.php but this allows you to modify it in case your are using
+	 * something like mod_rewrite to remove the page. This allows you to set
+	 * it a blank.
+	 *
+	 * @param string $page
+	 *
+	 * @return mixed
+	 */
+	public function setIndexPage($page);
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Security/Exceptions/SecurityException.php b/system/Security/Exceptions/SecurityException.php
new file mode 100644
index 0000000..9e096b8
--- /dev/null
+++ b/system/Security/Exceptions/SecurityException.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class SecurityException extends FrameworkException
+{
+	public static function forDisallowedAction()
+	{
+		return new static(lang('Security.disallowedAction'), 403);
+	}
+
+	/**
+	 * @deprecated Use `CookieException::forInvalidSameSite()` instead.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function forInvalidSameSite(string $samesite)
+	{
+		return new static(lang('Security.invalidSameSite', [$samesite]));
+	}
+}
diff --git a/system/Security/Security.php b/system/Security/Security.php
new file mode 100644
index 0000000..22ae21f
--- /dev/null
+++ b/system/Security/Security.php
@@ -0,0 +1,463 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security;
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Security\Exceptions\SecurityException;
+use Config\App;
+use Config\Cookie as CookieConfig;
+use Config\Security as SecurityConfig;
+
+/**
+ * Class Security
+ *
+ * Provides methods that help protect your site against
+ * Cross-Site Request Forgery attacks.
+ */
+class Security implements SecurityInterface
+{
+	/**
+	 * CSRF Hash
+	 *
+	 * Random hash for Cross Site Request Forgery protection cookie
+	 *
+	 * @var string|null
+	 */
+	protected $hash = null;
+
+	/**
+	 * CSRF Token Name
+	 *
+	 * Token name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	protected $tokenName = 'csrf_token_name';
+
+	/**
+	 * CSRF Header Name
+	 *
+	 * Token name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	protected $headerName = 'X-CSRF-TOKEN';
+
+	/**
+	 * The CSRF Cookie instance.
+	 *
+	 * @var Cookie
+	 */
+	protected $cookie;
+
+	/**
+	 * CSRF Cookie Name
+	 *
+	 * Cookie name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	protected $cookieName = 'csrf_cookie_name';
+
+	/**
+	 * CSRF Expires
+	 *
+	 * Expiration time for Cross Site Request Forgery protection cookie.
+	 *
+	 * Defaults to two hours (in seconds).
+	 *
+	 * @var integer
+	 *
+	 * @deprecated
+	 */
+	protected $expires = 7200;
+
+	/**
+	 * CSRF Regenerate
+	 *
+	 * Regenerate CSRF Token on every request.
+	 *
+	 * @var boolean
+	 */
+	protected $regenerate = true;
+
+	/**
+	 * CSRF Redirect
+	 *
+	 * Redirect to previous page with error on failure.
+	 *
+	 * @var boolean
+	 */
+	protected $redirect = true;
+
+	/**
+	 * CSRF SameSite
+	 *
+	 * Setting for CSRF SameSite cookie token.
+	 *
+	 * Allowed values are: None - Lax - Strict - ''.
+	 *
+	 * Defaults to `Lax` as recommended in this link:
+	 *
+	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
+	 *
+	 * @var string
+	 *
+	 * @deprecated
+	 */
+	protected $samesite = Cookie::SAMESITE_LAX;
+
+	/**
+	 * Constructor.
+	 *
+	 * Stores our configuration and fires off the init() method to setup
+	 * initial state.
+	 *
+	 * @param App $config
+	 */
+	public function __construct(App $config)
+	{
+		/** @var SecurityConfig */
+		$security = config('Security');
+
+		// Store CSRF-related configurations
+		$this->tokenName  = $security->tokenName ?? $config->CSRFTokenName ?? $this->tokenName;
+		$this->headerName = $security->headerName ?? $config->CSRFHeaderName ?? $this->headerName;
+		$this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
+		$rawCookieName    = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
+
+		/** @var CookieConfig */
+		$cookie = config('Cookie');
+
+		$cookiePrefix     = $cookie->prefix ?? $config->cookiePrefix;
+		$this->cookieName = $cookiePrefix . $rawCookieName;
+
+		$expires = $security->expires ?? $config->CSRFExpire ?? 7200;
+
+		Cookie::setDefaults($cookie);
+		$this->cookie = new Cookie($rawCookieName, $this->generateHash(), [
+			'expires' => $expires === 0 ? 0 : time() + $expires,
+		]);
+	}
+
+	/**
+	 * CSRF Verify
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return $this|false
+	 *
+	 * @throws SecurityException
+	 *
+	 * @deprecated Use `CodeIgniter\Security\Security::verify()` instead of using this method.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function CSRFVerify(RequestInterface $request)
+	{
+		return $this->verify($request);
+	}
+
+	/**
+	 * Returns the CSRF Hash.
+	 *
+	 * @return string|null
+	 *
+	 * @deprecated Use `CodeIgniter\Security\Security::getHash()` instead of using this method.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getCSRFHash(): ?string
+	{
+		return $this->getHash();
+	}
+
+	/**
+	 * Returns the CSRF Token Name.
+	 *
+	 * @return string
+	 *
+	 * @deprecated Use `CodeIgniter\Security\Security::getTokenName()` instead of using this method.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getCSRFTokenName(): string
+	{
+		return $this->getTokenName();
+	}
+
+	/**
+	 * CSRF Verify
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return $this|false
+	 *
+	 * @throws SecurityException
+	 */
+	public function verify(RequestInterface $request)
+	{
+		// If it's not a POST request we will set the CSRF cookie.
+		if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST')
+		{
+			return $this->sendCookie($request);
+		}
+
+		// Does the token exist in POST, HEADER or optionally php:://input - json data.
+		if ($request->hasHeader($this->headerName) && ! empty($request->getHeader($this->headerName)->getValue()))
+		{
+			$tokenName = $request->getHeader($this->headerName)->getValue();
+		}
+		else
+		{
+			$json = json_decode($request->getBody());
+
+			if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE)
+			{
+				$tokenName = $json->{$this->tokenName} ?? null;
+			}
+			else
+			{
+				$tokenName = null;
+			}
+		}
+
+		$token = $_POST[$this->tokenName] ?? $tokenName;
+
+		// Does the tokens exist in both the POST/POSTed JSON and COOKIE arrays and match?
+		if (! isset($token, $_COOKIE[$this->cookieName]) || ! hash_equals($token, $_COOKIE[$this->cookieName]))
+		{
+			throw SecurityException::forDisallowedAction();
+		}
+
+		if (isset($_POST[$this->tokenName]))
+		{
+			// We kill this since we're done and we don't want to pollute the POST array.
+			unset($_POST[$this->tokenName]);
+			$request->setGlobal('post', $_POST);
+		}
+		elseif (isset($json->{$this->tokenName}))
+		{
+			// We kill this since we're done and we don't want to pollute the JSON data.
+			unset($json->{$this->tokenName});
+			$request->setBody(json_encode($json));
+		}
+
+		if ($this->regenerate)
+		{
+			$this->hash = null;
+			unset($_COOKIE[$this->cookieName]);
+		}
+
+		$this->cookie = $this->cookie->withValue($this->generateHash());
+		$this->sendCookie($request);
+
+		log_message('info', 'CSRF token verified.');
+
+		return $this;
+	}
+
+	/**
+	 * Returns the CSRF Hash.
+	 *
+	 * @return string|null
+	 */
+	public function getHash(): ?string
+	{
+		return $this->hash;
+	}
+
+	/**
+	 * Returns the CSRF Token Name.
+	 *
+	 * @return string
+	 */
+	public function getTokenName(): string
+	{
+		return $this->tokenName;
+	}
+
+	/**
+	 * Returns the CSRF Header Name.
+	 *
+	 * @return string
+	 */
+	public function getHeaderName(): string
+	{
+		return $this->headerName;
+	}
+
+	/**
+	 * Returns the CSRF Cookie Name.
+	 *
+	 * @return string
+	 */
+	public function getCookieName(): string
+	{
+		return $this->cookieName;
+	}
+
+	/**
+	 * Check if CSRF cookie is expired.
+	 *
+	 * @return boolean
+	 *
+	 * @deprecated
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function isExpired(): bool
+	{
+		return $this->cookie->isExpired();
+	}
+	/**
+	 * Check if request should be redirect on failure.
+	 *
+	 * @return boolean
+	 */
+	public function shouldRedirect(): bool
+	{
+		return $this->redirect;
+	}
+
+	/**
+	 * Sanitize Filename
+	 *
+	 * Tries to sanitize filenames in order to prevent directory traversal attempts
+	 * and other security threats, which is particularly useful for files that
+	 * were supplied via user input.
+	 *
+	 * If it is acceptable for the user input to include relative paths,
+	 * e.g. file/in/some/approved/folder.txt, you can set the second optional
+	 * parameter, $relative_path to TRUE.
+	 *
+	 * @param string  $str          Input file name
+	 * @param boolean $relativePath Whether to preserve paths
+	 *
+	 * @return string
+	 */
+	public function sanitizeFilename(string $str, bool $relativePath = false): string
+	{
+		// List of sanitize filename strings
+		$bad = [
+			'../',
+			'<!--',
+			'-->',
+			'<',
+			'>',
+			"'",
+			'"',
+			'&',
+			'$',
+			'#',
+			'{',
+			'}',
+			'[',
+			']',
+			'=',
+			';',
+			'?',
+			'%20',
+			'%22',
+			'%3c',
+			'%253c',
+			'%3e',
+			'%0e',
+			'%28',
+			'%29',
+			'%2528',
+			'%26',
+			'%24',
+			'%3f',
+			'%3b',
+			'%3d',
+		];
+
+		if (! $relativePath)
+		{
+			$bad[] = './';
+			$bad[] = '/';
+		}
+
+		$str = remove_invisible_characters($str, false);
+
+		do
+		{
+			$old = $str;
+			$str = str_replace($bad, '', $str);
+		}
+		while ($old !== $str);
+
+		return stripslashes($str);
+	}
+
+	/**
+	 * Generates the CSRF Hash.
+	 *
+	 * @return string
+	 */
+	protected function generateHash(): string
+	{
+		if (is_null($this->hash))
+		{
+			// If the cookie exists we will use its value.
+			// We don't necessarily want to regenerate it with
+			// each page load since a page could contain embedded
+			// sub-pages causing this feature to fail
+			if (isset($_COOKIE[$this->cookieName])
+				&& is_string($_COOKIE[$this->cookieName])
+				&& preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1
+			)
+			{
+				return $this->hash = $_COOKIE[$this->cookieName];
+			}
+
+			$this->hash = bin2hex(random_bytes(16));
+		}
+
+		return $this->hash;
+	}
+
+	/**
+	 * CSRF Send Cookie
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return Security|false
+	 */
+	protected function sendCookie(RequestInterface $request)
+	{
+		if ($this->cookie->isSecure() && ! $request->isSecure())
+		{
+			return false;
+		}
+
+		$this->doSendCookie();
+		log_message('info', 'CSRF cookie sent.');
+
+		return $this;
+	}
+
+	/**
+	 * Actual dispatching of cookies.
+	 * Extracted for this to be unit tested.
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @return void
+	 */
+	protected function doSendCookie(): void
+	{
+		cookies([$this->cookie], false)->dispatch();
+	}
+}
diff --git a/system/Security/SecurityInterface.php b/system/Security/SecurityInterface.php
new file mode 100644
index 0000000..e77ded3
--- /dev/null
+++ b/system/Security/SecurityInterface.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Security\Exceptions\SecurityException;
+
+/**
+ * Expected behavior of a Security.
+ */
+interface SecurityInterface
+{
+	/**
+	 * CSRF Verify
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return $this|false
+	 *
+	 * @throws SecurityException
+	 */
+	public function verify(RequestInterface $request);
+
+	/**
+	 * Returns the CSRF Hash.
+	 *
+	 * @return string|null
+	 */
+	public function getHash(): ?string;
+
+	/**
+	 * Returns the CSRF Token Name.
+	 *
+	 * @return string
+	 */
+	public function getTokenName(): string;
+
+	/**
+	 * Returns the CSRF Header Name.
+	 *
+	 * @return string
+	 */
+	public function getHeaderName(): string;
+
+	/**
+	 * Returns the CSRF Cookie Name.
+	 *
+	 * @return string
+	 */
+	public function getCookieName(): string;
+
+	/**
+	 * Check if CSRF cookie is expired.
+	 *
+	 * @return boolean
+	 *
+	 * @deprecated
+	 */
+	public function isExpired(): bool;
+
+	/**
+	 * Check if request should be redirect on failure.
+	 *
+	 * @return boolean
+	 */
+	public function shouldRedirect(): bool;
+
+	/**
+	 * Sanitize Filename
+	 *
+	 * Tries to sanitize filenames in order to prevent directory traversal attempts
+	 * and other security threats, which is particularly useful for files that
+	 * were supplied via user input.
+	 *
+	 * If it is acceptable for the user input to include relative paths,
+	 * e.g. file/in/some/approved/folder.txt, you can set the second optional
+	 * parameter, $relative_path to TRUE.
+	 *
+	 * @param string  $str          Input file name
+	 * @param boolean $relativePath Whether to preserve paths
+	 *
+	 * @return string
+	 */
+	public function sanitizeFilename(string $str, bool $relativePath = false): string;
+}
diff --git a/system/Session/Exceptions/SessionException.php b/system/Session/Exceptions/SessionException.php
new file mode 100644
index 0000000..4e23b51
--- /dev/null
+++ b/system/Session/Exceptions/SessionException.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class SessionException extends FrameworkException
+{
+	public static function forMissingDatabaseTable()
+	{
+		return new static(lang('Session.missingDatabaseTable'));
+	}
+
+	public static function forInvalidSavePath(string $path = null)
+	{
+		return new static(lang('Session.invalidSavePath', [$path]));
+	}
+
+	public static function forWriteProtectedSavePath(string $path = null)
+	{
+		return new static(lang('Session.writeProtectedSavePath', [$path]));
+	}
+
+	public static function forEmptySavepath()
+	{
+		return new static(lang('Session.emptySavePath'));
+	}
+
+	public static function forInvalidSavePathFormat(string $path)
+	{
+		return new static(lang('Session.invalidSavePathFormat', [$path]));
+	}
+
+	/**
+	 * @deprecated
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function forInvalidSameSiteSetting(string $samesite)
+	{
+		return new static(lang('Session.invalidSameSiteSetting', [$samesite]));
+	}
+}
diff --git a/system/Session/Handlers/ArrayHandler.php b/system/Session/Handlers/ArrayHandler.php
new file mode 100644
index 0000000..ef4a266
--- /dev/null
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use Exception;
+
+/**
+ * Session handler using static array for storage.
+ * Intended only for use during testing.
+ */
+class ArrayHandler extends BaseHandler
+{
+	protected static $cache = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Open
+	 *
+	 * Ensures we have an initialized database connection.
+	 *
+	 * @param string $savePath Path to session files' directory
+	 * @param string $name     Session cookie name
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function open($savePath, $name): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Read
+	 *
+	 * Reads session data and acquires a lock
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return string    Serialized session data
+	 */
+	public function read($sessionID): string
+	{
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write
+	 *
+	 * Writes (create / update) session data
+	 *
+	 * @param string $sessionID   Session ID
+	 * @param string $sessionData Serialized session data
+	 *
+	 * @return boolean
+	 */
+	public function write($sessionID, $sessionData): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close
+	 *
+	 * Releases locks and closes file descriptor.
+	 *
+	 * @return boolean
+	 */
+	public function close(): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destroy
+	 *
+	 * Destroys the current session.
+	 *
+	 * @param string $sessionID
+	 *
+	 * @return boolean
+	 */
+	public function destroy($sessionID): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Garbage Collector
+	 *
+	 * Deletes expired sessions
+	 *
+	 * @param integer $maxlifetime Maximum lifetime of sessions
+	 *
+	 * @return boolean
+	 */
+	public function gc($maxlifetime): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
new file mode 100644
index 0000000..0487ca4
--- /dev/null
+++ b/system/Session/Handlers/BaseHandler.php
@@ -0,0 +1,190 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use Config\App as AppConfig;
+use Psr\Log\LoggerAwareTrait;
+use SessionHandlerInterface;
+
+/**
+ * Base class for session handling
+ */
+abstract class BaseHandler implements SessionHandlerInterface
+{
+	use LoggerAwareTrait;
+
+	/**
+	 * The Data fingerprint.
+	 *
+	 * @var string
+	 */
+	protected $fingerprint;
+
+	/**
+	 * Lock placeholder.
+	 *
+	 * @var mixed
+	 */
+	protected $lock = false;
+
+	/**
+	 * Cookie prefix
+	 *
+	 * @var string
+	 */
+	protected $cookiePrefix = '';
+
+	/**
+	 * Cookie domain
+	 *
+	 * @var string
+	 */
+	protected $cookieDomain = '';
+
+	/**
+	 * Cookie path
+	 *
+	 * @var string
+	 */
+	protected $cookiePath = '/';
+
+	/**
+	 * Cookie secure?
+	 *
+	 * @var boolean
+	 */
+	protected $cookieSecure = false;
+
+	/**
+	 * Cookie name to use
+	 *
+	 * @var string
+	 */
+	protected $cookieName;
+
+	/**
+	 * Match IP addresses for cookies?
+	 *
+	 * @var boolean
+	 */
+	protected $matchIP = false;
+
+	/**
+	 * Current session ID
+	 *
+	 * @var string
+	 */
+	protected $sessionID;
+
+	/**
+	 * The 'save path' for the session
+	 * varies between
+	 *
+	 * @var string|array
+	 */
+	protected $savePath;
+
+	/**
+	 * User's IP address.
+	 *
+	 * @var string
+	 */
+	protected $ipAddress;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
+	 */
+	public function __construct(AppConfig $config, string $ipAddress)
+	{
+		$this->cookiePrefix = $config->cookiePrefix;
+		$this->cookieDomain = $config->cookieDomain;
+		$this->cookiePath   = $config->cookiePath;
+		$this->cookieSecure = $config->cookieSecure;
+		$this->cookieName   = $config->sessionCookieName;
+		$this->matchIP      = $config->sessionMatchIP;
+		$this->savePath     = $config->sessionSavePath;
+		$this->ipAddress    = $ipAddress;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Internal method to force removal of a cookie by the client
+	 * when session_destroy() is called.
+	 *
+	 * @return boolean
+	 */
+	protected function destroyCookie(): bool
+	{
+		return setcookie(
+				$this->cookieName, '', 1, $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A dummy method allowing drivers with no locking functionality
+	 * (databases other than PostgreSQL and MySQL) to act as if they
+	 * do acquire a lock.
+	 *
+	 * @param string $sessionID
+	 *
+	 * @return boolean
+	 */
+	protected function lockSession(string $sessionID): bool
+	{
+		$this->lock = true;
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Releases the lock, if any.
+	 *
+	 * @return boolean
+	 */
+	protected function releaseLock(): bool
+	{
+		$this->lock = false;
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fail
+	 *
+	 * Drivers other than the 'files' one don't (need to) use the
+	 * session.save_path INI setting, but that leads to confusing
+	 * error messages emitted by PHP when open() or write() fail,
+	 * as the message contains session.save_path ...
+	 * To work around the problem, the drivers will call this method
+	 * so that the INI is set just in time for the error message to
+	 * be properly generated.
+	 *
+	 * @return boolean
+	 */
+	protected function fail(): bool
+	{
+		ini_set('session.save_path', $this->savePath);
+
+		return false;
+	}
+}
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
new file mode 100644
index 0000000..0f4bda2
--- /dev/null
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -0,0 +1,403 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Config\Database;
+use Exception;
+
+/**
+ * Session handler using current Database for storage
+ */
+class DatabaseHandler extends BaseHandler
+{
+	/**
+	 * The database group to use for storage.
+	 *
+	 * @var string
+	 */
+	protected $DBGroup;
+
+	/**
+	 * The name of the table to store session info.
+	 *
+	 * @var string
+	 */
+	protected $table;
+
+	/**
+	 * The DB Connection instance.
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * The database type, for locking purposes.
+	 *
+	 * @var string
+	 */
+	protected $platform;
+
+	/**
+	 * Row exists flag
+	 *
+	 * @var boolean
+	 */
+	protected $rowExists = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
+	 */
+	public function __construct(AppConfig $config, string $ipAddress)
+	{
+		parent::__construct($config, $ipAddress);
+
+		// Determine Table
+		$this->table = $config->sessionSavePath;
+
+		if (empty($this->table))
+		{
+			throw SessionException::forMissingDatabaseTable();
+		}
+
+		// Get DB Connection
+		// @phpstan-ignore-next-line
+		$this->DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
+
+		$this->db = Database::connect($this->DBGroup);
+
+		// Determine Database type
+		$driver = strtolower(get_class($this->db));
+		if (strpos($driver, 'mysql') !== false)
+		{
+			$this->platform = 'mysql';
+		}
+		elseif (strpos($driver, 'postgre') !== false)
+		{
+			$this->platform = 'postgre';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Open
+	 *
+	 * Ensures we have an initialized database connection.
+	 *
+	 * @param string $savePath Path to session files' directory
+	 * @param string $name     Session cookie name
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function open($savePath, $name): bool
+	{
+		if (empty($this->db->connID))
+		{
+			$this->db->initialize();
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Read
+	 *
+	 * Reads session data and acquires a lock
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return string    Serialized session data
+	 */
+	public function read($sessionID): string
+	{
+		if ($this->lockSession($sessionID) === false)
+		{
+			$this->fingerprint = md5('');
+			return '';
+		}
+
+		// Needed by write() to detect session_regenerate_id() calls
+		if (is_null($this->sessionID)) // @phpstan-ignore-line
+		{
+			$this->sessionID = $sessionID;
+		}
+
+		$builder = $this->db->table($this->table)
+				->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
+				->where('id', $sessionID);
+
+		if ($this->matchIP)
+		{
+			$builder = $builder->where('ip_address', $this->ipAddress);
+		}
+
+		$result = $builder->get()->getRow();
+
+		if ($result === null)
+		{
+			// PHP7 will reuse the same SessionHandler object after
+			// ID regeneration, so we need to explicitly set this to
+			// FALSE instead of relying on the default ...
+			$this->rowExists   = false;
+			$this->fingerprint = md5('');
+
+			return '';
+		}
+
+		if (is_bool($result))
+		{
+			$result = '';
+		}
+		else
+		{
+			$result = ($this->platform === 'postgre') ? base64_decode(rtrim($result->data), true) : $result->data;
+		}
+
+		$this->fingerprint = md5($result);
+		$this->rowExists   = true;
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write
+	 *
+	 * Writes (create / update) session data
+	 *
+	 * @param string $sessionID   Session ID
+	 * @param string $sessionData Serialized session data
+	 *
+	 * @return boolean
+	 */
+	public function write($sessionID, $sessionData): bool
+	{
+		if ($this->lock === false)
+		{
+			return $this->fail();
+		}
+
+		// Was the ID regenerated?
+		if ($sessionID !== $this->sessionID)
+		{
+			$this->rowExists = false;
+			$this->sessionID = $sessionID;
+		}
+
+		if ($this->rowExists === false)
+		{
+			$insertData = [
+				'id'         => $sessionID,
+				'ip_address' => $this->ipAddress,
+				'timestamp'  => 'now()',
+				'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($sessionData) : $sessionData,
+			];
+
+			if (! $this->db->table($this->table)->insert($insertData))
+			{
+				return $this->fail();
+			}
+
+			$this->fingerprint = md5($sessionData);
+			$this->rowExists   = true;
+
+			return true;
+		}
+
+		$builder = $this->db->table($this->table)->where('id', $sessionID);
+
+		if ($this->matchIP)
+		{
+			$builder = $builder->where('ip_address', $this->ipAddress);
+		}
+
+		$updateData = [
+			'timestamp' => 'now()',
+		];
+
+		if ($this->fingerprint !== md5($sessionData))
+		{
+			$updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($sessionData) : $sessionData;
+		}
+
+		if (! $builder->update($updateData))
+		{
+			return $this->fail();
+		}
+
+		$this->fingerprint = md5($sessionData);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close
+	 *
+	 * Releases locks and closes file descriptor.
+	 *
+	 * @return boolean
+	 */
+	public function close(): bool
+	{
+		return ($this->lock && ! $this->releaseLock()) ? $this->fail() : true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destroy
+	 *
+	 * Destroys the current session.
+	 *
+	 * @param string $sessionID
+	 *
+	 * @return boolean
+	 */
+	public function destroy($sessionID): bool
+	{
+		if ($this->lock)
+		{
+			$builder = $this->db->table($this->table)->where('id', $sessionID);
+
+			if ($this->matchIP)
+			{
+				$builder = $builder->where('ip_address', $this->ipAddress);
+			}
+
+			if (! $builder->delete())
+			{
+				return $this->fail();
+			}
+		}
+
+		if ($this->close())
+		{
+			$this->destroyCookie();
+
+			return true;
+		}
+
+		return $this->fail();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Garbage Collector
+	 *
+	 * Deletes expired sessions
+	 *
+	 * @param integer $maxlifetime Maximum lifetime of sessions
+	 *
+	 * @return boolean
+	 */
+	public function gc($maxlifetime): bool
+	{
+		$interval = implode(" '"[(int)($this->platform === 'postgre')], ['', "{$maxlifetime} second", '']);
+		return ($this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}")) ? true : $this->fail();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Lock the session.
+	 *
+	 * @param  string $sessionID
+	 * @return boolean
+	 */
+	protected function lockSession(string $sessionID): bool
+	{
+		if ($this->platform === 'mysql')
+		{
+			$arg = md5($sessionID . ($this->matchIP ? '_' . $this->ipAddress : ''));
+			if ($this->db->query("SELECT GET_LOCK('{$arg}', 300) AS ci_session_lock")->getRow()->ci_session_lock)
+			{
+				$this->lock = $arg;
+				return true;
+			}
+
+			return $this->fail();
+		}
+
+		if ($this->platform === 'postgre')
+		{
+			$arg = "hashtext('{$sessionID}')" . ($this->matchIP ? ", hashtext('{$this->ipAddress}')" : '');
+			if ($this->db->simpleQuery("SELECT pg_advisory_lock({$arg})"))
+			{
+				$this->lock = $arg;
+				return true;
+			}
+
+			return $this->fail();
+		}
+
+		// Unsupported DB? Let the parent handle the simplified version.
+		return parent::lockSession($sessionID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Releases the lock, if any.
+	 *
+	 * @return boolean
+	 */
+	protected function releaseLock(): bool
+	{
+		if (! $this->lock)
+		{
+			return true;
+		}
+
+		if ($this->platform === 'mysql')
+		{
+			if ($this->db->query("SELECT RELEASE_LOCK('{$this->lock}') AS ci_session_lock")->getRow()->ci_session_lock)
+			{
+				$this->lock = false;
+				return true;
+			}
+
+			return $this->fail();
+		}
+
+		if ($this->platform === 'postgre')
+		{
+			if ($this->db->simpleQuery("SELECT pg_advisory_unlock({$this->lock})"))
+			{
+				$this->lock = false;
+				return true;
+			}
+
+			return $this->fail();
+		}
+
+		// Unsupported DB? Let the parent handle the simple version.
+		return parent::releaseLock();
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
new file mode 100644
index 0000000..dc28cd4
--- /dev/null
+++ b/system/Session/Handlers/FileHandler.php
@@ -0,0 +1,406 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Exception;
+
+/**
+ * Session handler using file system for storage
+ */
+class FileHandler extends BaseHandler
+{
+	/**
+	 * Where to save the session files to.
+	 *
+	 * @var string
+	 */
+	protected $savePath;
+
+	/**
+	 * The file handle
+	 *
+	 * @var resource|null
+	 */
+	protected $fileHandle;
+
+	/**
+	 * File Name
+	 *
+	 * @var string
+	 */
+	protected $filePath;
+
+	/**
+	 * Whether this is a new file.
+	 *
+	 * @var boolean
+	 */
+	protected $fileNew;
+
+	/**
+	 * Whether IP addresses should be matched.
+	 *
+	 * @var boolean
+	 */
+	protected $matchIP = false;
+
+	/**
+	 * Regex of session ID
+	 *
+	 * @var string
+	 */
+	protected $sessionIDRegex = '';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
+	 */
+	public function __construct(AppConfig $config, string $ipAddress)
+	{
+		parent::__construct($config, $ipAddress);
+
+		if (! empty($config->sessionSavePath))
+		{
+			$this->savePath = rtrim($config->sessionSavePath, '/\\');
+			ini_set('session.save_path', $config->sessionSavePath);
+		}
+		else
+		{
+			$sessionPath = rtrim(ini_get('session.save_path'), '/\\');
+
+			if (! $sessionPath)
+			{
+				$sessionPath = WRITEPATH . 'session';
+			}
+
+			$this->savePath = $sessionPath;
+		}
+
+		$this->matchIP = $config->sessionMatchIP;
+
+		$this->configureSessionIDRegex();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Open
+	 *
+	 * Sanitizes the save_path directory.
+	 *
+	 * @param string $savePath Path to session files' directory
+	 * @param string $name     Session cookie name
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function open($savePath, $name): bool
+	{
+		if (! is_dir($savePath))
+		{
+			if (! mkdir($savePath, 0700, true))
+			{
+				throw SessionException::forInvalidSavePath($this->savePath);
+			}
+		}
+		elseif (! is_writable($savePath))
+		{
+			throw SessionException::forWriteProtectedSavePath($this->savePath);
+		}
+
+		$this->savePath = $savePath;
+		$this->filePath = $this->savePath . '/'
+						  . $name // we'll use the session cookie name as a prefix to avoid collisions
+						  . ($this->matchIP ? md5($this->ipAddress) : '');
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Read
+	 *
+	 * Reads session data and acquires a lock
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return string|boolean    Serialized session data
+	 */
+	public function read($sessionID)
+	{
+		// This might seem weird, but PHP 5.6 introduced session_reset(),
+		// which re-reads session data
+		if ($this->fileHandle === null)
+		{
+			$this->fileNew = ! is_file($this->filePath . $sessionID);
+
+			if (($this->fileHandle = fopen($this->filePath . $sessionID, 'c+b')) === false)
+			{
+				$this->logger->error("Session: Unable to open file '" . $this->filePath . $sessionID . "'.");
+
+				return false;
+			}
+
+			if (flock($this->fileHandle, LOCK_EX) === false)
+			{
+				$this->logger->error("Session: Unable to obtain lock for file '" . $this->filePath . $sessionID . "'.");
+				fclose($this->fileHandle);
+				$this->fileHandle = null;
+
+				return false;
+			}
+
+			// Needed by write() to detect session_regenerate_id() calls
+			if (is_null($this->sessionID)) // @phpstan-ignore-line
+			{
+				$this->sessionID = $sessionID;
+			}
+
+			if ($this->fileNew)
+			{
+				chmod($this->filePath . $sessionID, 0600);
+				$this->fingerprint = md5('');
+
+				return '';
+			}
+		}
+		else
+		{
+			rewind($this->fileHandle);
+		}
+
+		$sessionData = '';
+		clearstatcache();    // Address https://github.com/codeigniter4/CodeIgniter4/issues/2056
+		for ($read = 0, $length = filesize($this->filePath . $sessionID); $read < $length; $read += strlen($buffer))
+		{
+			if (($buffer = fread($this->fileHandle, $length - $read)) === false)
+			{
+				break;
+			}
+
+			$sessionData .= $buffer;
+		}
+
+		$this->fingerprint = md5($sessionData);
+
+		return $sessionData;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write
+	 *
+	 * Writes (create / update) session data
+	 *
+	 * @param string $sessionID   Session ID
+	 * @param string $sessionData Serialized session data
+	 *
+	 * @return boolean
+	 */
+	public function write($sessionID, $sessionData): bool
+	{
+		// If the two IDs don't match, we have a session_regenerate_id() call
+		if ($sessionID !== $this->sessionID)
+		{
+			$this->sessionID = $sessionID;
+		}
+
+		if (! is_resource($this->fileHandle))
+		{
+			return false;
+		}
+
+		if ($this->fingerprint === md5($sessionData))
+		{
+			return ($this->fileNew) ? true : touch($this->filePath . $sessionID);
+		}
+
+		if (! $this->fileNew)
+		{
+			ftruncate($this->fileHandle, 0);
+			rewind($this->fileHandle);
+		}
+
+		if (($length = strlen($sessionData)) > 0)
+		{
+			$result = null;
+
+			for ($written = 0; $written < $length; $written += $result)
+			{
+				if (($result = fwrite($this->fileHandle, substr($sessionData, $written))) === false)
+				{
+					break;
+				}
+			}
+
+			if (! is_int($result))
+			{
+				$this->fingerprint = md5(substr($sessionData, 0, $written));
+				$this->logger->error('Session: Unable to write data.');
+
+				return false;
+			}
+		}
+
+		$this->fingerprint = md5($sessionData);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close
+	 *
+	 * Releases locks and closes file descriptor.
+	 *
+	 * @return boolean
+	 */
+	public function close(): bool
+	{
+		if (is_resource($this->fileHandle))
+		{
+			flock($this->fileHandle, LOCK_UN);
+			fclose($this->fileHandle);
+
+			$this->fileHandle = null;
+			$this->fileNew    = false;
+
+			return true;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destroy
+	 *
+	 * Destroys the current session.
+	 *
+	 * @param string $sessionId Session ID
+	 *
+	 * @return boolean
+	 */
+	public function destroy($sessionId): bool
+	{
+		if ($this->close())
+		{
+			return is_file($this->filePath . $sessionId)
+				? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
+		}
+
+		if ($this->filePath !== null)
+		{
+			clearstatcache();
+
+			return is_file($this->filePath . $sessionId)
+				? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Garbage Collector
+	 *
+	 * Deletes expired sessions
+	 *
+	 * @param integer $maxlifetime Maximum lifetime of sessions
+	 *
+	 * @return boolean
+	 */
+	public function gc($maxlifetime): bool
+	{
+		if (! is_dir($this->savePath) || ($directory = opendir($this->savePath)) === false)
+		{
+			$this->logger->debug("Session: Garbage collector couldn't list files under directory '" . $this->savePath . "'.");
+
+			return false;
+		}
+
+		$ts = time() - $maxlifetime;
+
+		$pattern = $this->matchIP === true
+			? '[0-9a-f]{32}'
+			: '';
+
+		$pattern = sprintf(
+			'#\A%s' . $pattern . $this->sessionIDRegex . '\z#',
+			preg_quote($this->cookieName)
+		);
+
+		while (($file = readdir($directory)) !== false)
+		{
+			// If the filename doesn't match this pattern, it's either not a session file or is not ours
+			if (! preg_match($pattern, $file)
+				|| ! is_file($this->savePath . DIRECTORY_SEPARATOR . $file)
+				|| ($mtime = filemtime($this->savePath . DIRECTORY_SEPARATOR . $file)) === false
+				|| $mtime > $ts
+			)
+			{
+				continue;
+			}
+
+			unlink($this->savePath . DIRECTORY_SEPARATOR . $file);
+		}
+
+		closedir($directory);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Configure Session ID regular expression
+	 */
+	protected function configureSessionIDRegex()
+	{
+		$bitsPerCharacter = (int) ini_get('session.sid_bits_per_character');
+		$SIDLength        = (int) ini_get('session.sid_length');
+
+		if (($bits = $SIDLength * $bitsPerCharacter) < 160)
+		{
+			// Add as many more characters as necessary to reach at least 160 bits
+			$SIDLength += (int) ceil((160 % $bits) / $bitsPerCharacter);
+			ini_set('session.sid_length', (string) $SIDLength);
+		}
+
+		// Yes, 4,5,6 are the only known possible values as of 2016-10-27
+		switch ($bitsPerCharacter)
+		{
+			case 4:
+				$this->sessionIDRegex = '[0-9a-f]';
+				break;
+			case 5:
+				$this->sessionIDRegex = '[0-9a-v]';
+				break;
+			case 6:
+				$this->sessionIDRegex = '[0-9a-zA-Z,-]';
+				break;
+		}
+
+		$this->sessionIDRegex .= '{' . $SIDLength . '}';
+	}
+}
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
new file mode 100644
index 0000000..ea744fa
--- /dev/null
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -0,0 +1,379 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Memcached;
+
+/**
+ * Session handler using Memcache for persistence
+ */
+class MemcachedHandler extends BaseHandler
+{
+	/**
+	 * Memcached instance
+	 *
+	 * @var Memcached|null
+	 */
+	protected $memcached;
+
+	/**
+	 * Key prefix
+	 *
+	 * @var string
+	 */
+	protected $keyPrefix = 'ci_session:';
+
+	/**
+	 * Lock key
+	 *
+	 * @var string|null
+	 */
+	protected $lockKey;
+
+	/**
+	 * Number of seconds until the session ends.
+	 *
+	 * @var integer
+	 */
+	protected $sessionExpiration = 7200;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param  AppConfig $config
+	 * @param  string    $ipAddress
+	 * @throws SessionException
+	 */
+	public function __construct(AppConfig $config, string $ipAddress)
+	{
+		parent::__construct($config, $ipAddress);
+
+		if (empty($this->savePath))
+		{
+			throw SessionException::forEmptySavepath();
+		}
+
+		if ($this->matchIP === true)
+		{
+			$this->keyPrefix .= $this->ipAddress . ':';
+		}
+
+		if (! empty($this->keyPrefix))
+		{
+			ini_set('memcached.sess_prefix', $this->keyPrefix);
+		}
+
+		$this->sessionExpiration = $config->sessionExpiration;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Open
+	 *
+	 * Sanitizes save_path and initializes connections.
+	 *
+	 * @param string $savePath Server path(s)
+	 * @param string $name     Session cookie name, unused
+	 *
+	 * @return boolean
+	 */
+	public function open($savePath, $name): bool
+	{
+		$this->memcached = new Memcached();
+		$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
+
+		$serverList = [];
+
+		foreach ($this->memcached->getServerList() as $server)
+		{
+			$serverList[] = $server['host'] . ':' . $server['port'];
+		}
+
+		if (! preg_match_all('#,?([^,:]+)\:(\d{1,5})(?:\:(\d+))?#', $this->savePath, $matches, PREG_SET_ORDER)
+		)
+		{
+			$this->memcached = null;
+			$this->logger->error('Session: Invalid Memcached save path format: ' . $this->savePath);
+
+			return false;
+		}
+
+		foreach ($matches as $match)
+		{
+			// If Memcached already has this server (or if the port is invalid), skip it
+			if (in_array($match[1] . ':' . $match[2], $serverList, true))
+			{
+				$this->logger->debug('Session: Memcached server pool already has ' . $match[1] . ':' . $match[2]);
+				continue;
+			}
+
+			if (! $this->memcached->addServer($match[1], $match[2], $match[3] ?? 0))
+			{
+				$this->logger->error('Could not add ' . $match[1] . ':' . $match[2] . ' to Memcached server pool.');
+			}
+			else
+			{
+				$serverList[] = $match[1] . ':' . $match[2];
+			}
+		}
+
+		if (empty($serverList))
+		{
+			$this->logger->error('Session: Memcached server pool is empty.');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Read
+	 *
+	 * Reads session data and acquires a lock
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return string    Serialized session data
+	 */
+	public function read($sessionID): string
+	{
+		if (isset($this->memcached) && $this->lockSession($sessionID))
+		{
+			// Needed by write() to detect session_regenerate_id() calls
+			if (is_null($this->sessionID)) // @phpstan-ignore-line
+			{
+				$this->sessionID = $sessionID;
+			}
+
+			$sessionData       = (string) $this->memcached->get($this->keyPrefix . $sessionID);
+			$this->fingerprint = md5($sessionData);
+
+			return $sessionData;
+		}
+
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write
+	 *
+	 * Writes (create / update) session data
+	 *
+	 * @param string $sessionID   Session ID
+	 * @param string $sessionData Serialized session data
+	 *
+	 * @return boolean
+	 */
+	public function write($sessionID, $sessionData): bool
+	{
+		if (! isset($this->memcached))
+		{
+			return false;
+		}
+
+		// Was the ID regenerated?
+		if ($sessionID !== $this->sessionID)
+		{
+			if (! $this->releaseLock() || ! $this->lockSession($sessionID))
+			{
+				return false;
+			}
+
+			$this->fingerprint = md5('');
+			$this->sessionID   = $sessionID;
+		}
+
+		if (isset($this->lockKey))
+		{
+			$this->memcached->replace($this->lockKey, time(), 300);
+
+			if ($this->fingerprint !== ($fingerprint = md5($sessionData)))
+			{
+				if ($this->memcached->set($this->keyPrefix . $sessionID, $sessionData, $this->sessionExpiration))
+				{
+					$this->fingerprint = $fingerprint;
+
+					return true;
+				}
+
+				return false;
+			}
+
+			return $this->memcached->touch($this->keyPrefix . $sessionID, $this->sessionExpiration);
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close
+	 *
+	 * Releases locks and closes connection.
+	 *
+	 * @return boolean
+	 */
+	public function close(): bool
+	{
+		if (isset($this->memcached))
+		{
+			isset($this->lockKey) && $this->memcached->delete($this->lockKey);
+
+			if (! $this->memcached->quit())
+			{
+				return false;
+			}
+
+			$this->memcached = null;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destroy
+	 *
+	 * Destroys the current session.
+	 *
+	 * @param string $sessionId Session ID
+	 *
+	 * @return boolean
+	 */
+	public function destroy($sessionId): bool
+	{
+		if (isset($this->memcached, $this->lockKey))
+		{
+			$this->memcached->delete($this->keyPrefix . $sessionId);
+
+			return $this->destroyCookie();
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Garbage Collector
+	 *
+	 * Deletes expired sessions
+	 *
+	 * @param integer $maxlifetime Maximum lifetime of sessions
+	 *
+	 * @return boolean
+	 */
+	public function gc($maxlifetime): bool
+	{
+		// Not necessary, Memcached takes care of that.
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get lock
+	 *
+	 * Acquires an (emulated) lock.
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return boolean
+	 */
+	protected function lockSession(string $sessionID): bool
+	{
+		if (isset($this->lockKey))
+		{
+			return $this->memcached->replace($this->lockKey, time(), 300);
+		}
+
+		// 30 attempts to obtain a lock, in case another request already has it
+		$lockKey = $this->keyPrefix . $sessionID . ':lock';
+		$attempt = 0;
+
+		do
+		{
+			if ($this->memcached->get($lockKey))
+			{
+				sleep(1);
+				continue;
+			}
+
+			if (! $this->memcached->set($lockKey, time(), 300))
+			{
+				$this->logger->error('Session: Error while trying to obtain lock for ' . $this->keyPrefix . $sessionID);
+
+				return false;
+			}
+
+			$this->lockKey = $lockKey;
+			break;
+		}
+		while (++ $attempt < 30);
+
+		if ($attempt === 30)
+		{
+			$this->logger->error('Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
+
+			return false;
+		}
+
+		$this->lock = true;
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Release lock
+	 *
+	 * Releases a previously acquired lock
+	 *
+	 * @return boolean
+	 */
+	protected function releaseLock(): bool
+	{
+		if (isset($this->memcached, $this->lockKey) && $this->lock)
+		{
+			if (! $this->memcached->delete($this->lockKey) &&
+					$this->memcached->getResultCode() !== Memcached::RES_NOTFOUND
+			)
+			{
+				$this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
+
+				return false;
+			}
+
+			$this->lockKey = null;
+			$this->lock    = false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
new file mode 100644
index 0000000..b3545c0
--- /dev/null
+++ b/system/Session/Handlers/RedisHandler.php
@@ -0,0 +1,405 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Exception;
+use Redis;
+use RedisException;
+
+/**
+ * Session handler using Redis for persistence
+ */
+class RedisHandler extends BaseHandler
+{
+	/**
+	 * phpRedis instance
+	 *
+	 * @var Redis|null
+	 */
+	protected $redis;
+
+	/**
+	 * Key prefix
+	 *
+	 * @var string
+	 */
+	protected $keyPrefix = 'ci_session:';
+
+	/**
+	 * Lock key
+	 *
+	 * @var string|null
+	 */
+	protected $lockKey;
+
+	/**
+	 * Key exists flag
+	 *
+	 * @var boolean
+	 */
+	protected $keyExists = false;
+
+	/**
+	 * Number of seconds until the session ends.
+	 *
+	 * @var integer
+	 */
+	protected $sessionExpiration = 7200;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
+	 *
+	 * @throws Exception
+	 */
+	public function __construct(AppConfig $config, string $ipAddress)
+	{
+		parent::__construct($config, $ipAddress);
+
+		if (empty($this->savePath))
+		{
+			throw SessionException::forEmptySavepath();
+		}
+
+		if (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches))
+		{
+			if (! isset($matches[3]))
+			{
+				$matches[3] = '';
+			} // Just to avoid undefined index notices below
+
+			$this->savePath = [
+				'host'     => $matches[1],
+				'port'     => empty($matches[2]) ? null : $matches[2],
+				'password' => preg_match('#auth=([^\s&]+)#', $matches[3], $match) ? $match[1] : null,
+				'database' => preg_match('#database=(\d+)#', $matches[3], $match) ? (int) $match[1] : null,
+				'timeout'  => preg_match('#timeout=(\d+\.\d+)#', $matches[3], $match) ? (float) $match[1] : null,
+			];
+
+			preg_match('#prefix=([^\s&]+)#', $matches[3], $match) && $this->keyPrefix = $match[1];
+		}
+		else
+		{
+			throw SessionException::forInvalidSavePathFormat($this->savePath);
+		}
+
+		if ($this->matchIP === true)
+		{
+			$this->keyPrefix .= $this->ipAddress . ':';
+		}
+
+		$this->sessionExpiration = empty($config->sessionExpiration)
+			? (int) ini_get('session.gc_maxlifetime')
+			: (int) $config->sessionExpiration;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Open
+	 *
+	 * Sanitizes save_path and initializes connection.
+	 *
+	 * @param  string $savePath Server path
+	 * @param  string $name     Session cookie name, unused
+	 * @return boolean
+	 */
+	public function open($savePath, $name): bool
+	{
+		if (empty($this->savePath))
+		{
+			return false;
+		}
+
+		$redis = new Redis();
+
+		if (! $redis->connect($this->savePath['host'], $this->savePath['port'], $this->savePath['timeout']))
+		{
+			$this->logger->error('Session: Unable to connect to Redis with the configured settings.');
+		}
+		elseif (isset($this->savePath['password']) && ! $redis->auth($this->savePath['password']))
+		{
+			$this->logger->error('Session: Unable to authenticate to Redis instance.');
+		}
+		elseif (isset($this->savePath['database']) && ! $redis->select($this->savePath['database']))
+		{
+			$this->logger->error('Session: Unable to select Redis database with index ' . $this->savePath['database']);
+		}
+		else
+		{
+			$this->redis = $redis;
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Read
+	 *
+	 * Reads session data and acquires a lock
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return string	Serialized session data
+	 */
+	public function read($sessionID): string
+	{
+		if (isset($this->redis) && $this->lockSession($sessionID))
+		{
+			// Needed by write() to detect session_regenerate_id() calls
+			if (is_null($this->sessionID)) // @phpstan-ignore-line
+			{
+				$this->sessionID = $sessionID;
+			}
+
+			$sessionData                               = $this->redis->get($this->keyPrefix . $sessionID);
+			is_string($sessionData) ? $this->keyExists = true : $sessionData = '';
+
+			$this->fingerprint = md5($sessionData);
+
+			return $sessionData;
+		}
+
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Write
+	 *
+	 * Writes (create / update) session data
+	 *
+	 * @param string $sessionID   Session ID
+	 * @param string $sessionData Serialized session data
+	 *
+	 * @return boolean
+	 */
+	public function write($sessionID, $sessionData): bool
+	{
+		if (! isset($this->redis))
+		{
+			return false;
+		}
+
+		// Was the ID regenerated?
+		if ($sessionID !== $this->sessionID)
+		{
+			if (! $this->releaseLock() || ! $this->lockSession($sessionID))
+			{
+				return false;
+			}
+
+			$this->keyExists = false;
+			$this->sessionID = $sessionID;
+		}
+
+		if (isset($this->lockKey))
+		{
+			$this->redis->expire($this->lockKey, 300);
+
+			if ($this->fingerprint !== ($fingerprint = md5($sessionData)) || $this->keyExists === false)
+			{
+				if ($this->redis->set($this->keyPrefix . $sessionID, $sessionData, $this->sessionExpiration))
+				{
+					$this->fingerprint = $fingerprint;
+					$this->keyExists   = true;
+					return true;
+				}
+
+				return false;
+			}
+
+			return $this->redis->expire($this->keyPrefix . $sessionID, $this->sessionExpiration);
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close
+	 *
+	 * Releases locks and closes connection.
+	 *
+	 * @return boolean
+	 */
+	public function close(): bool
+	{
+		if (isset($this->redis))
+		{
+			try
+			{
+				$pingReply = $this->redis->ping();
+				// @phpstan-ignore-next-line
+				if (($pingReply === true) || ($pingReply === '+PONG'))
+				{
+					isset($this->lockKey) && $this->redis->del($this->lockKey);
+
+					if (! $this->redis->close())
+					{
+						return false;
+					}
+				}
+			}
+			catch (RedisException $e)
+			{
+				$this->logger->error('Session: Got RedisException on close(): ' . $e->getMessage());
+			}
+
+			$this->redis = null;
+
+			return true;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destroy
+	 *
+	 * Destroys the current session.
+	 *
+	 * @param string $sessionID
+	 *
+	 * @return boolean
+	 */
+	public function destroy($sessionID): bool
+	{
+		if (isset($this->redis, $this->lockKey))
+		{
+			if (($result = $this->redis->del($this->keyPrefix . $sessionID)) !== 1)
+			{
+				$this->logger->debug('Session: Redis::del() expected to return 1, got ' . var_export($result, true) . ' instead.');
+			}
+
+			return $this->destroyCookie();
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Garbage Collector
+	 *
+	 * Deletes expired sessions
+	 *
+	 * @param  integer $maxlifetime Maximum lifetime of sessions
+	 * @return boolean
+	 */
+	public function gc($maxlifetime): bool
+	{
+		// Not necessary, Redis takes care of that.
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get lock
+	 *
+	 * Acquires an (emulated) lock.
+	 *
+	 * @param string $sessionID Session ID
+	 *
+	 * @return boolean
+	 */
+	protected function lockSession(string $sessionID): bool
+	{
+		// PHP 7 reuses the SessionHandler object on regeneration,
+		// so we need to check here if the lock key is for the
+		// correct session ID.
+		if ($this->lockKey === $this->keyPrefix . $sessionID . ':lock')
+		{
+			return $this->redis->expire($this->lockKey, 300);
+		}
+
+		// 30 attempts to obtain a lock, in case another request already has it
+		$lockKey = $this->keyPrefix . $sessionID . ':lock';
+		$attempt = 0;
+
+		do
+		{
+			if (($ttl = $this->redis->ttl($lockKey)) > 0)
+			{
+				sleep(1);
+				continue;
+			}
+
+			if (! $this->redis->setex($lockKey, 300, (string) time()))
+			{
+				$this->logger->error('Session: Error while trying to obtain lock for ' . $this->keyPrefix . $sessionID);
+				return false;
+			}
+
+			$this->lockKey = $lockKey;
+			break;
+		}
+		while (++ $attempt < 30);
+
+		if ($attempt === 30)
+		{
+			log_message('error', 'Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
+			return false;
+		}
+
+		if ($ttl === -1)
+		{
+			log_message('debug', 'Session: Lock for ' . $this->keyPrefix . $sessionID . ' had no TTL, overriding.');
+		}
+
+		$this->lock = true;
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Release lock
+	 *
+	 * Releases a previously acquired lock
+	 *
+	 * @return boolean
+	 */
+	protected function releaseLock(): bool
+	{
+		if (isset($this->redis, $this->lockKey) && $this->lock)
+		{
+			if (! $this->redis->del($this->lockKey))
+			{
+				$this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
+				return false;
+			}
+
+			$this->lockKey = null;
+			$this->lock    = false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Session/Session.php b/system/Session/Session.php
new file mode 100644
index 0000000..5532dc7
--- /dev/null
+++ b/system/Session/Session.php
@@ -0,0 +1,1016 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session;
+
+use CodeIgniter\Cookie\Cookie;
+use Config\App;
+use Config\Cookie as CookieConfig;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use SessionHandlerInterface;
+
+/**
+ * Implementation of CodeIgniter session container.
+ *
+ * Session configuration is done through session variables and cookie related
+ * variables in app/config/App.php
+ */
+class Session implements SessionInterface
+{
+	use LoggerAwareTrait;
+
+	/**
+	 * Instance of the driver to use.
+	 *
+	 * @var SessionHandlerInterface
+	 */
+	protected $driver;
+
+	/**
+	 * The storage driver to use: files, database, redis, memcached
+	 *
+	 * @var string
+	 */
+	protected $sessionDriverName;
+
+	/**
+	 * The session cookie name, must contain only [0-9a-z_-] characters.
+	 *
+	 * @var string
+	 */
+	protected $sessionCookieName = 'ci_session';
+
+	/**
+	 * The number of SECONDS you want the session to last.
+	 * Setting it to 0 (zero) means expire when the browser is closed.
+	 *
+	 * @var integer
+	 */
+	protected $sessionExpiration = 7200;
+
+	/**
+	 * The location to save sessions to, driver dependent..
+	 *
+	 * For the 'files' driver, it's a path to a writable directory.
+	 * WARNING: Only absolute paths are supported!
+	 *
+	 * For the 'database' driver, it's a table name.
+	 *
+	 * @todo address memcache & redis needs
+	 *
+	 * IMPORTANT: You are REQUIRED to set a valid save path!
+	 *
+	 * @var string
+	 */
+	protected $sessionSavePath;
+
+	/**
+	 * Whether to match the user's IP address when reading the session data.
+	 *
+	 * WARNING: If you're using the database driver, don't forget to update
+	 * your session table's PRIMARY KEY when changing this setting.
+	 *
+	 * @var boolean
+	 */
+	protected $sessionMatchIP = false;
+
+	/**
+	 * How many seconds between CI regenerating the session ID.
+	 *
+	 * @var integer
+	 */
+	protected $sessionTimeToUpdate = 300;
+
+	/**
+	 * Whether to destroy session data associated with the old session ID
+	 * when auto-regenerating the session ID. When set to FALSE, the data
+	 * will be later deleted by the garbage collector.
+	 *
+	 * @var boolean
+	 */
+	protected $sessionRegenerateDestroy = false;
+
+	/**
+	 * The session cookie instance.
+	 *
+	 * @var Cookie
+	 */
+	protected $cookie;
+
+	/**
+	 * The domain name to use for cookies.
+	 * Set to .your-domain.com for site-wide cookies.
+	 *
+	 * @var string
+	 *
+	 * @deprecated
+	 */
+	protected $cookieDomain = '';
+
+	/**
+	 * Path used for storing cookies.
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 *
+	 * @deprecated
+	 */
+	protected $cookiePath = '/';
+
+	/**
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated
+	 */
+	protected $cookieSecure = false;
+
+	/**
+	 * Cookie SameSite setting as described in RFC6265
+	 * Must be 'None', 'Lax' or 'Strict'.
+	 *
+	 * @var string
+	 *
+	 * @deprecated
+	 */
+	protected $cookieSameSite = Cookie::SAMESITE_LAX;
+
+	/**
+	 * sid regex expression
+	 *
+	 * @var string
+	 */
+	protected $sidRegexp;
+
+	/**
+	 * Logger instance to record error messages and warnings.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Constructor.
+	 *
+	 * Extract configuration settings and save them here.
+	 *
+	 * @param SessionHandlerInterface $driver
+	 * @param App                     $config
+	 */
+	public function __construct(SessionHandlerInterface $driver, App $config)
+	{
+		$this->driver = $driver;
+
+		$this->sessionDriverName        = $config->sessionDriver;
+		$this->sessionCookieName        = $config->sessionCookieName ?? $this->sessionCookieName;
+		$this->sessionExpiration        = $config->sessionExpiration ?? $this->sessionExpiration;
+		$this->sessionSavePath          = $config->sessionSavePath;
+		$this->sessionMatchIP           = $config->sessionMatchIP ?? $this->sessionMatchIP;
+		$this->sessionTimeToUpdate      = $config->sessionTimeToUpdate ?? $this->sessionTimeToUpdate;
+		$this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy ?? $this->sessionRegenerateDestroy;
+
+		//---------------------------------------------------------------------
+		// DEPRECATED COOKIE MANAGEMENT
+		//---------------------------------------------------------------------
+		$this->cookiePath     = $config->cookiePath ?? $this->cookiePath;
+		$this->cookieDomain   = $config->cookieDomain ?? $this->cookieDomain;
+		$this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
+		$this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
+
+		/**
+		 * @var CookieConfig
+		 */
+		$cookie = config('Cookie');
+
+		$this->cookie = new Cookie($this->sessionCookieName, '', [
+			'expires'  => $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration,
+			'path'     => $cookie->path ?? $config->cookiePath,
+			'domain'   => $cookie->domain ?? $config->cookieDomain,
+			'secure'   => $cookie->secure ?? $config->cookieSecure,
+			'httponly' => true, // for security
+			'samesite' => $cookie->samesite ?? $config->cookieSameSite ?? Cookie::SAMESITE_LAX,
+			'raw'      => $cookie->raw ?? false,
+		]);
+
+		helper('array');
+	}
+
+	/**
+	 * Initialize the session container and starts up the session.
+	 *
+	 * @return mixed
+	 */
+	public function start()
+	{
+		if (is_cli() && ENVIRONMENT !== 'testing')
+		{
+			// @codeCoverageIgnoreStart
+			$this->logger->debug('Session: Initialization under CLI aborted.');
+
+			return;
+			// @codeCoverageIgnoreEnd
+		}
+
+		if ((bool) ini_get('session.auto_start'))
+		{
+			$this->logger->error('Session: session.auto_start is enabled in php.ini. Aborting.');
+
+			return;
+		}
+
+		if (session_status() === PHP_SESSION_ACTIVE)
+		{
+			$this->logger->warning('Session: Sessions is enabled, and one exists.Please don\'t $session->start();');
+
+			return;
+		}
+
+		$this->configure();
+		$this->setSaveHandler();
+
+		// Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers
+		if (isset($_COOKIE[$this->sessionCookieName])
+			&& (! is_string($_COOKIE[$this->sessionCookieName]) || ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->sessionCookieName]))
+		)
+		{
+			unset($_COOKIE[$this->sessionCookieName]);
+		}
+
+		$this->startSession();
+
+		// Is session ID auto-regeneration configured? (ignoring ajax requests)
+		if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
+			&& ($regenerateTime = $this->sessionTimeToUpdate) > 0
+		)
+		{
+			if (! isset($_SESSION['__ci_last_regenerate']))
+			{
+				$_SESSION['__ci_last_regenerate'] = time();
+			}
+			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerateTime))
+			{
+				$this->regenerate((bool) $this->sessionRegenerateDestroy);
+			}
+		}
+		// Another work-around ... PHP doesn't seem to send the session cookie
+		// unless it is being currently created or regenerated
+		elseif (isset($_COOKIE[$this->sessionCookieName]) && $_COOKIE[$this->sessionCookieName] === session_id())
+		{
+			$this->setCookie();
+		}
+
+		$this->initVars();
+		$this->logger->info("Session: Class initialized using '" . $this->sessionDriverName . "' driver.");
+
+		return $this;
+	}
+
+	/**
+	 * Does a full stop of the session:
+	 *
+	 * - destroys the session
+	 * - unsets the session id
+	 * - destroys the session cookie
+	 */
+	public function stop()
+	{
+		setcookie(
+			$this->sessionCookieName,
+			session_id(),
+			1,
+			$this->cookie->getPath(),
+			$this->cookie->getDomain(),
+			$this->cookie->isSecure(),
+			true
+		);
+
+		session_regenerate_id(true);
+	}
+
+	/**
+	 * Configuration.
+	 *
+	 * Handle input binds and configuration defaults.
+	 */
+	protected function configure()
+	{
+		if (empty($this->sessionCookieName))
+		{
+			$this->sessionCookieName = ini_get('session.name');
+		}
+		else
+		{
+			ini_set('session.name', $this->sessionCookieName);
+		}
+
+		$sameSite = $this->cookie->getSameSite() ?: ucfirst(Cookie::SAMESITE_LAX);
+
+		$params = [
+			'lifetime' => $this->sessionExpiration,
+			'path'     => $this->cookie->getPath(),
+			'domain'   => $this->cookie->getDomain(),
+			'secure'   => $this->cookie->isSecure(),
+			'httponly' => true, // HTTP only; Yes, this is intentional and not configurable for security reasons.
+			'samesite' => $sameSite,
+		];
+
+		ini_set('session.cookie_samesite', $sameSite);
+		session_set_cookie_params($params);
+
+		if (! isset($this->sessionExpiration))
+		{
+			$this->sessionExpiration = (int) ini_get('session.gc_maxlifetime');
+		}
+		else
+		{
+			ini_set('session.gc_maxlifetime', (string) $this->sessionExpiration);
+		}
+
+		if (! empty($this->sessionSavePath))
+		{
+			ini_set('session.save_path', $this->sessionSavePath);
+		}
+
+		// Security is king
+		ini_set('session.use_trans_sid', '0');
+		ini_set('session.use_strict_mode', '1');
+		ini_set('session.use_cookies', '1');
+		ini_set('session.use_only_cookies', '1');
+
+		$this->configureSidLength();
+	}
+
+	/**
+	 * Configure session ID length
+	 *
+	 * To make life easier, we used to force SHA-1 and 4 bits per
+	 * character on everyone. And of course, someone was unhappy.
+	 *
+	 * Then PHP 7.1 broke backwards-compatibility because ext/session
+	 * is such a mess that nobody wants to touch it with a pole stick,
+	 * and the one guy who does, nobody has the energy to argue with.
+	 *
+	 * So we were forced to make changes, and OF COURSE something was
+	 * going to break and now we have this pile of shit. -- Narf
+	 *
+	 * @return void
+	 */
+	protected function configureSidLength()
+	{
+		$bitsPerCharacter = (int) (ini_get('session.sid_bits_per_character') !== false
+			? ini_get('session.sid_bits_per_character')
+			: 4);
+
+		$sidLength = (int) (ini_get('session.sid_length') !== false
+			? ini_get('session.sid_length')
+			: 40);
+
+		if (($sidLength * $bitsPerCharacter) < 160)
+		{
+			$bits = ($sidLength * $bitsPerCharacter);
+			// Add as many more characters as necessary to reach at least 160 bits
+			$sidLength += (int) ceil((160 % $bits) / $bitsPerCharacter);
+			ini_set('session.sid_length', (string) $sidLength);
+		}
+
+		// Yes, 4,5,6 are the only known possible values as of 2016-10-27
+		switch ($bitsPerCharacter)
+		{
+			case 4:
+				$this->sidRegexp = '[0-9a-f]';
+				break;
+			case 5:
+				$this->sidRegexp = '[0-9a-v]';
+				break;
+			case 6:
+				$this->sidRegexp = '[0-9a-zA-Z,-]';
+				break;
+		}
+
+		$this->sidRegexp .= '{' . $sidLength . '}';
+	}
+
+	/**
+	 * Handle temporary variables
+	 *
+	 * Clears old "flash" data, marks the new one for deletion and handles
+	 * "temp" data deletion.
+	 */
+	protected function initVars()
+	{
+		if (empty($_SESSION['__ci_vars']))
+		{
+			return;
+		}
+
+		$currentTime = time();
+
+		foreach ($_SESSION['__ci_vars'] as $key => &$value)
+		{
+			if ($value === 'new')
+			{
+				$_SESSION['__ci_vars'][$key] = 'old';
+			}
+			// DO NOT move this above the 'new' check!
+			elseif ($value === 'old' || $value < $currentTime)
+			{
+				unset($_SESSION[$key], $_SESSION['__ci_vars'][$key]);
+			}
+		}
+
+		if (empty($_SESSION['__ci_vars']))
+		{
+			unset($_SESSION['__ci_vars']);
+		}
+	}
+
+	//--------------------------------------------------------------------
+	// Session Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Regenerates the session ID.
+	 *
+	 * @param boolean $destroy Should old session data be destroyed?
+	 */
+	public function regenerate(bool $destroy = false)
+	{
+		$_SESSION['__ci_last_regenerate'] = time();
+		session_regenerate_id($destroy);
+	}
+
+	/**
+	 * Destroys the current session.
+	 */
+	public function destroy()
+	{
+		if (ENVIRONMENT === 'testing')
+		{
+			return;
+		}
+
+		session_destroy();
+	}
+
+	//--------------------------------------------------------------------
+	// Basic Setters and Getters
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets user data into the session.
+	 *
+	 * If $data is a string, then it is interpreted as a session property
+	 * key, and  $value is expected to be non-null.
+	 *
+	 * If $data is an array, it is expected to be an array of key/value pairs
+	 * to be set as session properties.
+	 *
+	 * @param string|array $data  Property name or associative array of properties
+	 * @param mixed        $value Property value if single key provided
+	 */
+	public function set($data, $value = null)
+	{
+		if (is_array($data))
+		{
+			foreach ($data as $key => &$value)
+			{
+				if (is_int($key))
+				{
+					$_SESSION[$value] = null;
+				}
+				else
+				{
+					$_SESSION[$key] = $value;
+				}
+			}
+
+			return;
+		}
+
+		$_SESSION[$data] = $value;
+	}
+
+	/**
+	 * Get user data that has been set in the session.
+	 *
+	 * If the property exists as "normal", returns it.
+	 * Otherwise, returns an array of any temp or flash data values with the
+	 * property key.
+	 *
+	 * Replaces the legacy method $session->userdata();
+	 *
+	 * @param  string|null $key Identifier of the session property to retrieve
+	 * @return mixed	The property value(s)
+	 */
+	public function get(string $key = null)
+	{
+		if (! empty($key) && (! is_null($value = $_SESSION[$key] ?? null) || ! is_null($value = dot_array_search($key, $_SESSION ?? []))))
+		{
+			return $value;
+		}
+
+		if (empty($_SESSION))
+		{
+			return $key === null ? [] : null;
+		}
+
+		if (! empty($key))
+		{
+			return null;
+		}
+
+		$userdata = [];
+		$_exclude = array_merge(['__ci_vars'], $this->getFlashKeys(), $this->getTempKeys());
+
+		$keys = array_keys($_SESSION);
+
+		foreach ($keys as $key)
+		{
+			if (! in_array($key, $_exclude, true))
+			{
+				$userdata[$key] = $_SESSION[$key];
+			}
+		}
+
+		return $userdata;
+	}
+
+	/**
+	 * Returns whether an index exists in the session array.
+	 *
+	 * @param string $key Identifier of the session property we are interested in.
+	 *
+	 * @return boolean
+	 */
+	public function has(string $key): bool
+	{
+		return isset($_SESSION[$key]);
+	}
+
+	/**
+	 * Push new value onto session value that is array.
+	 *
+	 * @param string $key  Identifier of the session property we are interested in.
+	 * @param array  $data value to be pushed to existing session key.
+	 *
+	 * @return void
+	 */
+	public function push(string $key, array $data)
+	{
+		if ($this->has($key) && is_array($value = $this->get($key)))
+		{
+			$this->set($key, array_merge($value, $data));
+		}
+	}
+
+	/**
+	 * Remove one or more session properties.
+	 *
+	 * If $key is an array, it is interpreted as an array of string property
+	 * identifiers to remove. Otherwise, it is interpreted as the identifier
+	 * of a specific session property to remove.
+	 *
+	 * @param string|array $key Identifier of the session property or properties to remove.
+	 */
+	public function remove($key)
+	{
+		if (is_array($key))
+		{
+			foreach ($key as $k)
+			{
+				unset($_SESSION[$k]);
+			}
+
+			return;
+		}
+
+		unset($_SESSION[$key]);
+	}
+
+	/**
+	 * Magic method to set variables in the session by simply calling
+	 *  $session->foo = bar;
+	 *
+	 * @param string       $key   Identifier of the session property to set.
+	 * @param string|array $value
+	 */
+	public function __set(string $key, $value)
+	{
+		$_SESSION[$key] = $value;
+	}
+
+	/**
+	 * Magic method to get session variables by simply calling
+	 *  $foo = $session->foo;
+	 *
+	 * @param string $key Identifier of the session property to remove.
+	 *
+	 * @return null|string
+	 */
+	public function __get(string $key)
+	{
+		// Note: Keep this order the same, just in case somebody wants to
+		//       use 'session_id' as a session data key, for whatever reason
+		if (isset($_SESSION[$key]))
+		{
+			return $_SESSION[$key];
+		}
+
+		if ($key === 'session_id')
+		{
+			return session_id();
+		}
+
+		return null;
+	}
+
+	/**
+	 * Magic method to check for session variables.
+	 * Different from has() in that it will validate 'session_id' as well.
+	 * Mostly used by internal PHP functions, users should stick to has()
+	 *
+	 * @param string $key Identifier of the session property to remove.
+	 *
+	 * @return boolean
+	 */
+	public function __isset(string $key): bool
+	{
+		return isset($_SESSION[$key]) || ($key === 'session_id');
+	}
+
+	//--------------------------------------------------------------------
+	// Flash Data Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets data into the session that will only last for a single request.
+	 * Perfect for use with single-use status update messages.
+	 *
+	 * If $data is an array, it is interpreted as an associative array of
+	 * key/value pairs for flashdata properties.
+	 * Otherwise, it is interpreted as the identifier of a specific
+	 * flashdata property, with $value containing the property value.
+	 *
+	 * @param array|string $data  Property identifier or associative array of properties
+	 * @param string|array $value Property value if $data is a scalar
+	 */
+	public function setFlashdata($data, $value = null)
+	{
+		$this->set($data, $value);
+		$this->markAsFlashdata(is_array($data) ? array_keys($data) : $data);
+	}
+
+	/**
+	 * Retrieve one or more items of flash data from the session.
+	 *
+	 * If the item key is null, return all flashdata.
+	 *
+	 * @param string $key Property identifier
+	 *
+	 * @return array|null The requested property value, or an associative array  of them
+	 */
+	public function getFlashdata(string $key = null)
+	{
+		if (isset($key))
+		{
+			return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) &&
+					! is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+		}
+
+		$flashdata = [];
+
+		if (! empty($_SESSION['__ci_vars']))
+		{
+			foreach ($_SESSION['__ci_vars'] as $key => &$value)
+			{
+				if (! is_int($value))
+				{
+					$flashdata[$key] = $_SESSION[$key];
+				}
+			}
+		}
+
+		return $flashdata;
+	}
+
+	/**
+	 * Keeps a single piece of flash data alive for one more request.
+	 *
+	 * @param array|string $key Property identifier or array of them
+	 */
+	public function keepFlashdata($key)
+	{
+		$this->markAsFlashdata($key);
+	}
+
+	/**
+	 * Mark a session property or properties as flashdata.
+	 *
+	 * @param array|string $key Property identifier or array of them
+	 *
+	 * @return boolean False if any of the properties are not already set
+	 */
+	public function markAsFlashdata($key): bool
+	{
+		if (is_array($key))
+		{
+			foreach ($key as $sessionKey)
+			{
+				if (! isset($_SESSION[$sessionKey]))
+				{
+					return false;
+				}
+			}
+
+			$new = array_fill_keys($key, 'new');
+
+			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $new) : $new;
+
+			return true;
+		}
+
+		if (! isset($_SESSION[$key]))
+		{
+			return false;
+		}
+
+		$_SESSION['__ci_vars'][$key] = 'new';
+
+		return true;
+	}
+
+	/**
+	 * Unmark data in the session as flashdata.
+	 *
+	 * @param mixed $key Property identifier or array of them
+	 */
+	public function unmarkFlashdata($key)
+	{
+		if (empty($_SESSION['__ci_vars']))
+		{
+			return;
+		}
+
+		if (! is_array($key))
+		{
+			$key = [$key];
+		}
+
+		foreach ($key as $k)
+		{
+			if (isset($_SESSION['__ci_vars'][$k]) && ! is_int($_SESSION['__ci_vars'][$k]))
+			{
+				unset($_SESSION['__ci_vars'][$k]);
+			}
+		}
+
+		if (empty($_SESSION['__ci_vars']))
+		{
+			unset($_SESSION['__ci_vars']);
+		}
+	}
+
+	/**
+	 * Retrieve all of the keys for session data marked as flashdata.
+	 *
+	 * @return array The property names of all flashdata
+	 */
+	public function getFlashKeys(): array
+	{
+		if (! isset($_SESSION['__ci_vars']))
+		{
+			return [];
+		}
+
+		$keys = [];
+		foreach (array_keys($_SESSION['__ci_vars']) as $key)
+		{
+			if (! is_int($_SESSION['__ci_vars'][$key]))
+			{
+				$keys[] = $key;
+			}
+		}
+
+		return $keys;
+	}
+
+	//--------------------------------------------------------------------
+	// Temp Data Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets new data into the session, and marks it as temporary data
+	 * with a set lifespan.
+	 *
+	 * @param string|array $data  Session data key or associative array of items
+	 * @param null         $value Value to store
+	 * @param integer      $ttl   Time-to-live in seconds
+	 */
+	public function setTempdata($data, $value = null, int $ttl = 300)
+	{
+		$this->set($data, $value);
+		$this->markAsTempdata($data, $ttl);
+	}
+
+	/**
+	 * Returns either a single piece of tempdata, or all temp data currently
+	 * in the session.
+	 *
+	 * @param  string $key Session data key
+	 * @return mixed  Session data value or null if not found.
+	 */
+	public function getTempdata(string $key = null)
+	{
+		if (isset($key))
+		{
+			return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) &&
+					is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+		}
+
+		$tempdata = [];
+
+		if (! empty($_SESSION['__ci_vars']))
+		{
+			foreach ($_SESSION['__ci_vars'] as $key => &$value)
+			{
+				if (is_int($value))
+				{
+					$tempdata[$key] = $_SESSION[$key];
+				}
+			}
+		}
+
+		return $tempdata;
+	}
+
+	/**
+	 * Removes a single piece of temporary data from the session.
+	 *
+	 * @param string $key Session data key
+	 */
+	public function removeTempdata(string $key)
+	{
+		$this->unmarkTempdata($key);
+		unset($_SESSION[$key]);
+	}
+
+	/**
+	 * Mark one of more pieces of data as being temporary, meaning that
+	 * it has a set lifespan within the session.
+	 *
+	 * @param string|array $key Property identifier or array of them
+	 * @param integer      $ttl Time to live, in seconds
+	 *
+	 * @return boolean False if any of the properties were not set
+	 */
+	public function markAsTempdata($key, int $ttl = 300): bool
+	{
+		$ttl += time();
+
+		if (is_array($key))
+		{
+			$temp = [];
+
+			foreach ($key as $k => $v)
+			{
+				// Do we have a key => ttl pair, or just a key?
+				if (is_int($k))
+				{
+					$k = $v;
+					$v = $ttl;
+				}
+				elseif (is_string($v))
+				{
+					$v = time() + $ttl;
+				}
+				else
+				{
+					$v += time();
+				}
+
+				if (! array_key_exists($k, $_SESSION))
+				{
+					return false;
+				}
+
+				$temp[$k] = $v;
+			}
+
+			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $temp) : $temp;
+
+			return true;
+		}
+
+		if (! isset($_SESSION[$key]))
+		{
+			return false;
+		}
+
+		$_SESSION['__ci_vars'][$key] = $ttl;
+
+		return true;
+	}
+
+	/**
+	 * Unmarks temporary data in the session, effectively removing its
+	 * lifespan and allowing it to live as long as the session does.
+	 *
+	 * @param string|array $key	Property identifier or array of them
+	 */
+	public function unmarkTempdata($key)
+	{
+		if (empty($_SESSION['__ci_vars']))
+		{
+			return;
+		}
+
+		if (! is_array($key))
+		{
+			$key = [$key];
+		}
+
+		foreach ($key as $k)
+		{
+			if (isset($_SESSION['__ci_vars'][$k]) && is_int($_SESSION['__ci_vars'][$k]))
+			{
+				unset($_SESSION['__ci_vars'][$k]);
+			}
+		}
+
+		if (empty($_SESSION['__ci_vars']))
+		{
+			unset($_SESSION['__ci_vars']);
+		}
+	}
+
+	/**
+	 * Retrieve the keys of all session data that have been marked as temporary data.
+	 *
+	 * @return array
+	 */
+	public function getTempKeys(): array
+	{
+		if (! isset($_SESSION['__ci_vars']))
+		{
+			return [];
+		}
+
+		$keys = [];
+		foreach (array_keys($_SESSION['__ci_vars']) as $key)
+		{
+			if (is_int($_SESSION['__ci_vars'][$key]))
+			{
+				$keys[] = $key;
+			}
+		}
+
+		return $keys;
+	}
+
+	/**
+	 * Sets the driver as the session handler in PHP.
+	 * Extracted for easier testing.
+	 */
+	protected function setSaveHandler()
+	{
+		session_set_save_handler($this->driver, true);
+	}
+
+	/**
+	 * Starts the session.
+	 * Extracted for testing reasons.
+	 */
+	protected function startSession()
+	{
+		if (ENVIRONMENT === 'testing')
+		{
+			$_SESSION = [];
+			return;
+		}
+
+		session_start(); // @codeCoverageIgnore
+	}
+
+	/**
+	 * Takes care of setting the cookie on the client side.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	protected function setCookie()
+	{
+		$expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
+		$this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
+
+		cookies([$this->cookie], false)->dispatch();
+	}
+}
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
new file mode 100644
index 0000000..80402ca
--- /dev/null
+++ b/system/Session/SessionInterface.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session;
+
+/**
+ * Expected behavior of a session container used with CodeIgniter.
+ */
+interface SessionInterface
+{
+	/**
+	 * Regenerates the session ID.
+	 *
+	 * @param boolean $destroy Should old session data be destroyed?
+	 */
+	public function regenerate(bool $destroy = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Destroys the current session.
+	 */
+	public function destroy();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets user data into the session.
+	 *
+	 * If $data is a string, then it is interpreted as a session property
+	 * key, and  $value is expected to be non-null.
+	 *
+	 * If $data is an array, it is expected to be an array of key/value pairs
+	 * to be set as session properties.
+	 *
+	 * @param string|array $data  Property name or associative array of properties
+	 * @param mixed        $value Property value if single key provided
+	 */
+	public function set($data, $value = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get user data that has been set in the session.
+	 *
+	 * If the property exists as "normal", returns it.
+	 * Otherwise, returns an array of any temp or flash data values with the
+	 * property key.
+	 *
+	 * Replaces the legacy method $session->userdata();
+	 *
+	 * @param string $key Identifier of the session property to retrieve
+	 *
+	 * @return mixed The property value(s)
+	 */
+	public function get(string $key = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether an index exists in the session array.
+	 *
+	 * @param string $key Identifier of the session property we are interested in.
+	 *
+	 * @return boolean
+	 */
+	public function has(string $key): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Remove one or more session properties.
+	 *
+	 * If $key is an array, it is interpreted as an array of string property
+	 * identifiers to remove. Otherwise, it is interpreted as the identifier
+	 * of a specific session property to remove.
+	 *
+	 * @param string|array $key Identifier of the session property or properties to remove.
+	 */
+	public function remove($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets data into the session that will only last for a single request.
+	 * Perfect for use with single-use status update messages.
+	 *
+	 * If $data is an array, it is interpreted as an associative array of
+	 * key/value pairs for flashdata properties.
+	 * Otherwise, it is interpreted as the identifier of a specific
+	 * flashdata property, with $value containing the property value.
+	 *
+	 * @param string|array $data  Property identifier or associative array of properties
+	 * @param string|array $value Property value if $data is a scalar
+	 */
+	public function setFlashdata($data, $value = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve one or more items of flash data from the session.
+	 *
+	 * If the item key is null, return all flashdata.
+	 *
+	 * @param  string $key Property identifier
+	 * @return array|null	The requested property value, or an associative
+	 *     array  of them
+	 */
+	public function getFlashdata(string $key = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keeps a single piece of flash data alive for one more request.
+	 *
+	 * @param array|string $key Property identifier or array of them
+	 */
+	public function keepFlashdata($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mark a session property or properties as flashdata.
+	 *
+	 * @param string|array $key Property identifier or array of them
+	 *
+	 * @return False if any of the properties are not already set
+	 */
+	public function markAsFlashdata($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Unmark data in the session as flashdata.
+	 *
+	 * @param string|array $key	Property identifier or array of them
+	 */
+	public function unmarkFlashdata($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve all of the keys for session data marked as flashdata.
+	 *
+	 * @return array	The property names of all flashdata
+	 */
+	public function getFlashKeys(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets new data into the session, and marks it as temporary data
+	 * with a set lifespan.
+	 *
+	 * @param string|array $data  Session data key or associative array of items
+	 * @param mixed        $value Value to store
+	 * @param integer      $ttl   Time-to-live in seconds
+	 */
+	public function setTempdata($data, $value = null, int $ttl = 300);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns either a single piece of tempdata, or all temp data currently
+	 * in the session.
+	 *
+	 * @param  string $key Session data key
+	 * @return mixed        Session data value or null if not found.
+	 */
+	public function getTempdata(string $key = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single piece of temporary data from the session.
+	 *
+	 * @param string $key Session data key
+	 */
+	public function removeTempdata(string $key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Mark one of more pieces of data as being temporary, meaning that
+	 * it has a set lifespan within the session.
+	 *
+	 * @param string|array $key Property identifier or array of them
+	 * @param integer      $ttl Time to live, in seconds
+	 *
+	 * @return boolean    False if any of the properties were not set
+	 */
+	public function markAsTempdata($key, int $ttl = 300);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Unmarks temporary data in the session, effectively removing its
+	 * lifespan and allowing it to live as long as the session does.
+	 *
+	 * @param string|array $key	Property identifier or array of them
+	 */
+	public function unmarkTempdata($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieve the keys of all session data that have been marked as temporary data.
+	 *
+	 * @return array
+	 */
+	public function getTempKeys(): array;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
new file mode 100644
index 0000000..63ded76
--- /dev/null
+++ b/system/Test/CIDatabaseTestCase.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+/**
+ * CIDatabaseTestCase
+ *
+ * Use DatabaseTestTrait instead.
+ *
+ * @deprecated 4.1.2
+ */
+abstract class CIDatabaseTestCase extends CIUnitTestCase
+{
+	use DatabaseTestTrait;
+}
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
new file mode 100644
index 0000000..c651aaa
--- /dev/null
+++ b/system/Test/CIUnitTestCase.php
@@ -0,0 +1,577 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\MigrationRunner;
+use CodeIgniter\Database\Seeder;
+use CodeIgniter\Events\Events;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Session\Handlers\ArrayHandler;
+use CodeIgniter\Test\Mock\MockCache;
+use CodeIgniter\Test\Mock\MockCodeIgniter;
+use CodeIgniter\Test\Mock\MockEmail;
+use CodeIgniter\Test\Mock\MockSession;
+use Config\App;
+use Config\Autoload;
+use Config\Modules;
+use Config\Services;
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Framework test case for PHPUnit.
+ */
+abstract class CIUnitTestCase extends TestCase
+{
+	use ReflectionHelper;
+
+	/**
+	 * @var CodeIgniter
+	 */
+	protected $app;
+
+	/**
+	 * Methods to run during setUp.
+	 *
+	 * @var array of methods
+	 */
+	protected $setUpMethods = [
+		'resetFactories',
+		'mockCache',
+		'mockEmail',
+		'mockSession',
+	];
+
+	/**
+	 * Methods to run during tearDown.
+	 *
+	 * @var array of methods
+	 */
+	protected $tearDownMethods = [];
+
+	/**
+	 * Store of identified traits.
+	 *
+	 * @var string[]|null
+	 */
+	private $traits;
+
+	//--------------------------------------------------------------------
+	// Database Properties
+	//--------------------------------------------------------------------
+
+	/**
+	 * Should run db migration?
+	 *
+	 * @var boolean
+	 */
+	protected $migrate = true;
+
+	/**
+	 * Should run db migration only once?
+	 *
+	 * @var boolean
+	 */
+	protected $migrateOnce = false;
+
+	/**
+	 * Should run seeding only once?
+	 *
+	 * @var boolean
+	 */
+	protected $seedOnce = false;
+
+	/**
+	 * Should the db be refreshed before test?
+	 *
+	 * @var boolean
+	 */
+	protected $refresh = true;
+
+	/**
+	 * The seed file(s) used for all tests within this test case.
+	 * Should be fully-namespaced or relative to $basePath
+	 *
+	 * @var string|array
+	 */
+	protected $seed = '';
+
+	/**
+	 * The path to the seeds directory.
+	 * Allows overriding the default application directories.
+	 *
+	 * @var string
+	 */
+	protected $basePath = SUPPORTPATH . 'Database';
+
+	/**
+	 * The namespace(s) to help us find the migration classes.
+	 * Empty is equivalent to running `spark migrate -all`.
+	 * Note that running "all" runs migrations in date order,
+	 * but specifying namespaces runs them in namespace order (then date)
+	 *
+	 * @var string|array|null
+	 */
+	protected $namespace = 'Tests\Support';
+
+	/**
+	 * The name of the database group to connect to.
+	 * If not present, will use the defaultGroup.
+	 *
+	 * @var string
+	 */
+	protected $DBGroup = 'tests';
+
+	/**
+	 * Our database connection.
+	 *
+	 * @var BaseConnection
+	 */
+	protected $db;
+
+	/**
+	 * Migration Runner instance.
+	 *
+	 * @var MigrationRunner|mixed
+	 */
+	protected $migrations;
+
+	/**
+	 * Seeder instance
+	 *
+	 * @var Seeder
+	 */
+	protected $seeder;
+
+	/**
+	 * Stores information needed to remove any
+	 * rows inserted via $this->hasInDatabase();
+	 *
+	 * @var array
+	 */
+	protected $insertCache = [];
+
+	//--------------------------------------------------------------------
+	// Feature Properties
+	//--------------------------------------------------------------------
+
+	/**
+	 * If present, will override application
+	 * routes when using call().
+	 *
+	 * @var RouteCollection|null
+	 */
+	protected $routes;
+
+	/**
+	 * Values to be set in the SESSION global
+	 * before running the test.
+	 *
+	 * @var array
+	 */
+	protected $session = [];
+
+	/**
+	 * Enabled auto clean op buffer after request call
+	 *
+	 * @var boolean
+	 */
+	protected $clean = true;
+
+	/**
+	 * Custom request's headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Allows for formatting the request body to what
+	 * the controller is going to expect
+	 *
+	 * @var string
+	 */
+	protected $bodyFormat = '';
+
+	/**
+	 * Allows for directly setting the body to what
+	 * it needs to be.
+	 *
+	 * @var mixed
+	 */
+	protected $requestBody = '';
+
+	//--------------------------------------------------------------------
+	// Staging
+	//--------------------------------------------------------------------
+
+	/**
+	 * Load the helpers.
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		helper(['url', 'test']);
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		if (! $this->app) // @phpstan-ignore-line
+		{
+			$this->app = $this->createApplication();
+		}
+
+		foreach ($this->setUpMethods as $method)
+		{
+			$this->$method();
+		}
+
+		// Check for the database trait
+		if (method_exists($this, 'setUpDatabase'))
+		{
+			$this->setUpDatabase();
+		}
+
+		// Check for other trait methods
+		$this->callTraitMethods('setUp');
+	}
+
+	protected function tearDown(): void
+	{
+		parent::tearDown();
+
+		foreach ($this->tearDownMethods as $method)
+		{
+			$this->$method();
+		}
+
+		// Check for the database trait
+		if (method_exists($this, 'tearDownDatabase'))
+		{
+			$this->tearDownDatabase();
+		}
+
+		// Check for other trait methods
+		$this->callTraitMethods('tearDown');
+	}
+
+	/**
+	 * Checks for traits with corresponding
+	 * methods for setUp or tearDown.
+	 *
+	 * @param string $stage 'setUp' or 'tearDown'
+	 *
+	 * @return void
+	 */
+	private function callTraitMethods(string $stage): void
+	{
+		if (is_null($this->traits))
+		{
+			$this->traits = class_uses_recursive($this);
+		}
+
+		foreach ($this->traits as $trait)
+		{
+			$method = $stage . class_basename($trait);
+
+			if (method_exists($this, $method))
+			{
+				$this->$method();
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+	// Mocking
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets shared instanced for all Factories components
+	 */
+	protected function resetFactories()
+	{
+		Factories::reset();
+	}
+
+	/**
+	 * Resets shared instanced for all Services
+	 */
+	protected function resetServices()
+	{
+		Services::reset();
+	}
+
+	/**
+	 * Injects the mock Cache driver to prevent filesystem collisions
+	 */
+	protected function mockCache()
+	{
+		Services::injectMock('cache', new MockCache());
+	}
+
+	/**
+	 * Injects the mock email driver so no emails really send
+	 */
+	protected function mockEmail()
+	{
+		Services::injectMock('email', new MockEmail(config('Email')));
+	}
+
+	/**
+	 * Injects the mock session driver into Services
+	 */
+	protected function mockSession()
+	{
+		$_SESSION = [];
+
+		$config  = config('App');
+		$session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
+
+		Services::injectMock('session', $session);
+	}
+
+	//--------------------------------------------------------------------
+	// Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Custom function to hook into CodeIgniter's Logging mechanism
+	 * to check if certain messages were logged during code execution.
+	 *
+	 * @param string      $level
+	 * @param string|null $expectedMessage
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function assertLogged(string $level, $expectedMessage = null)
+	{
+		$result = TestLogger::didLog($level, $expectedMessage);
+
+		$this->assertTrue($result, sprintf(
+			'Failed asserting that expected message "%s" with level "%s" was logged.',
+			$expectedMessage ?? '',
+			$level
+		));
+
+		return $result;
+	}
+
+	/**
+	 * Hooks into CodeIgniter's Events system to check if a specific
+	 * event was triggered or not.
+	 *
+	 * @param string $eventName
+	 *
+	 * @return boolean
+	 * @throws Exception
+	 */
+	public function assertEventTriggered(string $eventName): bool
+	{
+		$found     = false;
+		$eventName = strtolower($eventName);
+
+		foreach (Events::getPerformanceLogs() as $log)
+		{
+			if ($log['event'] !== $eventName)
+			{
+				continue;
+			}
+
+			$found = true;
+			break;
+		}
+
+		$this->assertTrue($found);
+		return $found;
+	}
+
+	/**
+	 * Hooks into xdebug's headers capture, looking for a specific header
+	 * emitted
+	 *
+	 * @param string  $header     The leading portion of the header we are looking for
+	 * @param boolean $ignoreCase
+	 *
+	 * @throws Exception
+	 */
+	public function assertHeaderEmitted(string $header, bool $ignoreCase = false): void
+	{
+		$found = false;
+
+		if (! function_exists('xdebug_get_headers'))
+		{
+			$this->markTestSkipped('XDebug not found.');
+		}
+
+		foreach (xdebug_get_headers() as $emitted)
+		{
+			$found = $ignoreCase ?
+					(stripos($emitted, $header) === 0) :
+					(strpos($emitted, $header) === 0);
+			if ($found)
+			{
+				break;
+			}
+		}
+
+		$this->assertTrue($found, "Didn't find header for {$header}");
+	}
+
+	/**
+	 * Hooks into xdebug's headers capture, looking for a specific header
+	 * emitted
+	 *
+	 * @param string  $header     The leading portion of the header we don't want to find
+	 * @param boolean $ignoreCase
+	 *
+	 * @throws Exception
+	 */
+	public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false): void
+	{
+		$found = false;
+
+		if (! function_exists('xdebug_get_headers'))
+		{
+			$this->markTestSkipped('XDebug not found.');
+		}
+
+		foreach (xdebug_get_headers() as $emitted)
+		{
+			$found = $ignoreCase ?
+					(stripos($emitted, $header) === 0) :
+					(strpos($emitted, $header) === 0);
+			if ($found)
+			{
+				break;
+			}
+		}
+
+		$success = ! $found;
+		$this->assertTrue($success, "Found header for {$header}");
+	}
+
+	/**
+	 * Custom function to test that two values are "close enough".
+	 * This is intended for extended execution time testing,
+	 * where the result is close but not exactly equal to the
+	 * expected time, for reasons beyond our control.
+	 *
+	 * @param integer $expected
+	 * @param mixed   $actual
+	 * @param string  $message
+	 * @param integer $tolerance
+	 *
+	 * @throws Exception
+	 */
+	public function assertCloseEnough(int $expected, $actual, string $message = '', int $tolerance = 1)
+	{
+		$difference = abs($expected - (int) floor($actual));
+
+		$this->assertLessThanOrEqual($tolerance, $difference, $message);
+	}
+
+	/**
+	 * Custom function to test that two values are "close enough".
+	 * This is intended for extended execution time testing,
+	 * where the result is close but not exactly equal to the
+	 * expected time, for reasons beyond our control.
+	 *
+	 * @param mixed   $expected
+	 * @param mixed   $actual
+	 * @param string  $message
+	 * @param integer $tolerance
+	 *
+	 * @return void|boolean
+	 * @throws Exception
+	 */
+	public function assertCloseEnoughString($expected, $actual, string $message = '', int $tolerance = 1)
+	{
+		$expected = (string) $expected;
+		$actual   = (string) $actual;
+		if (strlen($expected) !== strlen($actual))
+		{
+			return false;
+		}
+
+		try
+		{
+			$expected   = (int) substr($expected, -2);
+			$actual     = (int) substr($actual, -2);
+			$difference = abs($expected - $actual);
+
+			$this->assertLessThanOrEqual($tolerance, $difference, $message);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+	// Utility
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads up an instance of CodeIgniter
+	 * and gets the environment setup.
+	 *
+	 * @return CodeIgniter
+	 */
+	protected function createApplication()
+	{
+		// Initialize the autoloader.
+		Services::autoloader()->initialize(new Autoload(), new Modules());
+
+		$app = new MockCodeIgniter(new App());
+		$app->initialize();
+
+		return $app;
+	}
+
+	/**
+	 * Return first matching emitted header.
+	 *
+	 * @param string  $header     Identifier of the header of interest
+	 * @param boolean $ignoreCase
+	 *
+	 * @return string|null The value of the header found, null if not found
+	 */
+	protected function getHeaderEmitted(string $header, bool $ignoreCase = false): ?string
+	{
+		$found = false;
+
+		if (! function_exists('xdebug_get_headers'))
+		{
+			$this->markTestSkipped('XDebug not found.');
+		}
+
+		foreach (xdebug_get_headers() as $emitted)
+		{
+			$found = $ignoreCase ?
+					(stripos($emitted, $header) === 0) :
+					(strpos($emitted, $header) === 0);
+			if ($found)
+			{
+				return $emitted;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/system/Test/Constraints/SeeInDatabase.php b/system/Test/Constraints/SeeInDatabase.php
new file mode 100644
index 0000000..0647fb9
--- /dev/null
+++ b/system/Test/Constraints/SeeInDatabase.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace CodeIgniter\Test\Constraints;
+
+use CodeIgniter\Database\ConnectionInterface;
+use PHPUnit\Framework\Constraint\Constraint;
+
+class SeeInDatabase extends Constraint
+{
+	/**
+	 * The number of results that will show in the database
+	 * in case of failure.
+	 *
+	 * @var integer
+	 */
+	protected $show = 3;
+
+	/**
+	 * @var ConnectionInterface
+	 */
+	protected $db;
+
+	/**
+	 * Data used to compare results against.
+	 *
+	 * @var array
+	 */
+	protected $data;
+
+	/**
+	 * SeeInDatabase constructor.
+	 *
+	 * @param ConnectionInterface $db
+	 * @param array               $data
+	 */
+	public function __construct(ConnectionInterface $db, array $data)
+	{
+		$this->db   = $db;
+		$this->data = $data;
+	}
+
+	/**
+	 * Check if data is found in the table
+	 *
+	 * @param mixed $table
+	 *
+	 * @return boolean
+	 */
+	public function matches($table): bool
+	{
+		return $this->db->table($table)->where($this->data)->countAllResults() > 0;
+	}
+
+	/**
+	 * Get the description of the failure
+	 *
+	 * @param mixed $table
+	 *
+	 * @return string
+	 */
+	public function failureDescription($table): string
+	{
+		return sprintf(
+			"a row in the table [%s] matches the attributes \n%s\n\n%s",
+			$table, $this->toString(JSON_PRETTY_PRINT), $this->getAdditionalInfo($table)
+		);
+	}
+
+	/**
+	 * Gets additional records similar to $data.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function getAdditionalInfo(string $table): string
+	{
+		$builder = $this->db->table($table);
+
+		$similar = $builder->where(
+				array_key_first($this->data),
+				$this->data[array_key_first($this->data)]
+			)->limit($this->show)
+			->get()->getResultArray();
+
+		if ($similar !== [])
+		{
+			$description = 'Found similar results: ' . json_encode($similar, JSON_PRETTY_PRINT);
+		}
+		else
+		{
+			// Does the table have any results at all?
+			$results = $this->db->table($table)
+				->limit($this->show)
+				->get()
+				->getResultArray();
+
+			if ($results !== [])
+			{
+				return 'The table is empty.';
+			}
+
+			$description = 'Found: ' . json_encode($results, JSON_PRETTY_PRINT);
+		}
+
+		$total = $this->db->table($table)->countAll();
+		if ($total > $this->show)
+		{
+			$description .= sprintf(' and %s others', $total - $this->show);
+		}
+
+		return $description;
+	}
+
+	/**
+	 * Gets a string representation of the constraint
+	 *
+	 * @param integer $options
+	 *
+	 * @return string
+	 */
+	public function toString($options = 0): string
+	{
+		return json_encode($this->data, $options);
+	}
+}
diff --git a/system/Test/ControllerResponse.php b/system/Test/ControllerResponse.php
new file mode 100644
index 0000000..2365c35
--- /dev/null
+++ b/system/Test/ControllerResponse.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+/**
+ * Testable response from a controller
+ *
+ * @deprecated Use TestResponse directly
+ *
+ * @codeCoverageIgnore
+ */
+class ControllerResponse extends TestResponse
+{
+	/**
+	 * The message payload.
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use $response->getBody() instead
+	 */
+	protected $body;
+
+	/**
+	 * DOM for the body.
+	 *
+	 * @var DOMParser
+	 *
+	 * @deprecated Use $domParser instead
+	 */
+	protected $dom;
+
+	/**
+	 * Maintains the deprecated $dom property.
+	 */
+	public function __construct()
+	{
+		parent::__construct(Services::response());
+
+		$this->dom = &$this->domParser;
+	}
+
+	/**
+	 * Sets the response.
+	 *
+	 * @param ResponseInterface $response
+	 *
+	 * @return $this
+	 *
+	 * @deprecated Will revert to parent::setResponse() in a future release (no $body updates)
+	 */
+	public function setResponse(ResponseInterface $response)
+	{
+		parent::setResponse($response);
+
+		$this->body = $response->getBody() ?? '';
+
+		return $this;
+	}
+
+	/**
+	 * Sets the body and updates the DOM.
+	 *
+	 * @param string $body
+	 *
+	 * @return $this
+	 *
+	 * @deprecated Use response()->setBody() instead
+	 */
+	public function setBody(string $body)
+	{
+		$this->body = $body;
+
+		if ($body !== '')
+		{
+			$this->domParser->withString($body);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Retrieve the body.
+	 *
+	 * @return string
+	 *
+	 * @deprecated Use response()->getBody() instead
+	 */
+	public function getBody()
+	{
+		return $this->body;
+	}
+}
diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
new file mode 100644
index 0000000..47810e5
--- /dev/null
+++ b/system/Test/ControllerTestTrait.php
@@ -0,0 +1,326 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Controller;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\URI;
+use Config\App;
+use Config\Services;
+use InvalidArgumentException;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+/**
+ * Controller Test Trait
+ *
+ * Provides features that make testing controllers simple and fluent.
+ *
+ * Example:
+ *
+ *  $this->withRequest($request)
+ *       ->withResponse($response)
+ *       ->withURI($uri)
+ *       ->withBody($body)
+ *       ->controller('App\Controllers\Home')
+ *       ->execute('methodName');
+ */
+trait ControllerTestTrait
+{
+	/**
+	 * Controller configuration.
+	 *
+	 * @var App
+	 */
+	protected $appConfig;
+
+	/**
+	 * Request.
+	 *
+	 * @var IncomingRequest
+	 */
+	protected $request;
+
+	/**
+	 * Response.
+	 *
+	 * @var Response
+	 */
+	protected $response;
+
+	/**
+	 * Message logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Initialized controller.
+	 *
+	 * @var Controller
+	 */
+	protected $controller;
+
+	/**
+	 * URI of this request.
+	 *
+	 * @var string
+	 */
+	protected $uri = 'http://example.com';
+
+	/**
+	 * Request body.
+	 *
+	 * @var string|null
+	 */
+	protected $body;
+
+	/**
+	 * Initializes required components.
+	 */
+	protected function setUpControllerTestTrait(): void
+	{
+		// The URL helper is always loaded by the system so ensure it is available.
+		helper('url');
+
+		if (empty($this->appConfig))
+		{
+			$this->appConfig = config('App');
+		}
+
+		if (! $this->uri instanceof URI)
+		{
+			$this->uri = Services::uri($this->appConfig->baseURL ?? 'http://example.com/', false);
+		}
+
+		if (empty($this->request))
+		{
+			// Do some acrobatics so we can use the Request service with our own URI
+			$tempUri = Services::uri();
+			Services::injectMock('uri', $this->uri);
+
+			$this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
+
+			// Restore the URI service
+			Services::injectMock('uri', $tempUri);
+		}
+
+		if (empty($this->response))
+		{
+			$this->response = Services::response($this->appConfig, false);
+		}
+
+		if (empty($this->logger))
+		{
+			$this->logger = Services::logger();
+		}
+	}
+
+	/**
+	 * Loads the specified controller, and generates any needed dependencies.
+	 *
+	 * @param string $name
+	 *
+	 * @return mixed
+	 */
+	public function controller(string $name)
+	{
+		if (! class_exists($name))
+		{
+			throw new InvalidArgumentException('Invalid Controller: ' . $name);
+		}
+
+		$this->controller = new $name();
+		$this->controller->initController($this->request, $this->response, $this->logger);
+
+		return $this;
+	}
+
+	/**
+	 * Runs the specified method on the controller and returns the results.
+	 *
+	 * @param string $method
+	 * @param array  $params
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @return TestResponse
+	 */
+	public function execute(string $method, ...$params)
+	{
+		if (! method_exists($this->controller, $method) || ! is_callable([$this->controller, $method]))
+		{
+			throw new InvalidArgumentException('Method does not exist or is not callable in controller: ' . $method);
+		}
+
+		$response = null;
+
+		try
+		{
+			ob_start();
+			$response = $this->controller->{$method}(...$params);
+		}
+		catch (Throwable $e)
+		{
+			$code = $e->getCode();
+
+			// If code is not a valid HTTP status then assume there is an error
+			if ($code < 100 || $code >= 600)
+			{
+				throw $e;
+			}
+		}
+		finally
+		{
+			$output = ob_get_clean();
+		}
+
+		// If the controller returned a view then add it to the output
+		if (is_string($response))
+		{
+			$output = is_string($output) ? $output . $response : $response;
+		}
+
+		// If the controller did not return a response then start one
+		if (! $response instanceof Response)
+		{
+			$response = $this->response;
+		}
+
+		// Check for output to set or prepend
+		// @see \CodeIgniter\CodeIgniter::gatherOutput()
+		if (is_string($output))
+		{
+			if (is_string($response->getBody()))
+			{
+				$response->setBody($output . $response->getBody());
+			}
+			else
+			{
+				$response->setBody($output);
+			}
+		}
+
+		// Check for an overriding code from exceptions
+		if (isset($code))
+		{
+			$response->setStatusCode($code);
+		}
+		// Otherwise ensure there is a status code
+		else
+		{
+			// getStatusCode() throws for empty codes
+			try
+			{
+				$response->getStatusCode();
+			}
+			catch (HTTPException $e)
+			{
+				// If no code has been set then assume success
+				$response->setStatusCode(200);
+			}
+		}
+
+		// Create the result and add the Request for reference
+		return (new TestResponse($response))->setRequest($this->request);
+	}
+
+	/**
+	 * Set controller's config, with method chaining.
+	 *
+	 * @param mixed $appConfig
+	 *
+	 * @return mixed
+	 */
+	public function withConfig($appConfig)
+	{
+		$this->appConfig = $appConfig;
+
+		return $this;
+	}
+
+	/**
+	 * Set controller's request, with method chaining.
+	 *
+	 * @param mixed $request
+	 *
+	 * @return mixed
+	 */
+	public function withRequest($request)
+	{
+		$this->request = $request;
+
+		// Make sure it's available for other classes
+		Services::injectMock('request', $request);
+
+		return $this;
+	}
+
+	/**
+	 * Set controller's response, with method chaining.
+	 *
+	 * @param mixed $response
+	 *
+	 * @return mixed
+	 */
+	public function withResponse($response)
+	{
+		$this->response = $response;
+
+		return $this;
+	}
+
+	/**
+	 * Set controller's logger, with method chaining.
+	 *
+	 * @param mixed $logger
+	 *
+	 * @return mixed
+	 */
+	public function withLogger($logger)
+	{
+		$this->logger = $logger;
+
+		return $this;
+	}
+
+	/**
+	 * Set the controller's URI, with method chaining.
+	 *
+	 * @param string $uri
+	 *
+	 * @return mixed
+	 */
+	public function withUri(string $uri)
+	{
+		$this->uri = new URI($uri);
+
+		return $this;
+	}
+
+	/**
+	 * Set the method's body, with method chaining.
+	 *
+	 * @param string|null $body
+	 *
+	 * @return mixed
+	 */
+	public function withBody($body)
+	{
+		$this->body = $body;
+
+		return $this;
+	}
+}
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
new file mode 100644
index 0000000..391873a
--- /dev/null
+++ b/system/Test/ControllerTester.php
@@ -0,0 +1,317 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Controller;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\URI;
+use Config\App;
+use Config\Services;
+use InvalidArgumentException;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+/**
+ * ControllerTester Trait
+ *
+ * Provides features that make testing controllers simple and fluent.
+ *
+ * Example:
+ *
+ *  $this->withRequest($request)
+ *       ->withResponse($response)
+ *       ->withURI($uri)
+ *       ->withBody($body)
+ *       ->controller('App\Controllers\Home')
+ *       ->execute('methodName');
+ *
+ * @deprecated Use ControllerTestTrait instead
+ *
+ * @codeCoverageIgnore
+ */
+trait ControllerTester
+{
+	/**
+	 * Controller configuration.
+	 *
+	 * @var App
+	 */
+	protected $appConfig;
+
+	/**
+	 * Request.
+	 *
+	 * @var IncomingRequest
+	 */
+	protected $request;
+
+	/**
+	 * Response.
+	 *
+	 * @var Response
+	 */
+	protected $response;
+
+	/**
+	 * Message logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Initialized controller.
+	 *
+	 * @var Controller
+	 */
+	protected $controller;
+
+	/**
+	 * URI of this request.
+	 *
+	 * @var string
+	 */
+	protected $uri = 'http://example.com';
+
+	/**
+	 * Request or response body.
+	 *
+	 * @var string|null
+	 */
+	protected $body;
+
+	/**
+	 * Initializes required components.
+	 */
+	protected function setUpControllerTester(): void
+	{
+		if (empty($this->appConfig))
+		{
+			$this->appConfig = config('App');
+		}
+
+		if (! $this->uri instanceof URI)
+		{
+			$this->uri = Services::uri($this->appConfig->baseURL ?? 'http://example.com/', false);
+		}
+
+		if (empty($this->request))
+		{
+			// Do some acrobatics so we can use the Request service with our own URI
+			$tempUri = Services::uri();
+			Services::injectMock('uri', $this->uri);
+
+			$this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
+
+			// Restore the URI service
+			Services::injectMock('uri', $tempUri);
+		}
+
+		if (empty($this->response))
+		{
+			$this->response = Services::response($this->appConfig, false);
+		}
+
+		if (empty($this->logger))
+		{
+			$this->logger = Services::logger();
+		}
+	}
+
+	/**
+	 * Loads the specified controller, and generates any needed dependencies.
+	 *
+	 * @param string $name
+	 *
+	 * @return mixed
+	 */
+	public function controller(string $name)
+	{
+		if (! class_exists($name))
+		{
+			throw new InvalidArgumentException('Invalid Controller: ' . $name);
+		}
+
+		$this->controller = new $name();
+		$this->controller->initController($this->request, $this->response, $this->logger);
+
+		return $this;
+	}
+
+	/**
+	 * Runs the specified method on the controller and returns the results.
+	 *
+	 * @param string $method
+	 * @param array  $params
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @return ControllerResponse
+	 */
+	public function execute(string $method, ...$params)
+	{
+		if (! method_exists($this->controller, $method) || ! is_callable([$this->controller, $method]))
+		{
+			throw new InvalidArgumentException('Method does not exist or is not callable in controller: ' . $method);
+		}
+
+		// The URL helper is always loaded by the system
+		// so ensure it's available.
+		helper('url');
+
+		$result = (new ControllerResponse())
+				->setRequest($this->request)
+				->setResponse($this->response);
+
+		$response = null;
+		try
+		{
+			ob_start();
+
+			$response = $this->controller->{$method}(...$params);
+		}
+		catch (Throwable $e)
+		{
+			$code = $e->getCode();
+
+			// If code is not a valid HTTP status then assume there is an error
+			if ($code < 100 || $code >= 600)
+			{
+				throw $e;
+			}
+
+			$result->response()->setStatusCode($code);
+		}
+		finally
+		{
+			$output = ob_get_clean();
+
+			// If the controller returned a response, use it
+			if (isset($response) && $response instanceof Response)
+			{
+				$result->setResponse($response);
+			}
+
+			// check if controller returned a view rather than echoing it
+			if (is_string($response))
+			{
+				$output = $response;
+				$result->response()->setBody($output);
+				$result->setBody($output);
+			}
+			elseif (! empty($response) && ! empty($response->getBody()))
+			{
+				$result->setBody($response->getBody());
+			}
+			else
+			{
+				$result->setBody('');
+			}
+		}
+
+		// If not response code has been sent, assume a success
+		if (empty($result->response()->getStatusCode()))
+		{
+			$result->response()->setStatusCode(200);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Set controller's config, with method chaining.
+	 *
+	 * @param mixed $appConfig
+	 *
+	 * @return mixed
+	 */
+	public function withConfig($appConfig)
+	{
+		$this->appConfig = $appConfig;
+
+		return $this;
+	}
+
+	/**
+	 * Set controller's request, with method chaining.
+	 *
+	 * @param mixed $request
+	 *
+	 * @return mixed
+	 */
+	public function withRequest($request)
+	{
+		$this->request = $request;
+
+		// Make sure it's available for other classes
+		Services::injectMock('request', $request);
+
+		return $this;
+	}
+
+	/**
+	 * Set controller's response, with method chaining.
+	 *
+	 * @param mixed $response
+	 *
+	 * @return mixed
+	 */
+	public function withResponse($response)
+	{
+		$this->response = $response;
+
+		return $this;
+	}
+
+	/**
+	 * Set controller's logger, with method chaining.
+	 *
+	 * @param mixed $logger
+	 *
+	 * @return mixed
+	 */
+	public function withLogger($logger)
+	{
+		$this->logger = $logger;
+
+		return $this;
+	}
+
+	/**
+	 * Set the controller's URI, with method chaining.
+	 *
+	 * @param string $uri
+	 *
+	 * @return mixed
+	 */
+	public function withUri(string $uri)
+	{
+		$this->uri = new URI($uri);
+
+		return $this;
+	}
+
+	/**
+	 * Set the method's body, with method chaining.
+	 *
+	 * @param string|null $body
+	 *
+	 * @return mixed
+	 */
+	public function withBody($body)
+	{
+		$this->body = $body;
+
+		return $this;
+	}
+}
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
new file mode 100644
index 0000000..4938fdf
--- /dev/null
+++ b/system/Test/DOMParser.php
@@ -0,0 +1,337 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use BadMethodCallException;
+use DOMDocument;
+use DOMNodeList;
+use DOMXPath;
+use InvalidArgumentException;
+
+/**
+ * Load a response into a DOMDocument for testing assertions based on that
+ */
+class DOMParser
+{
+	/**
+	 * DOM for the body,
+	 *
+	 * @var DOMDocument
+	 */
+	protected $dom;
+
+	/**
+	 * Constructor.
+	 *
+	 * @throws BadMethodCallException
+	 */
+	public function __construct()
+	{
+		if (! extension_loaded('DOM'))
+		{
+			// always there in travis-ci
+			// @codeCoverageIgnoreStart
+			throw new BadMethodCallException('DOM extension is required, but not currently loaded.');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$this->dom = new DOMDocument('1.0', 'utf-8');
+	}
+
+	/**
+	 * Returns the body of the current document.
+	 *
+	 * @return string
+	 */
+	public function getBody(): string
+	{
+		return $this->dom->saveHTML();
+	}
+
+	/**
+	 * Sets a string as the body that we want to work with.
+	 *
+	 * @param string $content
+	 *
+	 * @return $this
+	 */
+	public function withString(string $content)
+	{
+		// converts all special characters to utf-8
+		$content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+
+		//turning off some errors
+		libxml_use_internal_errors(true);
+
+		if (! $this->dom->loadHTML($content))
+		{
+			// unclear how we would get here, given that we are trapping libxml errors
+			// @codeCoverageIgnoreStart
+			libxml_clear_errors();
+			throw new BadMethodCallException('Invalid HTML');
+			// @codeCoverageIgnoreEnd
+		}
+
+		// ignore the whitespace.
+		$this->dom->preserveWhiteSpace = false;
+
+		return $this;
+	}
+
+	/**
+	 * Loads the contents of a file as a string
+	 * so that we can work with it.
+	 *
+	 * @param string $path
+	 *
+	 * @return DOMParser
+	 */
+	public function withFile(string $path)
+	{
+		if (! is_file($path))
+		{
+			throw new InvalidArgumentException(basename($path) . ' is not a valid file.');
+		}
+
+		$content = file_get_contents($path);
+
+		return $this->withString($content);
+	}
+
+	/**
+	 * Checks to see if the text is found within the result.
+	 *
+	 * @param string $search
+	 * @param string $element
+	 *
+	 * @return boolean
+	 */
+	public function see(string $search = null, string $element = null): bool
+	{
+		// If Element is null, we're just scanning for text
+		if (is_null($element))
+		{
+			$content = $this->dom->saveHTML($this->dom->documentElement);
+			return mb_strpos($content, $search) !== false;
+		}
+
+		$result = $this->doXPath($search, $element);
+
+		return (bool) $result->length;
+	}
+
+	/**
+	 * Checks to see if the text is NOT found within the result.
+	 *
+	 * @param string      $search
+	 * @param string|null $element
+	 *
+	 * @return boolean
+	 */
+	public function dontSee(string $search = null, string $element = null): bool
+	{
+		return ! $this->see($search, $element);
+	}
+
+	/**
+	 * Checks to see if an element with the matching CSS specifier
+	 * is found within the current DOM.
+	 *
+	 * @param string $element
+	 *
+	 * @return boolean
+	 */
+	public function seeElement(string $element): bool
+	{
+		return $this->see(null, $element);
+	}
+
+	/**
+	 * Checks to see if the element is available within the result.
+	 *
+	 * @param string $element
+	 *
+	 * @return boolean
+	 */
+	public function dontSeeElement(string $element): bool
+	{
+		return $this->dontSee(null, $element);
+	}
+
+	/**
+	 * Determines if a link with the specified text is found
+	 * within the results.
+	 *
+	 * @param string      $text
+	 * @param string|null $details
+	 *
+	 * @return boolean
+	 */
+	public function seeLink(string $text, string $details = null): bool
+	{
+		return $this->see($text, 'a' . $details);
+	}
+
+	/**
+	 * Checks for an input named $field with a value of $value.
+	 *
+	 * @param string $field
+	 * @param string $value
+	 *
+	 * @return boolean
+	 */
+	public function seeInField(string $field, string $value): bool
+	{
+		$result = $this->doXPath(null, 'input', ["[@value=\"{$value}\"][@name=\"{$field}\"]"]);
+
+		return (bool) $result->length;
+	}
+
+	/**
+	 * Checks for checkboxes that are currently checked.
+	 *
+	 * @param string $element
+	 *
+	 * @return boolean
+	 */
+	public function seeCheckboxIsChecked(string $element): bool
+	{
+		$result = $this->doXPath(null, 'input' . $element, [
+			'[@type="checkbox"]',
+			'[@checked="checked"]',
+		]);
+
+		return (bool) $result->length;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Search the DOM using an XPath expression.
+	 *
+	 * @param  string|null $search
+	 * @param  string      $element
+	 * @param  array       $paths
+	 *
+	 * @return DOMNodeList
+	 */
+	protected function doXPath(?string $search, string $element, array $paths = [])
+	{
+		// Otherwise, grab any elements that match
+		// the selector
+		$selector = $this->parseSelector($element);
+
+		$path = '';
+
+		// By ID
+		if (! empty($selector['id']))
+		{
+			$path = empty($selector['tag'])
+				? "id(\"{$selector['id']}\")"
+				: "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
+		}
+		// By Class
+		elseif (! empty($selector['class']))
+		{
+			$path = empty($selector['tag'])
+				? "//*[@class=\"{$selector['class']}\"]"
+				: "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
+		}
+		// By tag only
+		elseif (! empty($selector['tag']))
+		{
+			$path = "//{$selector['tag']}";
+		}
+
+		if (! empty($selector['attr']))
+		{
+			foreach ($selector['attr'] as $key => $value)
+			{
+				$path .= "[@{$key}=\"{$value}\"]";
+			}
+		}
+
+		// $paths might contain a number of different
+		// ready to go xpath portions to tack on.
+		if (! empty($paths) && is_array($paths))
+		{
+			foreach ($paths as $extra)
+			{
+				$path .= $extra;
+			}
+		}
+
+		if (! is_null($search))
+		{
+			$path .= "[contains(., \"{$search}\")]";
+		}
+
+		$xpath = new DOMXPath($this->dom);
+
+		return $xpath->query($path);
+	}
+
+	/**
+	 * Look for the a selector  in the passed text.
+	 *
+	 * @param  string $selector
+	 * @return array
+	 */
+	public function parseSelector(string $selector)
+	{
+		$tag   = null;
+		$id    = null;
+		$class = null;
+		$attr  = null;
+
+		// ID?
+		if ($pos = strpos($selector, '#') !== false)
+		{
+			[$tag, $id] = explode('#', $selector);
+		}
+		// Attribute
+		elseif (strpos($selector, '[') !== false && strpos($selector, ']') !== false)
+		{
+			$open  = strpos($selector, '[');
+			$close = strpos($selector, ']');
+
+			$tag  = substr($selector, 0, $open);
+			$text = substr($selector, $open + 1, $close - 2);
+
+			// We only support a single attribute currently
+			$text = explode(',', $text);
+			$text = trim(array_shift($text));
+
+			[$name, $value] = explode('=', $text);
+			$name               = trim($name);
+			$value              = trim($value);
+			$attr               = [$name => trim($value, '] ')];
+		}
+		// Class?
+		elseif ($pos = strpos($selector, '.') !== false)
+		{
+			[$tag, $class] = explode('.', $selector);
+		}
+		// Otherwise, assume the entire string is our tag
+		else
+		{
+			$tag = $selector;
+		}
+
+		return [
+			'tag'   => $tag,
+			'id'    => $id,
+			'class' => $class,
+			'attr'  => $attr,
+		];
+	}
+}
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
new file mode 100644
index 0000000..2c8ba23
--- /dev/null
+++ b/system/Test/DatabaseTestTrait.php
@@ -0,0 +1,373 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Test\Constraints\SeeInDatabase;
+use Config\Database;
+use Config\Migrations;
+use Config\Services;
+
+/**
+ * DatabaseTestTrait
+ *
+ * Provides functionality for refreshing/seeding
+ * the database during testing.
+ *
+ * @mixin CIUnitTestCase
+ */
+trait DatabaseTestTrait
+{
+	/**
+	 * Is db migration done once or more than once?
+	 *
+	 * @var boolean
+	 */
+	private static $doneMigration = false;
+
+	/**
+	 * Is seeding done once or more than once?
+	 *
+	 * @var boolean
+	 */
+	private static $doneSeed = false;
+
+	//--------------------------------------------------------------------
+	// Staging
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs the trait set up methods.
+	 */
+	protected function setUpDatabase()
+	{
+		$this->loadDependencies();
+		$this->setUpMigrate();
+		$this->setUpSeed();
+	}
+
+	/**
+	 * Runs the trait set up methods.
+	 */
+	protected function tearDownDatabase()
+	{
+		$this->clearInsertCache();
+	}
+
+	/**
+	 * Load any database test dependencies.
+	 */
+	public function loadDependencies()
+	{
+		if ($this->db === null)
+		{
+			$this->db = Database::connect($this->DBGroup);
+			$this->db->initialize();
+		}
+
+		if ($this->migrations === null)
+		{
+			// Ensure that we can run migrations
+			$config          = new Migrations();
+			$config->enabled = true;
+
+			$this->migrations = Services::migrations($config, $this->db);
+			$this->migrations->setSilent(false);
+		}
+
+		if ($this->seeder === null)
+		{
+			$this->seeder = Database::seeder($this->DBGroup);
+			$this->seeder->setSilent(true);
+		}
+	}
+
+	//--------------------------------------------------------------------
+	// Migrations
+	//--------------------------------------------------------------------
+
+	/**
+	 * Migrate on setUp
+	 */
+	protected function setUpMigrate()
+	{
+		if ($this->migrateOnce === false || self::$doneMigration === false)
+		{
+			if ($this->refresh === true)
+			{
+				$this->regressDatabase();
+
+				// Reset counts on faked items
+				Fabricator::resetCounts();
+			}
+
+			$this->migrateDatabase();
+		}
+	}
+
+	/**
+	 * Regress migrations as defined by the class
+	 */
+	protected function regressDatabase()
+	{
+		if ($this->migrate === false)
+		{
+			return;
+		}
+
+		// If no namespace was specified then rollback all
+		if (empty($this->namespace))
+		{
+			$this->migrations->setNamespace(null);
+			$this->migrations->regress(0, 'tests');
+		}
+
+		// Regress each specified namespace
+		else
+		{
+			$namespaces = is_array($this->namespace) ? $this->namespace : [$this->namespace];
+
+			foreach ($namespaces as $namespace)
+			{
+				$this->migrations->setNamespace($namespace);
+				$this->migrations->regress(0, 'tests');
+			}
+		}
+	}
+
+	/**
+	 * Run migrations as defined by the class
+	 */
+	protected function migrateDatabase()
+	{
+		if ($this->migrate === false)
+		{
+			return;
+		}
+
+		// If no namespace was specified then migrate all
+		if (empty($this->namespace))
+		{
+			$this->migrations->setNamespace(null);
+			$this->migrations->latest('tests');
+			self::$doneMigration = true;
+		}
+		// Run migrations for each specified namespace
+		else
+		{
+			$namespaces = is_array($this->namespace) ? $this->namespace : [$this->namespace];
+
+			foreach ($namespaces as $namespace)
+			{
+				$this->migrations->setNamespace($namespace);
+				$this->migrations->latest('tests');
+				self::$doneMigration = true;
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+	// Seeds
+	//--------------------------------------------------------------------
+
+	/**
+	 * Seed on setUp
+	 */
+	protected function setUpSeed()
+	{
+		if ($this->seedOnce === false || self::$doneSeed === false)
+		{
+			$this->runSeeds();
+		}
+	}
+
+	/**
+	 * Run seeds as defined by the class
+	 */
+	protected function runSeeds()
+	{
+		if (! empty($this->seed))
+		{
+			if (! empty($this->basePath))
+			{
+				$this->seeder->setPath(rtrim($this->basePath, '/') . '/Seeds');
+			}
+
+			$seeds = is_array($this->seed) ? $this->seed : [$this->seed];
+			foreach ($seeds as $seed)
+			{
+				$this->seed($seed);
+			}
+		}
+
+		self::$doneSeed = true;
+	}
+
+	/**
+	 * Seeds that database with a specific seeder.
+	 *
+	 * @param string $name
+	 *
+	 * @return void
+	 */
+	public function seed(string $name)
+	{
+		$this->seeder->call($name);
+	}
+
+	//--------------------------------------------------------------------
+	// Utility
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reset $doneMigration and $doneSeed
+	 *
+	 * @afterClass
+	 */
+	public static function resetMigrationSeedCount()
+	{
+		self::$doneMigration = false;
+		self::$doneSeed      = false;
+	}
+
+	/**
+	 * Removes any rows inserted via $this->hasInDatabase()
+	 */
+	protected function clearInsertCache()
+	{
+		if (! empty($this->insertCache))
+		{
+			foreach ($this->insertCache as $row)
+			{
+				$this->db->table($row[0])
+						->where($row[1])
+						->delete();
+			}
+		}
+	}
+
+	/**
+	 * Loads the Builder class appropriate for the current database.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return BaseBuilder
+	 */
+	public function loadBuilder(string $tableName)
+	{
+		$builderClass = str_replace('Connection', 'Builder', get_class($this->db));
+
+		return new $builderClass($tableName, $this->db);
+	}
+
+	/**
+	 * Fetches a single column from a database row with criteria
+	 * matching $where.
+	 *
+	 * @param string $table
+	 * @param string $column
+	 * @param array  $where
+	 *
+	 * @return boolean
+	 * @throws DatabaseException
+	 */
+	public function grabFromDatabase(string $table, string $column, array $where)
+	{
+		$query = $this->db->table($table)
+						  ->select($column)
+						  ->where($where)
+						  ->get();
+
+		$query = $query->getRow();
+
+		return $query->$column ?? false;
+	}
+
+	//--------------------------------------------------------------------
+	// Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that records that match the conditions in $where DO
+	 * exist in the database.
+	 *
+	 * @param string $table
+	 * @param array  $where
+	 *
+	 * @return void
+	 * @throws DatabaseException
+	 */
+	public function seeInDatabase(string $table, array $where)
+	{
+		$constraint = new SeeInDatabase($this->db, $where);
+		static::assertThat($table, $constraint);
+	}
+
+	/**
+	 * Asserts that records that match the conditions in $where do
+	 * not exist in the database.
+	 *
+	 * @param string $table
+	 * @param array  $where
+	 *
+	 * @return void
+	 */
+	public function dontSeeInDatabase(string $table, array $where)
+	{
+		$count = $this->db->table($table)
+						  ->where($where)
+						  ->countAllResults();
+
+		$this->assertTrue($count === 0, 'Row was found in database');
+	}
+
+	/**
+	 * Inserts a row into to the database. This row will be removed
+	 * after the test has run.
+	 *
+	 * @param string $table
+	 * @param array  $data
+	 *
+	 * @return boolean
+	 */
+	public function hasInDatabase(string $table, array $data)
+	{
+		$this->insertCache[] = [
+			$table,
+			$data,
+		];
+
+		return $this->db->table($table)
+						->insert($data);
+	}
+
+	/**
+	 * Asserts that the number of rows in the database that match $where
+	 * is equal to $expected.
+	 *
+	 * @param integer $expected
+	 * @param string  $table
+	 * @param array   $where
+	 *
+	 * @return void
+	 * @throws DatabaseException
+	 */
+	public function seeNumRecords(int $expected, string $table, array $where)
+	{
+		$count = $this->db->table($table)
+						  ->where($where)
+						  ->countAllResults();
+
+		$this->assertEquals($expected, $count, 'Wrong number of matching rows in database.');
+	}
+}
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
new file mode 100644
index 0000000..885f2ef
--- /dev/null
+++ b/system/Test/Fabricator.php
@@ -0,0 +1,615 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\Model;
+use Faker\Factory;
+use Faker\Generator;
+use InvalidArgumentException;
+use RuntimeException;
+
+/**
+ * Fabricator
+ *
+ * Bridge class for using Faker to create example data based on
+ * model specifications.
+ */
+class Fabricator
+{
+	/**
+	 * Array of counts for fabricated items
+	 *
+	 * @var array
+	 */
+	protected static $tableCounts = [];
+
+	/**
+	 * Locale-specific Faker instance
+	 *
+	 * @var Generator
+	 */
+	protected $faker;
+
+	/**
+	 * Model instance (can be non-framework if it follows framework design)
+	 *
+	 * @var Model|object
+	 */
+	protected $model;
+
+	/**
+	 * Locale used to initialize Faker
+	 *
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
+	 * Map of properties and their formatter to use
+	 *
+	 * @var array|null
+	 */
+	protected $formatters;
+
+	/**
+	 * Date fields present in the model
+	 *
+	 * @var array
+	 */
+	protected $dateFields = [];
+
+	/**
+	 * Array of data to add or override faked versions
+	 *
+	 * @var array
+	 */
+	protected $overrides = [];
+
+	/**
+	 * Array of single-use data to override faked versions
+	 *
+	 * @var array|null
+	 */
+	protected $tempOverrides;
+
+	/**
+	 * Default formatter to use when nothing is detected
+	 *
+	 * @var string
+	 */
+	public $defaultFormatter = 'word';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Store the model instance and initialize Faker to the locale.
+	 *
+	 * @param string|object $model      Instance or classname of the model to use
+	 * @param array|null    $formatters Array of property => formatter
+	 * @param string|null   $locale     Locale for Faker provider
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($model, array $formatters = null, string $locale = null)
+	{
+		if (is_string($model))
+		{
+			// Create a new model instance
+			$model = model($model, false);
+		}
+
+		if (! is_object($model))
+		{
+			throw new InvalidArgumentException(lang('Fabricator.invalidModel'));
+		}
+
+		$this->model = $model;
+
+		// If no locale was specified then use the App default
+		if (is_null($locale))
+		{
+			$locale = config('App')->defaultLocale;
+		}
+
+		// There is no easy way to retrieve the locale from Faker so we will store it
+		$this->locale = $locale;
+
+		// Create the locale-specific Generator
+		$this->faker = Factory::create($this->locale);
+
+		// Determine eligible date fields
+		foreach (['createdField', 'updatedField', 'deletedField'] as $field)
+		{
+			if (! empty($this->model->$field))
+			{
+				$this->dateFields[] = $this->model->$field;
+			}
+		}
+
+		// Set the formatters
+		$this->setFormatters($formatters);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Reset internal counts
+	 */
+	public static function resetCounts()
+	{
+		self::$tableCounts = [];
+	}
+
+	/**
+	 * Get the count for a specific table
+	 *
+	 * @param string $table Name of the target table
+	 *
+	 * @return integer
+	 */
+	public static function getCount(string $table): int
+	{
+		return empty(self::$tableCounts[$table]) ? 0 : self::$tableCounts[$table];
+	}
+
+	/**
+	 * Set the count for a specific table
+	 *
+	 * @param string  $table Name of the target table
+	 * @param integer $count Count value
+	 *
+	 * @return integer  The new count value
+	 */
+	public static function setCount(string $table, int $count): int
+	{
+		self::$tableCounts[$table] = $count;
+		return $count;
+	}
+
+	/**
+	 * Increment the count for a table
+	 *
+	 * @param string $table Name of the target table
+	 *
+	 * @return integer  The new count value
+	 */
+	public static function upCount(string $table): int
+	{
+		return self::setCount($table, self::getCount($table) + 1);
+	}
+
+	/**
+	 * Decrement the count for a table
+	 *
+	 * @param string $table Name of the target table
+	 *
+	 * @return integer  The new count value
+	 */
+	public static function downCount(string $table): int
+	{
+		return self::setCount($table, self::getCount($table) - 1);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the model instance
+	 *
+	 * @return object  Framework or compatible model
+	 */
+	public function getModel()
+	{
+		return $this->model;
+	}
+
+	/**
+	 * Returns the locale
+	 *
+	 * @return string
+	 */
+	public function getLocale(): string
+	{
+		return $this->locale;
+	}
+
+	/**
+	 * Returns the Faker generator
+	 *
+	 * @return Generator
+	 */
+	public function getFaker(): Generator
+	{
+		return $this->faker;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return and reset tempOverrides
+	 *
+	 * @return array
+	 */
+	public function getOverrides(): array
+	{
+		$overrides = $this->tempOverrides ?? $this->overrides;
+
+		$this->tempOverrides = $this->overrides;
+
+		return $overrides;
+	}
+
+	/**
+	 * Set the overrides, once or persistent
+	 *
+	 * @param array   $overrides Array of [field => value]
+	 * @param boolean $persist   Whether these overrides should persist through the next operation
+	 *
+	 * @return $this
+	 */
+	public function setOverrides(array $overrides = [], $persist = true): self
+	{
+		if ($persist)
+		{
+			$this->overrides = $overrides;
+		}
+
+		$this->tempOverrides = $overrides;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current formatters
+	 *
+	 * @return array|null
+	 */
+	public function getFormatters(): ?array
+	{
+		return $this->formatters;
+	}
+
+	/**
+	 * Set the formatters to use. Will attempt to autodetect if none are available.
+	 *
+	 * @param array|null $formatters Array of [field => formatter], or null to detect
+	 *
+	 * @return $this
+	 */
+	public function setFormatters(array $formatters = null): self
+	{
+		if (! is_null($formatters))
+		{
+			$this->formatters = $formatters;
+		}
+		elseif (method_exists($this->model, 'fake'))
+		{
+			$this->formatters = null;
+		}
+		else
+		{
+			$formatters = $this->detectFormatters();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Try to identify the appropriate Faker formatter for each field.
+	 *
+	 * @return $this
+	 */
+	protected function detectFormatters(): self
+	{
+		$this->formatters = [];
+
+		if (! empty($this->model->allowedFields))
+		{
+			foreach ($this->model->allowedFields as $field)
+			{
+				$this->formatters[$field] = $this->guessFormatter($field);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Guess at the correct formatter to match a field name.
+	 *
+	 * @param string $field Name of the field
+	 *
+	 * @return string  Name of the formatter
+	 */
+	protected function guessFormatter($field): string
+	{
+		// First check for a Faker formatter of the same name - covers things like "email"
+		try
+		{
+			$this->faker->getFormatter($field);
+			return $field;
+		}
+		catch (InvalidArgumentException $e)
+		{
+			// No match, keep going
+		}
+
+		// Next look for known model fields
+		if (in_array($field, $this->dateFields, true))
+		{
+			switch ($this->model->dateFormat)
+			{
+				case 'datetime':
+				case 'date':
+					return 'date';
+				case 'int':
+					return 'unixTime';
+			}
+		}
+		elseif ($field === $this->model->primaryKey)
+		{
+			return 'numberBetween';
+		}
+
+		// Check some common partials
+		foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term)
+		{
+			if (stripos($field, $term) !== false)
+			{
+				return $term;
+			}
+		}
+
+		if (stripos($field, 'phone') !== false)
+		{
+			return 'phoneNumber';
+		}
+
+		// Nothing left, use the default
+		return $this->defaultFormatter;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generate new entities with faked data
+	 *
+	 * @param integer|null $count Optional number to create a collection
+	 *
+	 * @return array|object  An array or object (based on returnType), or an array of returnTypes
+	 */
+	public function make(int $count = null)
+	{
+		// If a singleton was requested then go straight to it
+		if (is_null($count))
+		{
+			return $this->model->returnType === 'array'
+				? $this->makeArray()
+				: $this->makeObject();
+		}
+
+		$return = [];
+
+		for ($i = 0; $i < $count; $i++)
+		{
+			$return[] = $this->model->returnType === 'array'
+				? $this->makeArray()
+				: $this->makeObject();
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Generate an array of faked data
+	 *
+	 * @return array  An array of faked data
+	 *
+	 * @throws RuntimeException
+	 */
+	public function makeArray()
+	{
+		if (! is_null($this->formatters))
+		{
+			$result = [];
+
+			foreach ($this->formatters as $field => $formatter)
+			{
+				$result[$field] = $this->faker->{$formatter};
+			}
+		}
+		// If no formatters were defined then look for a model fake() method
+		elseif (method_exists($this->model, 'fake'))
+		{
+			$result = $this->model->fake($this->faker);
+
+			$result = is_object($result) && method_exists($result, 'toArray')
+				// This should cover entities
+				? $result->toArray()
+				// Try to cast it
+				: (array) $result;
+		}
+		// Nothing left to do but give up
+		else
+		{
+			throw new RuntimeException(lang('Fabricator.missingFormatters'));
+		}
+
+		// Replace overridden fields
+		return array_merge($result, $this->getOverrides());
+	}
+
+	/**
+	 * Generate an object of faked data
+	 *
+	 * @param string|null $className Class name of the object to create; null to use model default
+	 *
+	 * @return object  An instance of the class with faked data
+	 *
+	 * @throws RuntimeException
+	 */
+	public function makeObject(string $className = null): object
+	{
+		if (is_null($className))
+		{
+			if ($this->model->returnType === 'object' || $this->model->returnType === 'array')
+			{
+				$className = 'stdClass';
+			}
+			else
+			{
+				$className = $this->model->returnType;
+			}
+		}
+
+		// If using the model's fake() method then check it for the correct return type
+		if (is_null($this->formatters) && method_exists($this->model, 'fake'))
+		{
+			$result = $this->model->fake($this->faker);
+
+			if ($result instanceof $className)
+			{
+				// Set overrides manually
+				foreach ($this->getOverrides() as $key => $value)
+				{
+					$result->{$key} = $value;
+				}
+
+				return $result;
+			}
+		}
+
+		// Get the array values and apply them to the object
+		$array  = $this->makeArray();
+		$object = new $className();
+
+		// Check for the entity method
+		if (method_exists($object, 'fill'))
+		{
+			$object->fill($array);
+		}
+		else
+		{
+			foreach ($array as $key => $value)
+			{
+				$object->{$key} = $value;
+			}
+		}
+
+		return $object;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generate new entities from the database
+	 *
+	 * @param integer|null $count Optional number to create a collection
+	 * @param boolean      $mock  Whether to execute or mock the insertion
+	 *
+	 * @return array|object  An array or object (based on returnType), or an array of returnTypes
+	 *
+	 * @throws FrameworkException
+	 */
+	public function create(int $count = null, bool $mock = false)
+	{
+		// Intercept mock requests
+		if ($mock)
+		{
+			return $this->createMock($count);
+		}
+
+		$ids = [];
+
+		// Iterate over new entities and insert each one, storing insert IDs
+		foreach ($this->make($count ?? 1) as $result)
+		{
+			if ($id = $this->model->insert($result, true))
+			{
+				$ids[] = $id;
+				self::upCount($this->model->table);
+				continue;
+			}
+
+			throw FrameworkException::forFabricatorCreateFailed($this->model->table, implode(' ', $this->model->errors() ?? []));
+		}
+
+		// If the model defines a "withDeleted" method for handling soft deletes then use it
+		if (method_exists($this->model, 'withDeleted'))
+		{
+			$this->model->withDeleted();
+		}
+
+		return $this->model->find(is_null($count) ? reset($ids) : $ids);
+	}
+
+	/**
+	 * Generate new database entities without actually inserting them
+	 *
+	 * @param integer|null $count Optional number to create a collection
+	 *
+	 * @return array|object  An array or object (based on returnType), or an array of returnTypes
+	 */
+	protected function createMock(int $count = null)
+	{
+		switch ($this->model->dateFormat)
+		{
+			case 'datetime':
+				$datetime = date('Y-m-d H:i:s');
+			case 'date':
+				$datetime = date('Y-m-d');
+			default:
+				$datetime = time();
+		}
+
+		// Determine which fields we will need
+		$fields = [];
+
+		if (! empty($this->model->useTimestamps))
+		{
+			$fields[$this->model->createdField] = $datetime; // @phpstan-ignore-line
+			$fields[$this->model->updatedField] = $datetime; // @phpstan-ignore-line
+		}
+
+		if (! empty($this->model->useSoftDeletes))
+		{
+			$fields[$this->model->deletedField] = null; // @phpstan-ignore-line
+		}
+
+		// Iterate over new entities and add the necessary fields
+		$return = [];
+		foreach ($this->make($count ?? 1) as $i => $result)
+		{
+			// Set the ID
+			$fields[$this->model->primaryKey] = $i;
+
+			// Merge fields
+			if (is_array($result))
+			{
+				$result = array_merge($result, $fields);
+			}
+			else
+			{
+				foreach ($fields as $key => $value)
+				{
+					$result->{$key} = $value;
+				}
+			}
+
+			$return[] = $result;
+		}
+
+		return is_null($count) ? reset($return) : $return;
+	}
+}
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
new file mode 100644
index 0000000..488e114
--- /dev/null
+++ b/system/Test/FeatureResponse.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+/**
+ * Assertions for a response
+ *
+ * @deprecated Use TestResponse directly
+ */
+class FeatureResponse extends TestResponse
+{
+	/**
+	 * @deprecated Will be protected in a future release, use response() instead
+	 */
+	public $response;
+}
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
new file mode 100644
index 0000000..d1f648c
--- /dev/null
+++ b/system/Test/FeatureTestCase.php
@@ -0,0 +1,439 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Router\Exceptions\RedirectException;
+use CodeIgniter\Router\RouteCollection;
+use Config\App;
+use Config\Services;
+use Exception;
+use ReflectionException;
+
+/**
+ * Class FeatureTestCase
+ *
+ * Provides a base class with the trait for doing full HTTP testing
+ * against your application.
+ *
+ * @deprecated Use FeatureTestTrait instead
+ *
+ * @codeCoverageIgnore
+ */
+class FeatureTestCase extends CIUnitTestCase
+{
+	use DatabaseTestTrait;
+
+	/**
+	 * Sets a RouteCollection that will override
+	 * the application's route collection.
+	 *
+	 * Example routes:
+	 * [
+	 *    ['get', 'home', 'Home::index']
+	 * ]
+	 *
+	 * @param array $routes
+	 *
+	 * @return $this
+	 */
+	protected function withRoutes(array $routes = null)
+	{
+		$collection = Services::routes();
+
+		if ($routes)
+		{
+			$collection->resetRoutes();
+			foreach ($routes as $route)
+			{
+				$collection->{$route[0]}($route[1], $route[2]);
+			}
+		}
+
+		$this->routes = $collection;
+
+		return $this;
+	}
+
+	/**
+	 * Sets any values that should exist during this session.
+	 *
+	 * @param array|null $values Array of values, or null to use the current $_SESSION
+	 *
+	 * @return $this
+	 */
+	public function withSession(array $values = null)
+	{
+		$this->session = is_null($values) ? $_SESSION : $values;
+
+		return $this;
+	}
+
+	/**
+	 * Set request's headers
+	 *
+	 * Example of use
+	 * withHeaders([
+	 *  'Authorization' => 'Token'
+	 * ])
+	 *
+	 * @param array $headers Array of headers
+	 *
+	 * @return $this
+	 */
+	public function withHeaders(array $headers = [])
+	{
+		$this->headers = $headers;
+
+		return $this;
+	}
+
+	/**
+	 * Set the format the request's body should have.
+	 *
+	 * @param  string $format The desired format. Currently supported formats: xml, json
+	 * @return $this
+	 */
+	public function withBodyFormat(string $format)
+	{
+		$this->bodyFormat = $format;
+
+		return $this;
+	}
+
+	/**
+	 * Set the raw body for the request
+	 *
+	 * @param  mixed $body
+	 * @return $this
+	 */
+	public function withBody($body)
+	{
+		$this->requestBody = $body;
+
+		return $this;
+	}
+
+	/**
+	 * Don't run any events while running this test.
+	 *
+	 * @return $this
+	 */
+	public function skipEvents()
+	{
+		Events::simulate(true);
+
+		return $this;
+	}
+
+	/**
+	 * Calls a single URI, executes it, and returns a FeatureResponse
+	 * instance that can be used to run many assertions against.
+	 *
+	 * @param string     $method
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function call(string $method, string $path, array $params = null)
+	{
+		$buffer = \ob_get_level();
+
+		// Clean up any open output buffers
+		// not relevant to unit testing
+		// @codeCoverageIgnoreStart
+		if (\ob_get_level() > 0 && (! isset($this->clean) || $this->clean === true))
+		{
+			\ob_end_clean();
+		}
+		// @codeCoverageIgnoreEnd
+
+		// Simulate having a blank session
+		$_SESSION                  = [];
+		$_SERVER['REQUEST_METHOD'] = $method;
+
+		$request = $this->setupRequest($method, $path);
+		$request = $this->setupHeaders($request);
+		$request = $this->populateGlobals($method, $request, $params);
+		$request = $this->setRequestBody($request);
+
+		// Initialize the RouteCollection
+		if (! $routes = $this->routes)
+		{
+			require APPPATH . 'Config/Routes.php';
+
+			/**
+			 * @var RouteCollection $routes
+			 */
+			$routes->getRoutes('*');
+		}
+
+		$routes->setHTTPVerb($method);
+
+		// Make sure any other classes that might call the request
+		// instance get the right one.
+		Services::injectMock('request', $request);
+
+		// Make sure filters are reset between tests
+		Services::injectMock('filters', Services::filters(null, false));
+
+		$response = $this->app
+				->setRequest($request)
+				->run($routes, true);
+
+		$output = \ob_get_contents();
+		if (empty($response->getBody()) && ! empty($output))
+		{
+			$response->setBody($output);
+		}
+
+		// Reset directory if it has been set
+		Services::router()->setDirectory(null);
+
+		// Ensure the output buffer is identical so no tests are risky
+		// @codeCoverageIgnoreStart
+		while (\ob_get_level() > $buffer)
+		{
+			\ob_end_clean();
+		}
+		while (\ob_get_level() < $buffer)
+		{
+			\ob_start();
+		}
+		// @codeCoverageIgnoreEnd
+
+		return new FeatureResponse($response);
+	}
+
+	/**
+	 * Performs a GET request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function get(string $path, array $params = null)
+	{
+		return $this->call('get', $path, $params);
+	}
+
+	/**
+	 * Performs a POST request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function post(string $path, array $params = null)
+	{
+		return $this->call('post', $path, $params);
+	}
+
+	/**
+	 * Performs a PUT request
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function put(string $path, array $params = null)
+	{
+		return $this->call('put', $path, $params);
+	}
+
+	/**
+	 * Performss a PATCH request
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function patch(string $path, array $params = null)
+	{
+		return $this->call('patch', $path, $params);
+	}
+
+	/**
+	 * Performs a DELETE request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function delete(string $path, array $params = null)
+	{
+		return $this->call('delete', $path, $params);
+	}
+
+	/**
+	 * Performs an OPTIONS request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function options(string $path, array $params = null)
+	{
+		return $this->call('options', $path, $params);
+	}
+
+	/**
+	 * Setup a Request object to use so that CodeIgniter
+	 * won't try to auto-populate some of the items.
+	 *
+	 * @param string      $method
+	 * @param string|null $path
+	 *
+	 * @return IncomingRequest
+	 */
+	protected function setupRequest(string $method, string $path = null): IncomingRequest
+	{
+		$config = config(App::class);
+		$uri    = new URI(rtrim($config->baseURL, '/') . '/' . trim($path, '/ '));
+
+		$request      = new IncomingRequest($config, clone($uri), null, new UserAgent());
+		$request->uri = $uri;
+
+		$request->setMethod($method);
+		$request->setProtocolVersion('1.1');
+
+		if ($config->forceGlobalSecureRequests)
+		{
+			$_SERVER['HTTPS'] = 'test';
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Setup the custom request's headers
+	 *
+	 * @param IncomingRequest $request
+	 *
+	 * @return IncomingRequest
+	 */
+	protected function setupHeaders(IncomingRequest $request)
+	{
+		if (! empty($this->headers))
+		{
+			foreach ($this->headers as $name => $value)
+			{
+				$request->setHeader($name, $value);
+			}
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Populates the data of our Request with "global" data
+	 * relevant to the request, like $_POST data.
+	 *
+	 * Always populate the GET vars based on the URI.
+	 *
+	 * @param string     $method
+	 * @param Request    $request
+	 * @param array|null $params
+	 *
+	 * @return Request
+	 * @throws ReflectionException
+	 */
+	protected function populateGlobals(string $method, Request $request, array $params = null)
+	{
+		// $params should set the query vars if present,
+		// otherwise set it from the URL.
+		$get = ! empty($params) && $method === 'get'
+			? $params
+			: $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
+
+		$request->setGlobal('get', $get);
+		if ($method !== 'get')
+		{
+			$request->setGlobal($method, $params);
+		}
+
+		$request->setGlobal('request', $params);
+
+		$_SESSION = $this->session ?? [];
+
+		return $request;
+	}
+
+	/**
+	 * Set the request's body formatted according to the value in $this->bodyFormat.
+	 * This allows the body to be formatted in a way that the controller is going to
+	 * expect as in the case of testing a JSON or XML API.
+	 *
+	 * @param  Request    $request
+	 * @param  null|array $params  The parameters to be formatted and put in the body. If this is empty, it will get the
+	 *                               what has been loaded into the request global of the request class.
+	 * @return Request
+	 */
+	protected function setRequestBody(Request $request, array $params = null): Request
+	{
+		if (isset($this->requestBody) && $this->requestBody !== '')
+		{
+			$request->setBody($this->requestBody);
+			return $request;
+		}
+
+		if (isset($this->bodyFormat) && $this->bodyFormat !== '')
+		{
+			if (empty($params))
+			{
+				$params = $request->fetchGlobal('request');
+			}
+			$formatMime = '';
+			if ($this->bodyFormat === 'json')
+			{
+				$formatMime = 'application/json';
+			}
+			elseif ($this->bodyFormat === 'xml')
+			{
+				$formatMime = 'application/xml';
+			}
+			if (! empty($formatMime) && ! empty($params))
+			{
+				$formatted = Services::format()->getFormatter($formatMime)->format($params);
+				$request->setBody($formatted);
+				$request->setHeader('Content-Type', $formatMime);
+			}
+		}
+
+		return $request;
+	}
+}
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
new file mode 100644
index 0000000..51f5b41
--- /dev/null
+++ b/system/Test/FeatureTestTrait.php
@@ -0,0 +1,436 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Router\Exceptions\RedirectException;
+use CodeIgniter\Router\RouteCollection;
+use Config\App;
+use Config\Services;
+use Exception;
+use ReflectionException;
+
+/**
+ * Trait FeatureTestTrait
+ *
+ * Provides additional utilities for doing full HTTP testing
+ * against your application in trait format.
+ */
+trait FeatureTestTrait
+{
+	/**
+	 * Sets a RouteCollection that will override
+	 * the application's route collection.
+	 *
+	 * Example routes:
+	 * [
+	 *    ['get', 'home', 'Home::index']
+	 * ]
+	 *
+	 * @param array $routes
+	 *
+	 * @return $this
+	 */
+	protected function withRoutes(array $routes = null)
+	{
+		$collection = Services::routes();
+
+		if ($routes)
+		{
+			$collection->resetRoutes();
+			foreach ($routes as $route)
+			{
+				$collection->{$route[0]}($route[1], $route[2]);
+			}
+		}
+
+		$this->routes = $collection;
+
+		return $this;
+	}
+
+	/**
+	 * Sets any values that should exist during this session.
+	 *
+	 * @param array|null $values Array of values, or null to use the current $_SESSION
+	 *
+	 * @return $this
+	 */
+	public function withSession(array $values = null)
+	{
+		$this->session = is_null($values) ? $_SESSION : $values;
+
+		return $this;
+	}
+
+	/**
+	 * Set request's headers
+	 *
+	 * Example of use
+	 * withHeaders([
+	 *  'Authorization' => 'Token'
+	 * ])
+	 *
+	 * @param array $headers Array of headers
+	 *
+	 * @return $this
+	 */
+	public function withHeaders(array $headers = [])
+	{
+		$this->headers = $headers;
+
+		return $this;
+	}
+
+	/**
+	 * Set the format the request's body should have.
+	 *
+	 * @param  string $format The desired format. Currently supported formats: xml, json
+	 * @return $this
+	 */
+	public function withBodyFormat(string $format)
+	{
+		$this->bodyFormat = $format;
+
+		return $this;
+	}
+
+	/**
+	 * Set the raw body for the request
+	 *
+	 * @param  mixed $body
+	 * @return $this
+	 */
+	public function withBody($body)
+	{
+		$this->requestBody = $body;
+
+		return $this;
+	}
+
+	/**
+	 * Don't run any events while running this test.
+	 *
+	 * @return $this
+	 */
+	public function skipEvents()
+	{
+		Events::simulate(true);
+
+		return $this;
+	}
+
+	/**
+	 * Calls a single URI, executes it, and returns a TestResponse
+	 * instance that can be used to run many assertions against.
+	 *
+	 * @param string     $method
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function call(string $method, string $path, array $params = null)
+	{
+		$buffer = \ob_get_level();
+
+		// Clean up any open output buffers
+		// not relevant to unit testing
+		// @codeCoverageIgnoreStart
+		if (\ob_get_level() > 0 && (! isset($this->clean) || $this->clean === true))
+		{
+			\ob_end_clean();
+		}
+		// @codeCoverageIgnoreEnd
+
+		// Simulate having a blank session
+		$_SESSION                  = [];
+		$_SERVER['REQUEST_METHOD'] = $method;
+
+		$request = $this->setupRequest($method, $path);
+		$request = $this->setupHeaders($request);
+		$request = $this->populateGlobals($method, $request, $params);
+		$request = $this->setRequestBody($request);
+
+		// Initialize the RouteCollection
+		if (! $routes = $this->routes)
+		{
+			require APPPATH . 'Config/Routes.php';
+
+			/**
+			 * @var RouteCollection $routes
+			 */
+			$routes->getRoutes('*');
+		}
+
+		$routes->setHTTPVerb($method);
+
+		// Make sure any other classes that might call the request
+		// instance get the right one.
+		Services::injectMock('request', $request);
+
+		// Make sure filters are reset between tests
+		Services::injectMock('filters', Services::filters(null, false));
+
+		$response = $this->app
+				->setRequest($request)
+				->run($routes, true);
+
+		$output = \ob_get_contents();
+		if (empty($response->getBody()) && ! empty($output))
+		{
+			$response->setBody($output);
+		}
+
+		// Reset directory if it has been set
+		Services::router()->setDirectory(null);
+
+		// Ensure the output buffer is identical so no tests are risky
+		// @codeCoverageIgnoreStart
+		while (\ob_get_level() > $buffer)
+		{
+			\ob_end_clean();
+		}
+		while (\ob_get_level() < $buffer)
+		{
+			\ob_start();
+		}
+		// @codeCoverageIgnoreEnd
+
+		return new TestResponse($response);
+	}
+
+	/**
+	 * Performs a GET request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function get(string $path, array $params = null)
+	{
+		return $this->call('get', $path, $params);
+	}
+
+	/**
+	 * Performs a POST request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function post(string $path, array $params = null)
+	{
+		return $this->call('post', $path, $params);
+	}
+
+	/**
+	 * Performs a PUT request
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function put(string $path, array $params = null)
+	{
+		return $this->call('put', $path, $params);
+	}
+
+	/**
+	 * Performss a PATCH request
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function patch(string $path, array $params = null)
+	{
+		return $this->call('patch', $path, $params);
+	}
+
+	/**
+	 * Performs a DELETE request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function delete(string $path, array $params = null)
+	{
+		return $this->call('delete', $path, $params);
+	}
+
+	/**
+	 * Performs an OPTIONS request.
+	 *
+	 * @param string     $path
+	 * @param array|null $params
+	 *
+	 * @return TestResponse
+	 * @throws RedirectException
+	 * @throws Exception
+	 */
+	public function options(string $path, array $params = null)
+	{
+		return $this->call('options', $path, $params);
+	}
+
+	/**
+	 * Setup a Request object to use so that CodeIgniter
+	 * won't try to auto-populate some of the items.
+	 *
+	 * @param string      $method
+	 * @param string|null $path
+	 *
+	 * @return IncomingRequest
+	 */
+	protected function setupRequest(string $method, string $path = null): IncomingRequest
+	{
+		$path    = URI::removeDotSegments($path);
+		$config  = config(App::class);
+		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+		// $path may have a query in it
+		$parts                   = explode('?', $path);
+		$_SERVER['QUERY_STRING'] = $parts[1] ?? '';
+
+		$request->setPath($parts[0]);
+		$request->setMethod($method);
+		$request->setProtocolVersion('1.1');
+
+		if ($config->forceGlobalSecureRequests)
+		{
+			$_SERVER['HTTPS'] = 'test';
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Setup the custom request's headers
+	 *
+	 * @param IncomingRequest $request
+	 *
+	 * @return IncomingRequest
+	 */
+	protected function setupHeaders(IncomingRequest $request)
+	{
+		if (! empty($this->headers))
+		{
+			foreach ($this->headers as $name => $value)
+			{
+				$request->setHeader($name, $value);
+			}
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Populates the data of our Request with "global" data
+	 * relevant to the request, like $_POST data.
+	 *
+	 * Always populate the GET vars based on the URI.
+	 *
+	 * @param string     $method
+	 * @param Request    $request
+	 * @param array|null $params
+	 *
+	 * @return Request
+	 * @throws ReflectionException
+	 */
+	protected function populateGlobals(string $method, Request $request, array $params = null)
+	{
+		// $params should set the query vars if present,
+		// otherwise set it from the URL.
+		$get = ! empty($params) && $method === 'get'
+			? $params
+			: $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
+
+		$request->setGlobal('get', $get);
+		if ($method !== 'get')
+		{
+			$request->setGlobal($method, $params);
+		}
+
+		$request->setGlobal('request', $params);
+
+		$_SESSION = $this->session ?? [];
+
+		return $request;
+	}
+
+	/**
+	 * Set the request's body formatted according to the value in $this->bodyFormat.
+	 * This allows the body to be formatted in a way that the controller is going to
+	 * expect as in the case of testing a JSON or XML API.
+	 *
+	 * @param  Request    $request
+	 * @param  null|array $params  The parameters to be formatted and put in the body. If this is empty, it will get the
+	 *                               what has been loaded into the request global of the request class.
+	 * @return Request
+	 */
+	protected function setRequestBody(Request $request, array $params = null): Request
+	{
+		if (isset($this->requestBody) && $this->requestBody !== '')
+		{
+			$request->setBody($this->requestBody);
+			return $request;
+		}
+
+		if (isset($this->bodyFormat) && $this->bodyFormat !== '')
+		{
+			if (empty($params))
+			{
+				$params = $request->fetchGlobal('request');
+			}
+			$formatMime = '';
+			if ($this->bodyFormat === 'json')
+			{
+				$formatMime = 'application/json';
+			}
+			elseif ($this->bodyFormat === 'xml')
+			{
+				$formatMime = 'application/xml';
+			}
+			if (! empty($formatMime) && ! empty($params))
+			{
+				$formatted = Services::format()->getFormatter($formatMime)->format($params);
+				$request->setBody($formatted);
+				$request->setHeader('Content-Type', $formatMime);
+			}
+		}
+
+		return $request;
+	}
+}
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
new file mode 100644
index 0000000..4b1dc4d
--- /dev/null
+++ b/system/Test/FilterTestTrait.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use Closure;
+use CodeIgniter\Filters\Exceptions\FilterException;
+use CodeIgniter\Filters\Filters;
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Router\RouteCollection;
+use Config\Filters as FiltersConfig;
+use Config\Services;
+use InvalidArgumentException;
+use RuntimeException;
+
+/**
+ * Filter Test Trait
+ *
+ * Provides functionality for testing
+ * filters and their route associations.
+ *
+ * @mixin CIUnitTestCase
+ */
+trait FilterTestTrait
+{
+	/**
+	 * Have the one-time classes been instantiated?
+	 *
+	 * @var boolean
+	 */
+	private $doneFilterSetUp = false;
+
+	/**
+	 * The active IncomingRequest or CLIRequest
+	 *
+	 * @var RequestInterface
+	 */
+	protected $request;
+
+	/**
+	 * The active Response instance
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
+
+	/**
+	 * The Filters configuration to use.
+	 * Extracted for access to aliases
+	 * during Filters::discoverFilters().
+	 *
+	 * @var FiltersConfig|null
+	 */
+	protected $filtersConfig;
+
+	/**
+	 * The prepared Filters library.
+	 *
+	 * @var Filters|null
+	 */
+	protected $filters;
+
+	/**
+	 * The default App and discovered
+	 * routes to check for filters.
+	 *
+	 * @var RouteCollection|null
+	 */
+	protected $collection;
+
+	//--------------------------------------------------------------------
+	// Staging
+	//--------------------------------------------------------------------
+
+	/**
+	 * Initializes dependencies once.
+	 *
+	 * @return void
+	 */
+	protected function setUpFilterTestTrait(): void
+	{
+		if ($this->doneFilterSetUp === true)
+		{
+			return;
+		}
+
+		// Create our own Request and Response so we can
+		// use the same ones for Filters and FilterInterface
+		// yet isolate them from outside influence
+		$this->request  = $this->request ?? clone Services::request();
+		$this->response = $this->response ?? clone Services::response();
+
+		// Create our config and Filters instance to reuse for performance
+		$this->filtersConfig = $this->filtersConfig ?? config('Filters');
+		$this->filters       = $this->filters ?? new Filters($this->filtersConfig, $this->request, $this->response);
+
+		if (is_null($this->collection))
+		{
+			// Load the RouteCollection from Config to gather App route info
+			// (creates $routes using the Service as a starting point)
+			require APPPATH . 'Config/Routes.php';
+
+			$routes->getRoutes('*'); // Triggers discovery
+			$this->collection = $routes;
+		}
+
+		$this->doneFilterSetUp = true;
+	}
+
+	//--------------------------------------------------------------------
+	// Utility
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a callable method for a filter position
+	 * using the local HTTP instances.
+	 *
+	 * @param FilterInterface|string $filter   The filter instance, class, or alias
+	 * @param string                 $position "before" or "after"
+	 *
+	 * @return Closure
+	 */
+	protected function getFilterCaller($filter, string $position): Closure
+	{
+		if (! in_array($position, ['before', 'after'], true))
+		{
+			throw new InvalidArgumentException('Invalid filter position passed: ' . $position);
+		}
+
+		if (is_string($filter))
+		{
+			// Check for an alias (no namespace)
+			if (strpos($filter, '\\') === false)
+			{
+				if (! isset($this->filtersConfig->aliases[$filter]))
+				{
+					throw new RuntimeException("No filter found with alias '{$filter}'");
+				}
+
+				$filter = $this->filtersConfig->aliases[$filter];
+			}
+
+			// Get an instance
+			$filter = new $filter();
+		}
+
+		if (! $filter instanceof FilterInterface)
+		{
+			throw FilterException::forIncorrectInterface(get_class($filter));
+		}
+
+		$request = clone $this->request;
+
+		if ($position === 'before')
+		{
+			return function (array $params = null) use ($filter, $request) {
+				return $filter->before($request, $params);
+			};
+		}
+
+		$response = clone $this->response;
+
+		return function (array $params = null) use ($filter, $request, $response) {
+			return $filter->after($request, $response, $params);
+		};
+	}
+
+	/**
+	 * Gets an array of filter aliases enabled
+	 * for the given route at position.
+	 *
+	 * @param string $route    The route to test
+	 * @param string $position "before" or "after"
+	 *
+	 * @return string[] The filter aliases
+	 */
+	protected function getFiltersForRoute(string $route, string $position): array
+	{
+		if (! in_array($position, ['before', 'after'], true))
+		{
+			throw new InvalidArgumentException('Invalid filter position passed:' . $position);
+		}
+
+		$this->filters->reset();
+
+		if ($routeFilter = $this->collection->getFilterForRoute($route))
+		{
+			$this->filters->enableFilter($routeFilter, $position);
+		}
+
+		$aliases = $this->filters->initialize($route)->getFilters();
+
+		$this->filters->reset();
+		return $aliases[$position];
+	}
+
+	//--------------------------------------------------------------------
+	// Assertions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that the given route at position uses
+	 * the filter (by its alias).
+	 *
+	 * @param string $route    The route to test
+	 * @param string $position "before" or "after"
+	 * @param string $alias    Alias for the anticipated filter
+	 *
+	 * @return void
+	 */
+	protected function assertFilter(string $route, string $position, string $alias): void
+	{
+		$filters = $this->getFiltersForRoute($route, $position);
+
+		$this->assertContains(
+			$alias,
+			$filters,
+			"Filter '{$alias}' does not apply to '{$route}'.",
+		);
+	}
+
+	/**
+	 * Asserts that the given route at position does not
+	 * use the filter (by its alias).
+	 *
+	 * @param string $route    The route to test
+	 * @param string $position "before" or "after"
+	 * @param string $alias    Alias for the anticipated filter
+	 *
+	 * @return void
+	 */
+	protected function assertNotFilter(string $route, string $position, string $alias)
+	{
+		$filters = $this->getFiltersForRoute($route, $position);
+
+		$this->assertNotContains(
+			$alias,
+			$filters,
+			"Filter '{$alias}' applies to '{$route}' when it should not.",
+		);
+	}
+
+	/**
+	 * Asserts that the given route at position has
+	 * at least one filter set.
+	 *
+	 * @param string $route    The route to test
+	 * @param string $position "before" or "after"
+	 *
+	 * @return void
+	 */
+	protected function assertHasFilters(string $route, string $position)
+	{
+		$filters = $this->getFiltersForRoute($route, $position);
+
+		$this->assertNotEmpty(
+			$filters,
+			"No filters found for '{$route}' when at least one was expected.",
+		);
+	}
+
+	/**
+	 * Asserts that the given route at position has
+	 * no filters set.
+	 *
+	 * @param string $route    The route to test
+	 * @param string $position "before" or "after"
+	 *
+	 * @return void
+	 */
+	protected function assertNotHasFilters(string $route, string $position)
+	{
+		$filters = $this->getFiltersForRoute($route, $position);
+
+		$this->assertSame(
+			[],
+			$filters,
+			"Found filters for '{$route}' when none were expected: " . implode(', ', $filters) . '.',
+		);
+	}
+}
diff --git a/system/Test/Filters/CITestStreamFilter.php b/system/Test/Filters/CITestStreamFilter.php
new file mode 100644
index 0000000..f293e0a
--- /dev/null
+++ b/system/Test/Filters/CITestStreamFilter.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Filters;
+
+use php_user_filter;
+
+/**
+ * Class to extract an output snapshot.
+ * Used to capture output during unit testing, so that it can
+ * be used in assertions.
+ */
+class CITestStreamFilter extends php_user_filter
+{
+	/**
+	 * Buffer to capture stream content.
+	 *
+	 * @var string
+	 */
+	public static $buffer = '';
+
+	/**
+	 * Output filtering - catch it all.
+	 *
+	 * @param resource $in
+	 * @param resource $out
+	 * @param integer  $consumed
+	 * @param boolean  $closing
+	 *
+	 * @return integer
+	 */
+	public function filter($in, $out, &$consumed, $closing)
+	{
+		while ($bucket = stream_bucket_make_writeable($in))
+		{
+			static::$buffer .= $bucket->data;
+
+			$consumed += $bucket->datalen;
+		}
+
+		// @phpstan-ignore-next-line
+		return PSFS_PASS_ON;
+	}
+}
+
+// @codeCoverageIgnoreStart
+stream_filter_register('CITestStreamFilter', 'CodeIgniter\Test\Filters\CITestStreamFilter');
+// @codeCoverageIgnoreEnd
diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php
new file mode 100644
index 0000000..e383eb0
--- /dev/null
+++ b/system/Test/Interfaces/FabricatorModel.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Interfaces;
+
+use Faker\Generator;
+use ReflectionException;
+
+/**
+ * FabricatorModel
+ *
+ * An interface defining the required methods and properties
+ * needed for a model to qualify for use with the Fabricator class.
+ * While interfaces cannot enforce properties, the following
+ * are required for use with Fabricator:
+ *
+ * @property string $returnType
+ * @property string $primaryKey
+ * @property string $dateFormat
+ */
+interface FabricatorModel
+{
+	/**
+	 * Fetches the row of database from $this->table with a primary key
+	 * matching $id.
+	 *
+	 * @param mixed|array|null $id One primary key or an array of primary keys
+	 *
+	 * @return array|object|null    The resulting row of data, or null.
+	 */
+	public function find($id = null);
+
+	/**
+	 * Inserts data into the current table. If an object is provided,
+	 * it will attempt to convert it to an array.
+	 *
+	 * @param array|object $data
+	 * @param boolean      $returnID Whether insert ID should be returned or not.
+	 *
+	 * @return integer|string|boolean
+	 * @throws ReflectionException
+	 */
+	public function insert($data = null, bool $returnID = true);
+
+	/**
+	 * The following properties and methods are optional, but if present should
+	 * adhere to their definitions.
+	 *
+	 * @property array  $allowedFields
+	 * @property string $useSoftDeletes
+	 * @property string $useTimestamps
+	 * @property string $createdField
+	 * @property string $updatedField
+	 * @property string $deletedField
+	 */
+
+	/*
+	 * Sets $useSoftDeletes value so that we can temporarily override
+	 * the softdeletes settings. Can be used for all find* methods.
+	 *
+	 * @param boolean $val
+	 *
+	 * @return Model
+	 */
+	// public function withDeleted($val = true);
+
+	/**
+	 * Faked data for Fabricator.
+	 *
+	 * @param Generator $faker
+	 *
+	 * @return array|object
+	 */
+	// public function fake(Generator &$faker);
+}
diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php
new file mode 100644
index 0000000..d461fbe
--- /dev/null
+++ b/system/Test/Mock/MockAppConfig.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use Config\App;
+
+class MockAppConfig extends App
+{
+	public $baseURL = 'http://example.com/';
+
+	public $uriProtocol = 'REQUEST_URI';
+
+	public $cookiePrefix   = '';
+	public $cookieDomain   = '';
+	public $cookiePath     = '/';
+	public $cookieSecure   = false;
+	public $cookieHTTPOnly = false;
+	public $cookieSameSite = 'Lax';
+
+	public $proxyIPs = '';
+
+	public $CSRFProtection  = false;
+	public $CSRFTokenName   = 'csrf_test_name';
+	public $CSRFHeaderName  = 'X-CSRF-TOKEN';
+	public $CSRFCookieName  = 'csrf_cookie_name';
+	public $CSRFExpire      = 7200;
+	public $CSRFRegenerate  = true;
+	public $CSRFExcludeURIs = ['http://example.com'];
+	public $CSRFRedirect    = false;
+	public $CSRFSameSite    = 'Lax';
+
+	public $CSPEnabled = false;
+
+	public $defaultLocale    = 'en';
+	public $negotiateLocale  = false;
+	public $supportedLocales = [
+		'en',
+		'es',
+	];
+}
diff --git a/system/Test/Mock/MockAutoload.php b/system/Test/Mock/MockAutoload.php
new file mode 100644
index 0000000..dfc3fe3
--- /dev/null
+++ b/system/Test/Mock/MockAutoload.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use Config\Autoload;
+
+class MockAutoload extends Autoload
+{
+	public $psr4 = [];
+
+	public $classmap = [];
+
+	public function __construct()
+	{
+		// Don't call the parent since we don't want the default mappings.
+		// parent::__construct();
+	}
+}
diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
new file mode 100644
index 0000000..db0242c
--- /dev/null
+++ b/system/Test/Mock/MockBuilder.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\ConnectionInterface;
+
+class MockBuilder extends BaseBuilder
+{
+	public function __construct($tableName, ConnectionInterface &$db, array $options = null)
+	{
+		parent::__construct($tableName, $db, $options);
+	}
+}
diff --git a/system/Test/Mock/MockCLIConfig.php b/system/Test/Mock/MockCLIConfig.php
new file mode 100644
index 0000000..edb0739
--- /dev/null
+++ b/system/Test/Mock/MockCLIConfig.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use Config\App;
+
+class MockCLIConfig extends App
+{
+	public $baseURL = 'http://example.com/';
+
+	public $uriProtocol = 'REQUEST_URI';
+
+	public $cookiePrefix   = '';
+	public $cookieDomain   = '';
+	public $cookiePath     = '/';
+	public $cookieSecure   = false;
+	public $cookieHTTPOnly = false;
+	public $cookieSameSite = 'Lax';
+
+	public $proxyIPs = '';
+
+	public $CSRFProtection  = false;
+	public $CSRFTokenName   = 'csrf_test_name';
+	public $CSRFCookieName  = 'csrf_cookie_name';
+	public $CSRFExpire      = 7200;
+	public $CSRFRegenerate  = true;
+	public $CSRFExcludeURIs = ['http://example.com'];
+	public $CSRFSameSite    = 'Lax';
+
+	public $CSPEnabled = false;
+
+	public $defaultLocale    = 'en';
+	public $negotiateLocale  = false;
+	public $supportedLocales = [
+		'en',
+		'es',
+	];
+}
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
new file mode 100644
index 0000000..4c3ccdf
--- /dev/null
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\HTTP\CURLRequest;
+
+/**
+ * Class MockCURLRequest
+ *
+ * Simply allows us to not actually call cURL during the
+ * test runs. Instead, we can set the desired output
+ * and get back the set options.
+ */
+class MockCURLRequest extends CURLRequest
+{
+	public $curl_options;
+
+	protected $output = '';
+
+	//--------------------------------------------------------------------
+
+	public function setOutput($output)
+	{
+		$this->output = $output;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	protected function sendRequest(array $curlOptions = []): string
+	{
+		// Save so we can access later.
+		$this->curl_options = $curlOptions;
+
+		return $this->output;
+	}
+
+	//--------------------------------------------------------------------
+	// for testing purposes only
+	public function getBaseURI()
+	{
+		return $this->baseURI;
+	}
+
+	// for testing purposes only
+	public function getDelay()
+	{
+		return $this->delay;
+	}
+}
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
new file mode 100644
index 0000000..f4fb1a9
--- /dev/null
+++ b/system/Test/Mock/MockCache.php
@@ -0,0 +1,289 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\Cache\Handlers\BaseHandler;
+use Closure;
+
+class MockCache extends BaseHandler implements CacheInterface
+{
+	/**
+	 * Mock cache storage.
+	 *
+	 * @var array
+	 */
+	protected $cache = [];
+
+	/**
+	 * Expiration times.
+	 *
+	 * @var ?int[]
+	 */
+	protected $expirations = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes care of any handler-specific setup that must be done.
+	 */
+	public function initialize()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to fetch an item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return mixed
+	 */
+	public function get(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		return array_key_exists($key, $this->cache)
+			? $this->cache[$key]
+			: null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Get an item from the cache, or execute the given Closure and store the result.
+	 *
+	 * @param string  $key      Cache item name
+	 * @param integer $ttl      Time to live
+	 * @param Closure $callback Callback return value
+	 *
+	 * @return mixed
+	 */
+	public function remember(string $key, int $ttl, Closure $callback)
+	{
+		$value = $this->get($key);
+
+		if (! is_null($value))
+		{
+			return $value;
+		}
+
+		$this->save($key, $value = $callback(), $ttl);
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Saves an item to the cache store.
+	 *
+	 * The $raw parameter is only utilized by Mamcache in order to
+	 * allow usage of increment() and decrement().
+	 *
+	 * @param string  $key   Cache item name
+	 * @param mixed   $value the data to save
+	 * @param integer $ttl   Time To Live, in seconds (default 60)
+	 * @param boolean $raw   Whether to store the raw value.
+	 *
+	 * @return boolean
+	 */
+	public function save(string $key, $value, int $ttl = 60, bool $raw = false)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		$this->cache[$key]       = $value;
+		$this->expirations[$key] = $ttl > 0 ? time() + $ttl : null;
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a specific item from the cache store.
+	 *
+	 * @param string $key Cache item name
+	 *
+	 * @return boolean
+	 */
+	public function delete(string $key)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		if (! isset($this->cache[$key]))
+		{
+			return false;
+		}
+
+		unset($this->cache[$key]);
+		unset($this->expirations[$key]);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes items from the cache store matching a given pattern.
+	 *
+	 * @param string $pattern Cache items glob-style pattern
+	 *
+	 * @return integer
+	 */
+	public function deleteMatching(string $pattern)
+	{
+		$count = 0;
+		foreach (array_keys($this->cache) as $key)
+		{
+			if (fnmatch($pattern, $key))
+			{
+				$count++;
+				unset($this->cache[$key]);
+				unset($this->expirations[$key]);
+			}
+		}
+
+		return $count;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic incrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return boolean
+	 */
+	public function increment(string $key, int $offset = 1)
+	{
+		$key  = static::validateKey($key, $this->prefix);
+		$data = $this->cache[$key] ?: null;
+
+		if (empty($data))
+		{
+			$data = 0;
+		}
+		elseif (! is_int($data))
+		{
+			return false;
+		}
+
+		return $this->save($key, $data + $offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs atomic decrementation of a raw stored value.
+	 *
+	 * @param string  $key    Cache ID
+	 * @param integer $offset Step/value to increase by
+	 *
+	 * @return boolean
+	 */
+	public function decrement(string $key, int $offset = 1)
+	{
+		$key = static::validateKey($key, $this->prefix);
+
+		$data = $this->cache[$key] ?: null;
+
+		if (empty($data))
+		{
+			$data = 0;
+		}
+		elseif (! is_int($data))
+		{
+			return false;
+		}
+
+		return $this->save($key, $data - $offset);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Will delete all items in the entire cache.
+	 *
+	 * @return boolean
+	 */
+	public function clean()
+	{
+		$this->cache       = [];
+		$this->expirations = [];
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns information on the entire cache.
+	 *
+	 * The information returned and the structure of the data
+	 * varies depending on the handler.
+	 *
+	 * @return string[] Keys currently present in the store
+	 */
+	public function getCacheInfo()
+	{
+		return array_keys($this->cache);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns detailed information about the specific item in the cache.
+	 *
+	 * @param string $key Cache item name.
+	 *
+	 * @return array|null
+	 *   Returns null if the item does not exist, otherwise array<string, mixed>
+	 *   with at least the 'expire' key for absolute epoch expiry (or null).
+	 */
+	public function getMetaData(string $key)
+	{
+		// Misses return null
+		if (! array_key_exists($key, $this->expirations))
+		{
+			return null;
+		}
+
+		// Count expired items as a miss
+		if (is_int($this->expirations[$key]) && $this->expirations[$key] > time())
+		{
+			return null;
+		}
+
+		return [
+			'expire' => $this->expirations[$key],
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if the driver is supported on this system.
+	 *
+	 * @return boolean
+	 */
+	public function isSupported(): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+}
diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
new file mode 100644
index 0000000..3ada4c7
--- /dev/null
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\CodeIgniter;
+
+class MockCodeIgniter extends CodeIgniter
+{
+	protected function callExit($code)
+	{
+		// Do not call exit() in testing.
+	}
+}
diff --git a/system/Test/Mock/MockCommon.php b/system/Test/Mock/MockCommon.php
new file mode 100644
index 0000000..a66b2a4
--- /dev/null
+++ b/system/Test/Mock/MockCommon.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (! function_exists('is_cli'))
+{
+	/**
+	 * Is CLI?
+	 *
+	 * Test to see if a request was made from the command line.
+	 * You can set the return value for testing.
+	 *
+	 * @param  boolean $newReturn return value to set
+	 * @return boolean
+	 */
+	function is_cli(bool $newReturn = null): bool
+	{
+		// PHPUnit always runs via CLI.
+		static $returnValue = true;
+
+		if ($newReturn !== null)
+		{
+			$returnValue = $newReturn;
+		}
+
+		return $returnValue;
+	}
+}
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
new file mode 100644
index 0000000..9cb6607
--- /dev/null
+++ b/system/Test/Mock/MockConnection.php
@@ -0,0 +1,317 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\Query;
+
+class MockConnection extends BaseConnection
+{
+	protected $returnValues = [];
+
+	public $database;
+
+	public $lastQuery;
+
+	//--------------------------------------------------------------------
+
+	public function shouldReturn(string $method, $return)
+	{
+		$this->returnValues[$method] = $return;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Orchestrates a query against the database. Queries must use
+	 * Database\Statement objects to store the query and build it.
+	 * This method works with the cache.
+	 *
+	 * Should automatically handle different connections for read/write
+	 * queries if needed.
+	 *
+	 * @param string  $sql
+	 * @param mixed   ...$binds
+	 * @param boolean $setEscapeFlags
+	 * @param string  $queryClass
+	 *
+	 * @return BaseResult|Query|boolean
+	 *
+	 * @todo BC set $queryClass default as null in 4.1
+	 */
+	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
+	{
+		$queryClass = str_replace('Connection', 'Query', static::class);
+
+		$query = new $queryClass($this);
+
+		$query->setQuery($sql, $binds, $setEscapeFlags);
+
+		if (! empty($this->swapPre) && ! empty($this->DBPrefix))
+		{
+			$query->swapPrefix($this->DBPrefix, $this->swapPre);
+		}
+
+		$startTime = microtime(true);
+
+		$this->lastQuery = $query;
+
+		// Run the query
+		if (false === ($this->resultID = $this->simpleQuery($query->getQuery())))
+		{
+			$query->setDuration($startTime, $startTime);
+
+			// @todo deal with errors
+
+			return false;
+		}
+
+		$query->setDuration($startTime);
+
+		// resultID is not false, so it must be successful
+		if ($query->isWriteType())
+		{
+			return true;
+		}
+
+		// query is not write-type, so it must be read-type query; return QueryResult
+		$resultClass = str_replace('Connection', 'Result', get_class($this));
+		return new $resultClass($this->connID, $this->resultID);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param boolean $persistent
+	 *
+	 * @return mixed
+	 */
+	public function connect(bool $persistent = false)
+	{
+		$return = $this->returnValues['connect'] ?? true;
+
+		if (is_array($return))
+		{
+			// By removing the top item here, we can
+			// get a different value for, say, testing failover connections.
+			$return = array_shift($this->returnValues['connect']);
+		}
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return boolean
+	 */
+	public function reconnect(): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return mixed
+	 */
+	public function setDatabase(string $databaseName)
+	{
+		$this->database = $databaseName;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		return CodeIgniter::CI_VERSION;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Executes the query against the database.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	protected function execute(string $sql)
+	{
+		return $this->returnValues['execute'];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	public function affectedRows(): int
+	{
+		return 1;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error code and message.
+	 *
+	 * Must return an array with keys 'code' and 'message':
+	 *
+	 *  return ['code' => null, 'message' => null);
+	 *
+	 * @return array
+	 */
+	public function error(): array
+	{
+		return [
+			'code'    => null,
+			'message' => null,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer
+	 */
+	public function insertID(): int
+	{
+		return $this->connID->insert_id; // @phpstan-ignore-line
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 *
+	 * @param boolean $constrainByPrefix
+	 *
+	 * @return string
+	 */
+	protected function _listTables(bool $constrainByPrefix = false): string
+	{
+		return '';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function _listColumns(string $table = ''): string
+	{
+		return '';
+	}
+
+	/**
+	 * @param  string $table
+	 * @return array
+	 */
+	protected function _fieldData(string $table): array
+	{
+		return [];
+	}
+
+	/**
+	 * @param  string $table
+	 * @return array
+	 */
+	protected function _indexData(string $table): array
+	{
+		return [];
+	}
+
+	/**
+	 * @param  string $table
+	 * @return array
+	 */
+	protected function _foreignKeyData(string $table): array
+	{
+		return [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close the connection.
+	 */
+	protected function _close()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transBegin(): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transCommit(): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transRollback(): bool
+	{
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Test/Mock/MockEmail.php b/system/Test/Mock/MockEmail.php
new file mode 100644
index 0000000..5bc9418
--- /dev/null
+++ b/system/Test/Mock/MockEmail.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Email\Email;
+use CodeIgniter\Events\Events;
+
+class MockEmail extends Email
+{
+	/**
+	 * Value to return from mocked send().
+	 *
+	 * @var boolean
+	 */
+	public $returnValue = true;
+
+	public function send($autoClear = true)
+	{
+		if ($this->returnValue)
+		{
+			$this->setArchiveValues();
+
+			if ($autoClear)
+			{
+				$this->clear();
+			}
+
+			Events::trigger('email', $this->archive);
+		}
+
+		return $this->returnValue;
+	}
+}
diff --git a/system/Test/Mock/MockEvents.php b/system/Test/Mock/MockEvents.php
new file mode 100644
index 0000000..0d36c61
--- /dev/null
+++ b/system/Test/Mock/MockEvents.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Events\Events;
+
+/**
+ * Events
+ */
+class MockEvents extends Events
+{
+	public function getListeners()
+	{
+		return self::$listeners;
+	}
+
+	public function getEventsFile()
+	{
+		return self::$files;
+	}
+
+	public function getSimulate()
+	{
+		return self::$simulate;
+	}
+
+	public function unInitialize()
+	{
+		static::$initialized = false;
+	}
+}
diff --git a/system/Test/Mock/MockFileLogger.php b/system/Test/Mock/MockFileLogger.php
new file mode 100644
index 0000000..1c007ec
--- /dev/null
+++ b/system/Test/Mock/MockFileLogger.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Log\Handlers\FileHandler;
+
+/**
+ * Class MockFileLogger
+ *
+ * Extends FileHandler, exposing some inner workings
+ */
+class MockFileLogger extends FileHandler
+{
+	/**
+	 * Where would the log be written?
+	 */
+	public $destination;
+
+	//--------------------------------------------------------------------
+
+	public function __construct(array $config)
+	{
+		parent::__construct($config);
+		$this->handles     = $config['handles'] ?? [];
+		$this->destination = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
+	}
+}
diff --git a/system/Test/Mock/MockIncomingRequest.php b/system/Test/Mock/MockIncomingRequest.php
new file mode 100644
index 0000000..3791f26
--- /dev/null
+++ b/system/Test/Mock/MockIncomingRequest.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\HTTP\IncomingRequest;
+
+class MockIncomingRequest extends IncomingRequest
+{
+	//    public function populateHeaders()
+	//    {
+	//        // Don't do anything... force the tester to manually set the headers they want.
+	//    }
+
+	public function detectURI($protocol, $baseURL)
+	{
+		// Do nothing...
+	}
+}
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
new file mode 100644
index 0000000..10cbc94
--- /dev/null
+++ b/system/Test/Mock/MockLanguage.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Language\Language;
+
+class MockLanguage extends Language
+{
+	/**
+	 * Stores the data that should be
+	 * returned by the 'requireFile()' method.
+	 *
+	 * @var mixed
+	 */
+	protected $data;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the data that should be returned by the
+	 * 'requireFile()' method to allow easy overrides
+	 * during testing.
+	 *
+	 * @param array       $data
+	 * @param string      $file
+	 * @param string|null $locale
+	 *
+	 * @return $this
+	 */
+	public function setData(string $file, array $data, string $locale = null)
+	{
+		$this->language[$locale ?? $this->locale][$file] = $data;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides an override that allows us to set custom
+	 * data to be returned easily during testing.
+	 *
+	 * @param string $path
+	 *
+	 * @return array
+	 */
+	protected function requireFile(string $path): array
+	{
+		return $this->data ?? [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Arbitrarily turnoff internationalization support for testing
+	 */
+	public function disableIntlSupport()
+	{
+		$this->intlSupport = false;
+	}
+}
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
new file mode 100644
index 0000000..c32407b
--- /dev/null
+++ b/system/Test/Mock/MockLogger.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+class MockLogger
+{
+	/*
+	  |--------------------------------------------------------------------------
+	  | Error Logging Threshold
+	  |--------------------------------------------------------------------------
+	  |
+	  | You can enable error logging by setting a threshold over zero. The
+	  | threshold determines what gets logged. Any values below or equal to the
+	  | threshold will be logged. Threshold options are:
+	  |
+	  |	0 = Disables logging, Error logging TURNED OFF
+	  |	1 = Emergency Messages  - System is unusable
+	  |	2 = Alert Messages      - Action Must Be Taken Immediately
+	  |   3 = Critical Messages   - Application component unavailable, unexpected exception.
+	  |   4 = Runtime Errors      - Don't need immediate action, but should be monitored.
+	  |   5 = Warnings            - Exceptional occurrences that are not errors.
+	  |   6 = Notices             - Normal but significant events.
+	  |   7 = Info                - Interesting events, like user logging in, etc.
+	  |   8 = Debug               - Detailed debug information.
+	  |   9 = All Messages
+	  |
+	  | You can also pass an array with threshold levels to show individual error types
+	  |
+	  | 	array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
+	  |
+	  | For a live site you'll usually enable Critical or higher (3) to be logged otherwise
+	  | your log files will fill up very fast.
+	  |
+	 */
+
+	public $threshold = 9;
+
+	/*
+	  |--------------------------------------------------------------------------
+	  | Date Format for Logs
+	  |--------------------------------------------------------------------------
+	  |
+	  | Each item that is logged has an associated date. You can use PHP date
+	  | codes to set your own date formatting
+	  |
+	 */
+	public $dateFormat = 'Y-m-d';
+
+	/*
+	  |--------------------------------------------------------------------------
+	  | Log Handlers
+	  |--------------------------------------------------------------------------
+	  |
+	  | The logging system supports multiple actions to be taken when something
+	  | is logged. This is done by allowing for multiple Handlers, special classes
+	  | designed to write the log to their chosen destinations, whether that is
+	  | a file on the getServer, a cloud-based service, or even taking actions such
+	  | as emailing the dev team.
+	  |
+	  | Each handler is defined by the class name used for that handler, and it
+	  | MUST implement the CodeIgniter\Log\Handlers\HandlerInterface interface.
+	  |
+	  | The value of each key is an array of configuration items that are sent
+	  | to the constructor of each handler. The only required configuration item
+	  | is the 'handles' element, which must be an array of integer log levels.
+	  | This is most easily handled by using the constants defined in the
+	  | Psr\Log\LogLevel class.
+	  |
+	  | Handlers are executed in the order defined in this array, starting with
+	  | the handler on top and continuing down.
+	  |
+	 */
+	public $handlers = [
+		//--------------------------------------------------------------------
+		// File Handler
+		//--------------------------------------------------------------------
+
+		'Tests\Support\Log\Handlers\TestHandler' => [
+			/*
+			 * The log levels that this handler will handle.
+			 */
+			'handles' => [
+				'critical',
+				'alert',
+				'emergency',
+				'debug',
+				'error',
+				'info',
+				'notice',
+				'warning',
+			],
+
+			/*
+			 * Logging Directory Path
+			 */
+			'path'    => '',
+		],
+	];
+}
diff --git a/system/Test/Mock/MockQuery.php b/system/Test/Mock/MockQuery.php
new file mode 100644
index 0000000..7d6aff1
--- /dev/null
+++ b/system/Test/Mock/MockQuery.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Database\Query;
+
+class MockQuery extends Query
+{
+}
diff --git a/system/Test/Mock/MockResourceController.php b/system/Test/Mock/MockResourceController.php
new file mode 100644
index 0000000..743ecb8
--- /dev/null
+++ b/system/Test/Mock/MockResourceController.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\RESTful\ResourceController;
+
+class MockResourceController extends ResourceController
+{
+	public function getModel()
+	{
+		return $this->model;
+	}
+
+	public function getModelName()
+	{
+		return $this->modelName;
+	}
+
+	public function getFormat()
+	{
+		return $this->format;
+	}
+}
diff --git a/system/Test/Mock/MockResourcePresenter.php b/system/Test/Mock/MockResourcePresenter.php
new file mode 100644
index 0000000..1a4779a
--- /dev/null
+++ b/system/Test/Mock/MockResourcePresenter.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\RESTful\ResourcePresenter;
+
+class MockResourcePresenter extends ResourcePresenter
+{
+	use ResponseTrait;
+
+	public function getModel()
+	{
+		return $this->model;
+	}
+
+	public function getModelName()
+	{
+		return $this->modelName;
+	}
+
+	public function getFormat()
+	{
+		return $this->format;
+	}
+}
diff --git a/system/Test/Mock/MockResponse.php b/system/Test/Mock/MockResponse.php
new file mode 100644
index 0000000..f862fc6
--- /dev/null
+++ b/system/Test/Mock/MockResponse.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\HTTP\Response;
+
+/**
+ * Class MockResponse
+ */
+class MockResponse extends Response
+{
+	/**
+	 * If true, will not write output. Useful during testing.
+	 *
+	 * @var boolean
+	 */
+	protected $pretend = true;
+
+	// for testing
+	public function getPretend()
+	{
+		return $this->pretend;
+	}
+
+	// artificial error for testing
+	public function misbehave()
+	{
+		$this->statusCode = 0;
+	}
+}
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
new file mode 100644
index 0000000..3d2d0d3
--- /dev/null
+++ b/system/Test/Mock/MockResult.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Database\BaseResult;
+
+class MockResult extends BaseResult
+{
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int
+	{
+		return 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		return [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array
+	{
+		return [];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return mixed
+	 */
+	public function freeResult()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function dataSeek($n = 0)
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	protected function fetchAssoc()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object
+	 */
+	protected function fetchObject($className = 'stdClass')
+	{
+		return new $className;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getNumRows(): int
+	{
+		return 0;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
new file mode 100644
index 0000000..3570e5c
--- /dev/null
+++ b/system/Test/Mock/MockSecurity.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Security\Security;
+
+class MockSecurity extends Security
+{
+	public function sendCookie(RequestInterface $request)
+	{
+		$_COOKIE['csrf_cookie_name'] = $this->hash;
+
+		return $this;
+	}
+}
diff --git a/system/Test/Mock/MockSecurityConfig.php b/system/Test/Mock/MockSecurityConfig.php
new file mode 100644
index 0000000..c9cd280
--- /dev/null
+++ b/system/Test/Mock/MockSecurityConfig.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace CodeIgniter\Test\Mock;
+
+use Config\Security as Security;
+
+/**
+ * @deprecated
+ *
+ * @codeCoverageIgnore
+ */
+class MockSecurityConfig extends Security
+{
+	public $tokenName   = 'csrf_test_name';
+	public $headerName  = 'X-CSRF-TOKEN';
+	public $cookieName  = 'csrf_cookie_name';
+	public $expires     = 7200;
+	public $regenerate  = true;
+	public $redirect    = false;
+	public $samesite    = 'Lax';
+	public $excludeURIs = ['http://example.com'];
+}
diff --git a/system/Test/Mock/MockServices.php b/system/Test/Mock/MockServices.php
new file mode 100644
index 0000000..58fac0c
--- /dev/null
+++ b/system/Test/Mock/MockServices.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Config\BaseService;
+use CodeIgniter\Autoloader\FileLocator;
+
+class MockServices extends BaseService
+{
+	public $psr4 = [
+		'Tests/Support' => TESTPATH . '_support/',
+	];
+
+	public $classmap = [];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		// Don't call the parent since we don't want the default mappings.
+		// parent::__construct();
+	}
+
+	//--------------------------------------------------------------------
+	public static function locator(bool $getShared = true)
+	{
+		return new FileLocator(static::autoloader());
+	}
+}
diff --git a/system/Test/Mock/MockSession.php b/system/Test/Mock/MockSession.php
new file mode 100644
index 0000000..69b1bb0
--- /dev/null
+++ b/system/Test/Mock/MockSession.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Session\Session;
+
+/**
+ * Class MockSession
+ *
+ * Provides a safe way to test the Session class itself,
+ * that doesn't interact with the session or cookies at all.
+ */
+class MockSession extends Session
+{
+	/**
+	 * Holds our "cookie" data.
+	 *
+	 * @var Cookie[]
+	 */
+	public $cookies = [];
+
+	public $didRegenerate = false;
+
+	/**
+	 * Sets the driver as the session handler in PHP.
+	 * Extracted for easier testing.
+	 */
+	protected function setSaveHandler()
+	{
+		// session_set_save_handler($this->driver, true);
+	}
+
+	/**
+	 * Starts the session.
+	 * Extracted for testing reasons.
+	 */
+	protected function startSession()
+	{
+		// session_start();
+		$this->setCookie();
+	}
+
+	/**
+	 * Takes care of setting the cookie on the client side.
+	 * Extracted for testing reasons.
+	 */
+	protected function setCookie()
+	{
+		$expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
+		$this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
+
+		$this->cookies[] = $this->cookie;
+	}
+
+	public function regenerate(bool $destroy = false)
+	{
+		$this->didRegenerate              = true;
+		$_SESSION['__ci_last_regenerate'] = time();
+	}
+}
diff --git a/system/Test/Mock/MockTable.php b/system/Test/Mock/MockTable.php
new file mode 100644
index 0000000..23a685d
--- /dev/null
+++ b/system/Test/Mock/MockTable.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use BadMethodCallException;
+use CodeIgniter\View\Table;
+
+class MockTable extends Table
+{
+	// Override inaccessible protected method
+	public function __call($method, $params)
+	{
+		if (is_callable([$this, '_' . $method]))
+		{
+			return call_user_func_array([$this, '_' . $method], $params);
+		}
+
+		throw new BadMethodCallException('Method ' . $method . ' was not found');
+	}
+}
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
new file mode 100644
index 0000000..1f26179
--- /dev/null
+++ b/system/Test/ReflectionHelper.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use Closure;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionMethod;
+use ReflectionObject;
+use ReflectionProperty;
+
+/**
+ * Testing helper.
+ */
+trait ReflectionHelper
+{
+	/**
+	 * Find a private method invoker.
+	 *
+	 * @param object|string $obj    object or class name
+	 * @param string        $method method name
+	 *
+	 * @return Closure
+	 * @throws ReflectionException
+	 */
+	public static function getPrivateMethodInvoker($obj, $method)
+	{
+		$refMethod = new ReflectionMethod($obj, $method);
+		$refMethod->setAccessible(true);
+		$obj = (gettype($obj) === 'object') ? $obj : null;
+
+		return function () use ($obj, $refMethod) {
+			$args = func_get_args();
+			return $refMethod->invokeArgs($obj, $args);
+		};
+	}
+
+	/**
+	 * Find an accessible property.
+	 *
+	 * @param object|string $obj
+	 * @param string        $property
+	 *
+	 * @return ReflectionProperty
+	 * @throws ReflectionException
+	 */
+	private static function getAccessibleRefProperty($obj, $property)
+	{
+		$refClass = is_object($obj) ? new ReflectionObject($obj) : new ReflectionClass($obj);
+
+		$refProperty = $refClass->getProperty($property);
+		$refProperty->setAccessible(true);
+
+		return $refProperty;
+	}
+
+	/**
+	 * Set a private property.
+	 *
+	 * @param object|string $obj      object or class name
+	 * @param string        $property property name
+	 * @param mixed         $value    value
+	 *
+	 * @throws ReflectionException
+	 */
+	public static function setPrivateProperty($obj, $property, $value)
+	{
+		$refProperty = self::getAccessibleRefProperty($obj, $property);
+		$refProperty->setValue($obj, $value);
+	}
+
+	/**
+	 * Retrieve a private property.
+	 *
+	 * @param object|string $obj      object or class name
+	 * @param string        $property property name
+	 *
+	 * @return mixed value
+	 * @throws ReflectionException
+	 */
+	public static function getPrivateProperty($obj, $property)
+	{
+		$refProperty = self::getAccessibleRefProperty($obj, $property);
+		return is_string($obj) ? $refProperty->getValue() : $refProperty->getValue($obj);
+	}
+}
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
new file mode 100644
index 0000000..396b603
--- /dev/null
+++ b/system/Test/TestLogger.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\Log\Logger;
+
+class TestLogger extends Logger
+{
+	protected static $op_logs = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The log method is overridden so that we can store log history during
+	 * the tests to allow us to check ->assertLogged() methods.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return boolean
+	 */
+	public function log($level, $message, array $context = []): bool
+	{
+		// While this requires duplicate work, we want to ensure
+		// we have the final message to test against.
+		$logMessage = $this->interpolate($message, $context);
+
+		// Determine the file and line by finding the first
+		// backtrace that is not part of our logging system.
+		$trace = debug_backtrace();
+		$file  = null;
+
+		foreach ($trace as $row)
+		{
+			if (! in_array($row['function'], ['log', 'log_message'], true))
+			{
+				$file = basename($row['file'] ?? '');
+				break;
+			}
+		}
+
+		self::$op_logs[] = [
+				  'level'   => $level,
+				  'message' => $logMessage,
+				  'file'    => $file,
+			  ];
+
+		// Let the parent do it's thing.
+		return parent::log($level, $message, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used by CIUnitTestCase class to provide ->assertLogged() methods.
+	 *
+	 * @param string $level
+	 * @param string $message
+	 *
+	 * @return boolean
+	 */
+	public static function didLog(string $level, $message)
+	{
+		foreach (self::$op_logs as $log)
+		{
+			if (strtolower($log['level']) === strtolower($level) && $message === $log['message'])
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+	// Expose cleanFileNames()
+	public function cleanup($file)
+	{
+		return $this->cleanFileNames($file);
+	}
+}
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
new file mode 100644
index 0000000..a1bacda
--- /dev/null
+++ b/system/Test/TestResponse.php
@@ -0,0 +1,555 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test Response Class
+ *
+ * Consolidated response processing
+ * for test results.
+ */
+class TestResponse extends TestCase
+{
+	/**
+	 * The request.
+	 *
+	 * @var RequestInterface|null
+	 */
+	protected $request;
+
+	/**
+	 * The response.
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
+
+	/**
+	 * DOM for the body.
+	 *
+	 * @var DOMParser
+	 */
+	protected $domParser;
+
+	/**
+	 * Stores or the Response and parses the body in the DOM.
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public function __construct(ResponseInterface $response)
+	{
+		$this->setResponse($response);
+	}
+
+	//--------------------------------------------------------------------
+	// Getters / Setters
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the request.
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return $this
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+
+		return $this;
+	}
+
+	/**
+	 * Sets the Response and updates the DOM.
+	 *
+	 * @param ResponseInterface $response
+	 *
+	 * @return $this
+	 */
+	public function setResponse(ResponseInterface $response)
+	{
+		$this->response  = $response;
+		$this->domParser = new DOMParser();
+
+		$body = $response->getBody();
+		if (is_string($body) && $body !== '')
+		{
+			$this->domParser->withString($body);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Request accessor.
+	 *
+	 * @return RequestInterface|null
+	 */
+	public function request()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * Response accessor.
+	 *
+	 * @return ResponseInterface
+	 */
+	public function response()
+	{
+		return $this->response;
+	}
+
+	//--------------------------------------------------------------------
+	// Status Checks
+	//--------------------------------------------------------------------
+
+	/**
+	 * Boils down the possible responses into a boolean valid/not-valid
+	 * response type.
+	 *
+	 * @return boolean
+	 */
+	public function isOK(): bool
+	{
+		$status = $this->response->getStatusCode();
+
+		// Only 200 and 300 range status codes
+		// are considered valid.
+		if ($status >= 400 || $status < 200)
+		{
+			return false;
+		}
+		// Empty bodies are not considered valid, unless in redirects
+		return ! ($status < 300 && empty($this->response->getBody()));
+	}
+
+	/**
+	 * Asserts that the status is a specific value.
+	 *
+	 * @param integer $code
+	 *
+	 * @throws Exception
+	 */
+	public function assertStatus(int $code)
+	{
+		$this->assertEquals($code, $this->response->getStatusCode());
+	}
+
+	/**
+	 * Asserts that the Response is considered OK.
+	 *
+	 * @throws Exception
+	 */
+	public function assertOK()
+	{
+		$this->assertTrue($this->isOK(), "{$this->response->getStatusCode()} is not a successful status code, or the Response has an empty body.");
+	}
+
+	/**
+	 * Asserts that the Response is considered OK.
+	 *
+	 * @throws Exception
+	 */
+	public function assertNotOK()
+	{
+		$this->assertFalse($this->isOK(), "{$this->response->getStatusCode()} is an unexpected successful status code, or the Response has body content.");
+	}
+
+	//--------------------------------------------------------------------
+	// Redirection
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns whether or not the Response was a redirect or RedirectResponse
+	 *
+	 * @return boolean
+	 */
+	public function isRedirect(): bool
+	{
+		return $this->response instanceof RedirectResponse
+			|| $this->response->hasHeader('Location')
+			|| $this->response->hasHeader('Refresh');
+	}
+
+	/**
+	 * Assert that the given response was a redirect.
+	 *
+	 * @throws Exception
+	 */
+	public function assertRedirect()
+	{
+		$this->assertTrue($this->isRedirect(), 'Response is not a redirect or RedirectResponse.');
+	}
+
+	/**
+	 * Assert that a given response was a redirect
+	 * and it was redirect to a specific URI.
+	 *
+	 * @param string $uri
+	 *
+	 * @throws Exception
+	 */
+	public function assertRedirectTo(string $uri)
+	{
+		$this->assertRedirect();
+
+		$uri         = trim(strtolower($uri));
+		$redirectUri = strtolower($this->getRedirectUrl());
+
+		$matches = $uri === $redirectUri
+				   || strtolower(site_url($uri)) === $redirectUri
+				   || $uri === site_url($redirectUri);
+
+		$this->assertTrue($matches, "Redirect URL `{$uri}` does not match `{$redirectUri}`");
+	}
+
+	/*
+	 * Assert that the given response was not a redirect.
+	 *
+	 * @throws Exception
+	 */
+	public function assertNotRedirect()
+	{
+		$this->assertFalse($this->isRedirect(), 'Response is an unexpected redirect or RedirectResponse.');
+	}
+
+	/**
+	 * Returns the URL set for redirection.
+	 *
+	 * @return string|null
+	 */
+	public function getRedirectUrl(): ?string
+	{
+		if (! $this->isRedirect())
+		{
+			return null;
+		}
+
+		if ($this->response->hasHeader('Location'))
+		{
+			return $this->response->getHeaderLine('Location');
+		}
+
+		if ($this->response->hasHeader('Refresh'))
+		{
+			return str_replace('0;url=', '', $this->response->getHeaderLine('Refresh'));
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+	// Session
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that an SESSION key has been set and, optionally, test it's value.
+	 *
+	 * @param string $key
+	 * @param mixed  $value
+	 *
+	 * @throws Exception
+	 */
+	public function assertSessionHas(string $key, $value = null)
+	{
+		$this->assertTrue(array_key_exists($key, $_SESSION), "'{$key}' is not in the current \$_SESSION");
+
+		if (is_null($value))
+		{
+			return;
+		}
+
+		if (is_scalar($value))
+		{
+			$this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' ({$value}) does not match expected value.");
+		}
+		else
+		{
+			$this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' does not match expected value.");
+		}
+	}
+
+	/**
+	 * Asserts the session is missing $key.
+	 *
+	 * @param string $key
+	 *
+	 * @throws Exception
+	 */
+	public function assertSessionMissing(string $key)
+	{
+		$this->assertFalse(array_key_exists($key, $_SESSION), "'{$key}' should not be present in \$_SESSION.");
+	}
+
+	//--------------------------------------------------------------------
+	// Headers
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that the Response contains a specific header.
+	 *
+	 * @param string      $key
+	 * @param string|null $value
+	 *
+	 * @throws Exception
+	 */
+	public function assertHeader(string $key, $value = null)
+	{
+		$this->assertTrue($this->response->hasHeader($key), "'{$key}' is not a valid Response header.");
+
+		if ($value !== null)
+		{
+			$this->assertEquals($value, $this->response->getHeaderLine($key), "The value of '{$key}' header ({$this->response->getHeaderLine($key)}) does not match expected value.");
+		}
+	}
+
+	/**
+	 * Asserts the Response headers does not contain the specified header.
+	 *
+	 * @param string $key
+	 *
+	 * @throws Exception
+	 */
+	public function assertHeaderMissing(string $key)
+	{
+		$this->assertFalse($this->response->hasHeader($key), "'{$key}' should not be in the Response headers.");
+	}
+
+	//--------------------------------------------------------------------
+	// Cookies
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asserts that the response has the specified cookie.
+	 *
+	 * @param string      $key
+	 * @param string|null $value
+	 * @param string      $prefix
+	 *
+	 * @throws Exception
+	 */
+	public function assertCookie(string $key, $value = null, string $prefix = '')
+	{
+		$this->assertTrue($this->response->hasCookie($key, $value, $prefix), "No cookie found named '{$key}'.");
+	}
+
+	/**
+	 * Assert the Response does not have the specified cookie set.
+	 *
+	 * @param string $key
+	 */
+	public function assertCookieMissing(string $key)
+	{
+		$this->assertFalse($this->response->hasCookie($key), "Cookie named '{$key}' should not be set.");
+	}
+
+	/**
+	 * Asserts that a cookie exists and has an expired time.
+	 *
+	 * @param string $key
+	 * @param string $prefix
+	 *
+	 * @throws Exception
+	 */
+	public function assertCookieExpired(string $key, string $prefix = '')
+	{
+		$this->assertTrue($this->response->hasCookie($key, null, $prefix));
+		$this->assertGreaterThan(time(), $this->response->getCookie($key, $prefix)->getExpiresTimestamp());
+	}
+
+	//--------------------------------------------------------------------
+	// JSON
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the response's body as JSON
+	 *
+	 * @return mixed|false
+	 */
+	public function getJSON()
+	{
+		$response = $this->response->getJSON();
+
+		if (is_null($response))
+		{
+			return false;
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Test that the response contains a matching JSON fragment.
+	 *
+	 * @param array   $fragment
+	 * @param boolean $strict
+	 *
+	 * @throws Exception
+	 */
+	public function assertJSONFragment(array $fragment, bool $strict = false)
+	{
+		$json = json_decode($this->getJSON(), true);
+		$this->assertIsArray($json, 'Response does not have valid json');
+		$patched = array_replace_recursive($json, $fragment);
+
+		if ($strict)
+		{
+			$this->assertSame($json, $patched, 'Response does not contain a matching JSON fragment.');
+		}
+		else
+		{
+			$this->assertEquals($json, $patched, 'Response does not contain a matching JSON fragment.');
+		}
+	}
+
+	/**
+	 * Asserts that the JSON exactly matches the passed in data.
+	 * If the value being passed in is a string, it must be a json_encoded string.
+	 *
+	 * @param string|array $test
+	 *
+	 * @throws Exception
+	 */
+	public function assertJSONExact($test)
+	{
+		$json = $this->getJSON();
+
+		if (is_object($test))
+		{
+			$test = method_exists($test, 'toArray') ? $test->toArray() : (array) $test;
+		}
+
+		if (is_array($test))
+		{
+			$test = Services::format()->getFormatter('application/json')->format($test);
+		}
+
+		$this->assertJsonStringEqualsJsonString($test, $json, 'Response does not contain matching JSON.');
+	}
+
+	//--------------------------------------------------------------------
+	// XML Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the response' body as XML
+	 *
+	 * @return mixed|string
+	 */
+	public function getXML()
+	{
+		return $this->response->getXML();
+	}
+
+	//--------------------------------------------------------------------
+	// DomParser
+	//--------------------------------------------------------------------
+
+	/**
+	 * Assert that the desired text can be found in the result body.
+	 *
+	 * @param string|null $search
+	 * @param string|null $element
+	 *
+	 * @throws Exception
+	 */
+	public function assertSee(string $search = null, string $element = null)
+	{
+		$this->assertTrue($this->domParser->see($search, $element), "Do not see '{$search}' in response.");
+	}
+
+	/**
+	 * Asserts that we do not see the specified text.
+	 *
+	 * @param string|null $search
+	 * @param string|null $element
+	 *
+	 * @throws Exception
+	 */
+	public function assertDontSee(string $search = null, string $element = null)
+	{
+		$this->assertTrue($this->domParser->dontSee($search, $element), "I should not see '{$search}' in response.");
+	}
+
+	/**
+	 * Assert that we see an element selected via a CSS selector.
+	 *
+	 * @param string $search
+	 *
+	 * @throws Exception
+	 */
+	public function assertSeeElement(string $search)
+	{
+		$this->assertTrue($this->domParser->seeElement($search), "Do not see element with selector '{$search} in response.'");
+	}
+
+	/**
+	 * Assert that we do not see an element selected via a CSS selector.
+	 *
+	 * @param string $search
+	 *
+	 * @throws Exception
+	 */
+	public function assertDontSeeElement(string $search)
+	{
+		$this->assertTrue($this->domParser->dontSeeElement($search), "I should not see an element with selector '{$search}' in response.'");
+	}
+
+	/**
+	 * Assert that we see a link with the matching text and/or class.
+	 *
+	 * @param string      $text
+	 * @param string|null $details
+	 *
+	 * @throws Exception
+	 */
+	public function assertSeeLink(string $text, string $details = null)
+	{
+		$this->assertTrue($this->domParser->seeLink($text, $details), "Do no see anchor tag with the text {$text} in response.");
+	}
+
+	/**
+	 * Assert that we see an input with name/value.
+	 *
+	 * @param string      $field
+	 * @param string|null $value
+	 *
+	 * @throws Exception
+	 */
+	public function assertSeeInField(string $field, string $value = null)
+	{
+		$this->assertTrue($this->domParser->seeInField($field, $value), "Do no see input named {$field} with value {$value} in response.");
+	}
+
+	/**
+	 * Forward any unrecognized method calls to our DOMParser instance.
+	 *
+	 * @param  string $function Method name
+	 * @param  mixed  $params   Any method parameters
+	 * @return mixed
+	 */
+	public function __call($function, $params)
+	{
+		if (method_exists($this->domParser, $function))
+		{
+			return $this->domParser->{$function}(...$params);
+		}
+	}
+}
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
new file mode 100644
index 0000000..9625506
--- /dev/null
+++ b/system/Test/bootstrap.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Config\DotEnv;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Services;
+use Config\Autoload;
+use Config\Modules;
+use Config\Paths;
+
+error_reporting(E_ALL);
+ini_set('display_errors', '1');
+ini_set('display_startup_errors', '1');
+
+// Make sure it recognizes that we're testing.
+$_SERVER['CI_ENVIRONMENT'] = 'testing';
+define('ENVIRONMENT', 'testing');
+defined('CI_DEBUG') || define('CI_DEBUG', true);
+
+// Often these constants are pre-defined, but query the current directory structure as a fallback
+defined('HOMEPATH') || define('HOMEPATH', realpath(rtrim(getcwd(), '\\/ ')) . DIRECTORY_SEPARATOR);
+$source = is_dir(HOMEPATH . 'app')
+	? HOMEPATH
+	: (is_dir('vendor/codeigniter4/framework/')
+		? 'vendor/codeigniter4/framework/'
+		: 'vendor/codeigniter4/codeigniter4/');
+defined('CONFIGPATH') || define('CONFIGPATH', realpath($source . 'app/Config') . DIRECTORY_SEPARATOR);
+defined('PUBLICPATH') || define('PUBLICPATH', realpath($source . 'public') . DIRECTORY_SEPARATOR);
+unset($source);
+
+// Load framework paths from their config file
+require CONFIGPATH . 'Paths.php';
+$paths = new Paths();
+
+// Define necessary framework path constants
+defined('APPPATH')       || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+defined('WRITEPATH')     || define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+defined('SYSTEMPATH')    || define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/')) . DIRECTORY_SEPARATOR);
+defined('ROOTPATH')      || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
+defined('CIPATH')        || define('CIPATH', realpath(SYSTEMPATH . '../') . DIRECTORY_SEPARATOR);
+defined('FCPATH')        || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR);
+defined('TESTPATH')      || define('TESTPATH', realpath(HOMEPATH . 'tests/') . DIRECTORY_SEPARATOR);
+defined('SUPPORTPATH')   || define('SUPPORTPATH', realpath(TESTPATH . '_support/') . DIRECTORY_SEPARATOR);
+defined('COMPOSER_PATH') || define('COMPOSER_PATH', realpath(HOMEPATH . 'vendor/autoload.php'));
+defined('VENDORPATH')    || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR);
+
+// Load Common.php from App then System
+if (file_exists(APPPATH . 'Common.php'))
+{
+	require_once APPPATH . 'Common.php';
+}
+
+require_once SYSTEMPATH . 'Common.php';
+
+// Set environment values that would otherwise stop the framework from functioning during tests.
+if (! isset($_SERVER['app.baseURL']))
+{
+	$_SERVER['app.baseURL'] = 'http://example.com/';
+}
+
+// Load necessary components
+require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
+require_once APPPATH . 'Config/Autoload.php';
+require_once APPPATH . 'Config/Constants.php';
+require_once SYSTEMPATH . 'Modules/Modules.php';
+require_once APPPATH . 'Config/Modules.php';
+
+require_once SYSTEMPATH . 'Autoloader/Autoloader.php';
+require_once SYSTEMPATH . 'Config/BaseService.php';
+require_once SYSTEMPATH . 'Config/Services.php';
+require_once APPPATH . 'Config/Services.php';
+
+// Use Config\Services as CodeIgniter\Services
+if (! class_exists('CodeIgniter\Services', false))
+{
+	class_alias('Config\Services', 'CodeIgniter\Services');
+}
+
+// Initialize and register the loader with the SPL autoloader stack.
+Services::autoloader()->initialize(new Autoload(), new Modules())->register();
+
+// Now load Composer's if it's available
+if (is_file(COMPOSER_PATH))
+{
+	/*
+	 * The path to the vendor directory.
+	 *
+	 * We do not want to enforce this, so set the constant if Composer was used.
+	 */
+	if (! defined('VENDORPATH'))
+	{
+		define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
+	}
+
+	require_once COMPOSER_PATH;
+}
+
+// Load environment settings from .env files into $_SERVER and $_ENV
+require_once SYSTEMPATH . 'Config/DotEnv.php';
+
+$env = new DotEnv(ROOTPATH);
+$env->load();
+
+// Always load the URL helper, it should be used in most of apps.
+helper('url');
+
+require_once APPPATH . 'Config/Routes.php';
+
+/**
+ * @var RouteCollection $routes
+ */
+$routes->getRoutes('*');
diff --git a/system/ThirdParty/Escaper/Escaper.php b/system/ThirdParty/Escaper/Escaper.php
new file mode 100644
index 0000000..9f903a5
--- /dev/null
+++ b/system/ThirdParty/Escaper/Escaper.php
@@ -0,0 +1,391 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper;
+
+/**
+ * Context specific methods for use in secure output escaping
+ */
+class Escaper
+{
+    /**
+     * Entity Map mapping Unicode codepoints to any available named HTML entities.
+     *
+     * While HTML supports far more named entities, the lowest common denominator
+     * has become HTML5's XML Serialisation which is restricted to the those named
+     * entities that XML supports. Using HTML entities would result in this error:
+     *     XML Parsing Error: undefined entity
+     *
+     * @var array
+     */
+    protected static $htmlNamedEntityMap = [
+        34 => 'quot',         // quotation mark
+        38 => 'amp',          // ampersand
+        60 => 'lt',           // less-than sign
+        62 => 'gt',           // greater-than sign
+    ];
+
+    /**
+     * Current encoding for escaping. If not UTF-8, we convert strings from this encoding
+     * pre-escaping and back to this encoding post-escaping.
+     *
+     * @var string
+     */
+    protected $encoding = 'utf-8';
+
+    /**
+     * Holds the value of the special flags passed as second parameter to
+     * htmlspecialchars().
+     *
+     * @var int
+     */
+    protected $htmlSpecialCharsFlags;
+
+    /**
+     * Static Matcher which escapes characters for HTML Attribute contexts
+     *
+     * @var callable
+     */
+    protected $htmlAttrMatcher;
+
+    /**
+     * Static Matcher which escapes characters for Javascript contexts
+     *
+     * @var callable
+     */
+    protected $jsMatcher;
+
+    /**
+     * Static Matcher which escapes characters for CSS Attribute contexts
+     *
+     * @var callable
+     */
+    protected $cssMatcher;
+
+    /**
+     * List of all encoding supported by this class
+     *
+     * @var array
+     */
+    protected $supportedEncodings = [
+        'iso-8859-1',   'iso8859-1',    'iso-8859-5',   'iso8859-5',
+        'iso-8859-15',  'iso8859-15',   'utf-8',        'cp866',
+        'ibm866',       '866',          'cp1251',       'windows-1251',
+        'win-1251',     '1251',         'cp1252',       'windows-1252',
+        '1252',         'koi8-r',       'koi8-ru',      'koi8r',
+        'big5',         '950',          'gb2312',       '936',
+        'big5-hkscs',   'shift_jis',    'sjis',         'sjis-win',
+        'cp932',        '932',          'euc-jp',       'eucjp',
+        'eucjp-win',    'macroman'
+    ];
+
+    /**
+     * Constructor: Single parameter allows setting of global encoding for use by
+     * the current object.
+     *
+     * @param string $encoding
+     * @throws Exception\InvalidArgumentException
+     */
+    public function __construct($encoding = null)
+    {
+        if ($encoding !== null) {
+            if (! is_string($encoding)) {
+                throw new Exception\InvalidArgumentException(
+                    get_class($this) . ' constructor parameter must be a string, received ' . gettype($encoding)
+                );
+            }
+            if ($encoding === '') {
+                throw new Exception\InvalidArgumentException(
+                    get_class($this) . ' constructor parameter does not allow a blank value'
+                );
+            }
+
+            $encoding = strtolower($encoding);
+            if (! in_array($encoding, $this->supportedEncodings)) {
+                throw new Exception\InvalidArgumentException(
+                    'Value of \'' . $encoding . '\' passed to ' . get_class($this)
+                    . ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
+                );
+            }
+
+            $this->encoding = $encoding;
+        }
+
+        // We take advantage of ENT_SUBSTITUTE flag to correctly deal with invalid UTF-8 sequences.
+        $this->htmlSpecialCharsFlags = ENT_QUOTES | ENT_SUBSTITUTE;
+
+        // set matcher callbacks
+        $this->htmlAttrMatcher = [$this, 'htmlAttrMatcher'];
+        $this->jsMatcher       = [$this, 'jsMatcher'];
+        $this->cssMatcher      = [$this, 'cssMatcher'];
+    }
+
+    /**
+     * Return the encoding that all output/input is expected to be encoded in.
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->encoding;
+    }
+
+    /**
+     * Escape a string for the HTML Body context where there are very few characters
+     * of special meaning. Internally this will use htmlspecialchars().
+     *
+     * @param string $string
+     * @return string
+     */
+    public function escapeHtml($string)
+    {
+        return htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
+    }
+
+    /**
+     * Escape a string for the HTML Attribute context. We use an extended set of characters
+     * to escape that are not covered by htmlspecialchars() to cover cases where an attribute
+     * might be unquoted or quoted illegally (e.g. backticks are valid quotes for IE).
+     *
+     * @param string $string
+     * @return string
+     */
+    public function escapeHtmlAttr($string)
+    {
+        $string = $this->toUtf8($string);
+        if ($string === '' || ctype_digit($string)) {
+            return $string;
+        }
+
+        $result = preg_replace_callback('/[^a-z0-9,\.\-_]/iSu', $this->htmlAttrMatcher, $string);
+        return $this->fromUtf8($result);
+    }
+
+    /**
+     * Escape a string for the Javascript context. This does not use json_encode(). An extended
+     * set of characters are escaped beyond ECMAScript's rules for Javascript literal string
+     * escaping in order to prevent misinterpretation of Javascript as HTML leading to the
+     * injection of special characters and entities. The escaping used should be tolerant
+     * of cases where HTML escaping was not applied on top of Javascript escaping correctly.
+     * Backslash escaping is not used as it still leaves the escaped character as-is and so
+     * is not useful in a HTML context.
+     *
+     * @param string $string
+     * @return string
+     */
+    public function escapeJs($string)
+    {
+        $string = $this->toUtf8($string);
+        if ($string === '' || ctype_digit($string)) {
+            return $string;
+        }
+
+        $result = preg_replace_callback('/[^a-z0-9,\._]/iSu', $this->jsMatcher, $string);
+        return $this->fromUtf8($result);
+    }
+
+    /**
+     * Escape a string for the URI or Parameter contexts. This should not be used to escape
+     * an entire URI - only a subcomponent being inserted. The function is a simple proxy
+     * to rawurlencode() which now implements RFC 3986 since PHP 5.3 completely.
+     *
+     * @param string $string
+     * @return string
+     */
+    public function escapeUrl($string)
+    {
+        return rawurlencode($string);
+    }
+
+    /**
+     * Escape a string for the CSS context. CSS escaping can be applied to any string being
+     * inserted into CSS and escapes everything except alphanumerics.
+     *
+     * @param string $string
+     * @return string
+     */
+    public function escapeCss($string)
+    {
+        $string = $this->toUtf8($string);
+        if ($string === '' || ctype_digit($string)) {
+            return $string;
+        }
+
+        $result = preg_replace_callback('/[^a-z0-9]/iSu', $this->cssMatcher, $string);
+        return $this->fromUtf8($result);
+    }
+
+    /**
+     * Callback function for preg_replace_callback that applies HTML Attribute
+     * escaping to all matches.
+     *
+     * @param array $matches
+     * @return string
+     */
+    protected function htmlAttrMatcher($matches)
+    {
+        $chr = $matches[0];
+        $ord = ord($chr);
+
+        /**
+         * The following replaces characters undefined in HTML with the
+         * hex entity for the Unicode replacement character.
+         */
+        if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r")
+            || ($ord >= 0x7f && $ord <= 0x9f)
+        ) {
+            return '&#xFFFD;';
+        }
+
+        /**
+         * Check if the current character to escape has a name entity we should
+         * replace it with while grabbing the integer value of the character.
+         */
+        if (strlen($chr) > 1) {
+            $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
+        }
+
+        $hex = bin2hex($chr);
+        $ord = hexdec($hex);
+        if (isset(static::$htmlNamedEntityMap[$ord])) {
+            return '&' . static::$htmlNamedEntityMap[$ord] . ';';
+        }
+
+        /**
+         * Per OWASP recommendations, we'll use upper hex entities
+         * for any other characters where a named entity does not exist.
+         */
+        if ($ord > 255) {
+            return sprintf('&#x%04X;', $ord);
+        }
+        return sprintf('&#x%02X;', $ord);
+    }
+
+    /**
+     * Callback function for preg_replace_callback that applies Javascript
+     * escaping to all matches.
+     *
+     * @param array $matches
+     * @return string
+     */
+    protected function jsMatcher($matches)
+    {
+        $chr = $matches[0];
+        if (strlen($chr) == 1) {
+            return sprintf('\\x%02X', ord($chr));
+        }
+        $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
+        $hex = strtoupper(bin2hex($chr));
+        if (strlen($hex) <= 4) {
+            return sprintf('\\u%04s', $hex);
+        }
+        $highSurrogate = substr($hex, 0, 4);
+        $lowSurrogate = substr($hex, 4, 4);
+        return sprintf('\\u%04s\\u%04s', $highSurrogate, $lowSurrogate);
+    }
+
+    /**
+     * Callback function for preg_replace_callback that applies CSS
+     * escaping to all matches.
+     *
+     * @param array $matches
+     * @return string
+     */
+    protected function cssMatcher($matches)
+    {
+        $chr = $matches[0];
+        if (strlen($chr) == 1) {
+            $ord = ord($chr);
+        } else {
+            $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
+            $ord = hexdec(bin2hex($chr));
+        }
+        return sprintf('\\%X ', $ord);
+    }
+
+    /**
+     * Converts a string to UTF-8 from the base encoding. The base encoding is set via this
+     * class' constructor.
+     *
+     * @param string $string
+     * @throws Exception\RuntimeException
+     * @return string
+     */
+    protected function toUtf8($string)
+    {
+        if ($this->getEncoding() === 'utf-8') {
+            $result = $string;
+        } else {
+            $result = $this->convertEncoding($string, 'UTF-8', $this->getEncoding());
+        }
+
+        if (! $this->isUtf8($result)) {
+            throw new Exception\RuntimeException(
+                sprintf('String to be escaped was not valid UTF-8 or could not be converted: %s', $result)
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Converts a string from UTF-8 to the base encoding. The base encoding is set via this
+     * class' constructor.
+     * @param string $string
+     * @return string
+     */
+    protected function fromUtf8($string)
+    {
+        if ($this->getEncoding() === 'utf-8') {
+            return $string;
+        }
+
+        return $this->convertEncoding($string, $this->getEncoding(), 'UTF-8');
+    }
+
+    /**
+     * Checks if a given string appears to be valid UTF-8 or not.
+     *
+     * @param string $string
+     * @return bool
+     */
+    protected function isUtf8($string)
+    {
+        return ($string === '' || preg_match('/^./su', $string));
+    }
+
+    /**
+     * Encoding conversion helper which wraps iconv and mbstring where they exist or throws
+     * and exception where neither is available.
+     *
+     * @param string $string
+     * @param string $to
+     * @param array|string $from
+     * @throws Exception\RuntimeException
+     * @return string
+     */
+    protected function convertEncoding($string, $to, $from)
+    {
+        if (function_exists('iconv')) {
+            $result = iconv($from, $to, $string);
+        } elseif (function_exists('mb_convert_encoding')) {
+            $result = mb_convert_encoding($string, $to, $from);
+        } else {
+            throw new Exception\RuntimeException(
+                get_class($this)
+                . ' requires either the iconv or mbstring extension to be installed'
+                . ' when escaping for non UTF-8 strings.'
+            );
+        }
+
+        if ($result === false) {
+            return ''; // return non-fatal blank string on encoding errors from users
+        }
+        return $result;
+    }
+}
diff --git a/system/ThirdParty/Escaper/Exception/ExceptionInterface.php b/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
new file mode 100644
index 0000000..7ebe04e
--- /dev/null
+++ b/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php b/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000..f5bf1fa
--- /dev/null
+++ b/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper\Exception;
+
+/**
+ * Invalid argument exception
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements
+    ExceptionInterface
+{
+}
diff --git a/system/ThirdParty/Escaper/Exception/RuntimeException.php b/system/ThirdParty/Escaper/Exception/RuntimeException.php
new file mode 100644
index 0000000..ab1903f
--- /dev/null
+++ b/system/ThirdParty/Escaper/Exception/RuntimeException.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper\Exception;
+
+/**
+ * Invalid argument exception
+ */
+class RuntimeException extends \RuntimeException implements
+    ExceptionInterface
+{
+}
diff --git a/system/ThirdParty/Kint/CallFinder.php b/system/ThirdParty/Kint/CallFinder.php
new file mode 100644
index 0000000..e7192a8
--- /dev/null
+++ b/system/ThirdParty/Kint/CallFinder.php
@@ -0,0 +1,473 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint;
+
+class CallFinder
+{
+    private static $ignore = array(
+        T_CLOSE_TAG => true,
+        T_COMMENT => true,
+        T_DOC_COMMENT => true,
+        T_INLINE_HTML => true,
+        T_OPEN_TAG => true,
+        T_OPEN_TAG_WITH_ECHO => true,
+        T_WHITESPACE => true,
+    );
+
+    /**
+     * Things we need to do specially for operator tokens:
+     * - Refuse to strip spaces around them
+     * - Wrap the access path in parentheses if there
+     *   are any of these in the final short parameter.
+     */
+    private static $operator = array(
+        T_AND_EQUAL => true,
+        T_BOOLEAN_AND => true,
+        T_BOOLEAN_OR => true,
+        T_ARRAY_CAST => true,
+        T_BOOL_CAST => true,
+        T_CLONE => true,
+        T_CONCAT_EQUAL => true,
+        T_DEC => true,
+        T_DIV_EQUAL => true,
+        T_DOUBLE_CAST => true,
+        T_INC => true,
+        T_INCLUDE => true,
+        T_INCLUDE_ONCE => true,
+        T_INSTANCEOF => true,
+        T_INT_CAST => true,
+        T_IS_EQUAL => true,
+        T_IS_GREATER_OR_EQUAL => true,
+        T_IS_IDENTICAL => true,
+        T_IS_NOT_EQUAL => true,
+        T_IS_NOT_IDENTICAL => true,
+        T_IS_SMALLER_OR_EQUAL => true,
+        T_LOGICAL_AND => true,
+        T_LOGICAL_OR => true,
+        T_LOGICAL_XOR => true,
+        T_MINUS_EQUAL => true,
+        T_MOD_EQUAL => true,
+        T_MUL_EQUAL => true,
+        T_NEW => true,
+        T_OBJECT_CAST => true,
+        T_OR_EQUAL => true,
+        T_PLUS_EQUAL => true,
+        T_REQUIRE => true,
+        T_REQUIRE_ONCE => true,
+        T_SL => true,
+        T_SL_EQUAL => true,
+        T_SR => true,
+        T_SR_EQUAL => true,
+        T_STRING_CAST => true,
+        T_UNSET_CAST => true,
+        T_XOR_EQUAL => true,
+        '!' => true,
+        '%' => true,
+        '&' => true,
+        '*' => true,
+        '+' => true,
+        '-' => true,
+        '.' => true,
+        '/' => true,
+        ':' => true,
+        '<' => true,
+        '=' => true,
+        '>' => true,
+        '?' => true,
+        '^' => true,
+        '|' => true,
+        '~' => true,
+    );
+
+    private static $strip = array(
+        '(' => true,
+        ')' => true,
+        '[' => true,
+        ']' => true,
+        '{' => true,
+        '}' => true,
+        T_OBJECT_OPERATOR => true,
+        T_DOUBLE_COLON => true,
+        T_NS_SEPARATOR => true,
+    );
+
+    public static function getFunctionCalls($source, $line, $function)
+    {
+        static $up = array(
+            '(' => true,
+            '[' => true,
+            '{' => true,
+            T_CURLY_OPEN => true,
+            T_DOLLAR_OPEN_CURLY_BRACES => true,
+        );
+        static $down = array(
+            ')' => true,
+            ']' => true,
+            '}' => true,
+        );
+        static $modifiers = array(
+            '!' => true,
+            '@' => true,
+            '~' => true,
+            '+' => true,
+            '-' => true,
+        );
+        static $identifier = array(
+            T_DOUBLE_COLON => true,
+            T_STRING => true,
+            T_NS_SEPARATOR => true,
+        );
+
+        if (KINT_PHP56) {
+            self::$operator[T_POW] = true;
+            self::$operator[T_POW_EQUAL] = true;
+        }
+
+        if (KINT_PHP70) {
+            self::$operator[T_SPACESHIP] = true;
+        }
+
+        if (KINT_PHP74) {
+            self::$operator[T_COALESCE_EQUAL] = true;
+        }
+
+        $tokens = \token_get_all($source);
+        $cursor = 1;
+        $function_calls = array();
+        /** @var array<int, null|array|string> Performance optimization preventing backwards loops */
+        $prev_tokens = array(null, null, null);
+
+        if (\is_array($function)) {
+            $class = \explode('\\', $function[0]);
+            $class = \strtolower(\end($class));
+            $function = \strtolower($function[1]);
+        } else {
+            $class = null;
+            $function = \strtolower($function);
+        }
+
+        // Loop through tokens
+        foreach ($tokens as $index => $token) {
+            if (!\is_array($token)) {
+                continue;
+            }
+
+            // Count newlines for line number instead of using $token[2]
+            // since certain situations (String tokens after whitespace) may
+            // not have the correct line number unless you do this manually
+            $cursor += \substr_count($token[1], "\n");
+            if ($cursor > $line) {
+                break;
+            }
+
+            // Store the last real tokens for later
+            if (isset(self::$ignore[$token[0]])) {
+                continue;
+            }
+
+            $prev_tokens = array($prev_tokens[1], $prev_tokens[2], $token);
+
+            // Check if it's the right type to be the function we're looking for
+            if (T_STRING !== $token[0] || \strtolower($token[1]) !== $function) {
+                continue;
+            }
+
+            // Check if it's a function call
+            $nextReal = self::realTokenIndex($tokens, $index);
+            if (!isset($nextReal, $tokens[$nextReal]) || '(' !== $tokens[$nextReal]) {
+                continue;
+            }
+
+            // Check if it matches the signature
+            if (null === $class) {
+                if ($prev_tokens[1] && \in_array($prev_tokens[1][0], array(T_DOUBLE_COLON, T_OBJECT_OPERATOR), true)) {
+                    continue;
+                }
+            } else {
+                if (!$prev_tokens[1] || T_DOUBLE_COLON !== $prev_tokens[1][0]) {
+                    continue;
+                }
+
+                if (!$prev_tokens[0] || T_STRING !== $prev_tokens[0][0] || \strtolower($prev_tokens[0][1]) !== $class) {
+                    continue;
+                }
+            }
+
+            $inner_cursor = $cursor;
+            $depth = 1; // The depth respective to the function call
+            $offset = $nextReal + 1; // The start of the function call
+            $instring = false; // Whether we're in a string or not
+            $realtokens = false; // Whether the current scope contains anything meaningful or not
+            $paramrealtokens = false; // Whether the current parameter contains anything meaningful
+            $params = array(); // All our collected parameters
+            $shortparam = array(); // The short version of the parameter
+            $param_start = $offset; // The distance to the start of the parameter
+
+            // Loop through the following tokens until the function call ends
+            while (isset($tokens[$offset])) {
+                $token = $tokens[$offset];
+
+                // Ensure that the $inner_cursor is correct and
+                // that $token is either a T_ constant or a string
+                if (\is_array($token)) {
+                    $inner_cursor += \substr_count($token[1], "\n");
+                }
+
+                if (!isset(self::$ignore[$token[0]]) && !isset($down[$token[0]])) {
+                    $paramrealtokens = $realtokens = true;
+                }
+
+                // If it's a token that makes us to up a level, increase the depth
+                if (isset($up[$token[0]])) {
+                    if (1 === $depth) {
+                        $shortparam[] = $token;
+                        $realtokens = false;
+                    }
+
+                    ++$depth;
+                } elseif (isset($down[$token[0]])) {
+                    --$depth;
+
+                    // If this brings us down to the parameter level, and we've had
+                    // real tokens since going up, fill the $shortparam with an ellipsis
+                    if (1 === $depth) {
+                        if ($realtokens) {
+                            $shortparam[] = '...';
+                        }
+                        $shortparam[] = $token;
+                    }
+                } elseif ('"' === $token[0]) {
+                    // Strings use the same symbol for up and down, but we can
+                    // only ever be inside one string, so just use a bool for that
+                    if ($instring) {
+                        --$depth;
+                        if (1 === $depth) {
+                            $shortparam[] = '...';
+                        }
+                    } else {
+                        ++$depth;
+                    }
+
+                    $instring = !$instring;
+
+                    $shortparam[] = '"';
+                } elseif (1 === $depth) {
+                    if (',' === $token[0]) {
+                        $params[] = array(
+                            'full' => \array_slice($tokens, $param_start, $offset - $param_start),
+                            'short' => $shortparam,
+                        );
+                        $shortparam = array();
+                        $paramrealtokens = false;
+                        $param_start = $offset + 1;
+                    } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0] && \strlen($token[1]) > 2) {
+                        $shortparam[] = $token[1][0].'...'.$token[1][0];
+                    } else {
+                        $shortparam[] = $token;
+                    }
+                }
+
+                // Depth has dropped to 0 (So we've hit the closing paren)
+                if ($depth <= 0) {
+                    if ($paramrealtokens) {
+                        $params[] = array(
+                            'full' => \array_slice($tokens, $param_start, $offset - $param_start),
+                            'short' => $shortparam,
+                        );
+                    }
+
+                    break;
+                }
+
+                ++$offset;
+            }
+
+            // If we're not passed (or at) the line at the end
+            // of the function call, we're too early so skip it
+            if ($inner_cursor < $line) {
+                continue;
+            }
+
+            // Format the final output parameters
+            foreach ($params as &$param) {
+                $name = self::tokensFormatted($param['short']);
+                $expression = false;
+                foreach ($name as $token) {
+                    if (self::tokenIsOperator($token)) {
+                        $expression = true;
+                        break;
+                    }
+                }
+
+                $param = array(
+                    'name' => self::tokensToString($name),
+                    'path' => self::tokensToString(self::tokensTrim($param['full'])),
+                    'expression' => $expression,
+                );
+            }
+
+            // Get the modifiers
+            --$index;
+
+            while (isset($tokens[$index])) {
+                if (!isset(self::$ignore[$tokens[$index][0]]) && !isset($identifier[$tokens[$index][0]])) {
+                    break;
+                }
+
+                --$index;
+            }
+
+            $mods = array();
+
+            while (isset($tokens[$index])) {
+                if (isset(self::$ignore[$tokens[$index][0]])) {
+                    --$index;
+                    continue;
+                }
+
+                if (isset($modifiers[$tokens[$index][0]])) {
+                    $mods[] = $tokens[$index];
+                    --$index;
+                    continue;
+                }
+
+                break;
+            }
+
+            $function_calls[] = array(
+                'parameters' => $params,
+                'modifiers' => $mods,
+            );
+        }
+
+        return $function_calls;
+    }
+
+    private static function realTokenIndex(array $tokens, $index)
+    {
+        ++$index;
+
+        while (isset($tokens[$index])) {
+            if (!isset(self::$ignore[$tokens[$index][0]])) {
+                return $index;
+            }
+
+            ++$index;
+        }
+
+        return null;
+    }
+
+    /**
+     * We need a separate method to check if tokens are operators because we
+     * occasionally add "..." to short parameter versions. If we simply check
+     * for `$token[0]` then "..." will incorrectly match the "." operator.
+     *
+     * @param array|string $token The token to check
+     *
+     * @return bool
+     */
+    private static function tokenIsOperator($token)
+    {
+        return '...' !== $token && isset(self::$operator[$token[0]]);
+    }
+
+    private static function tokensToString(array $tokens)
+    {
+        $out = '';
+
+        foreach ($tokens as $token) {
+            if (\is_string($token)) {
+                $out .= $token;
+            } elseif (\is_array($token)) {
+                $out .= $token[1];
+            }
+        }
+
+        return $out;
+    }
+
+    private static function tokensTrim(array $tokens)
+    {
+        foreach ($tokens as $index => $token) {
+            if (isset(self::$ignore[$token[0]])) {
+                unset($tokens[$index]);
+            } else {
+                break;
+            }
+        }
+
+        $tokens = \array_reverse($tokens);
+
+        foreach ($tokens as $index => $token) {
+            if (isset(self::$ignore[$token[0]])) {
+                unset($tokens[$index]);
+            } else {
+                break;
+            }
+        }
+
+        return \array_reverse($tokens);
+    }
+
+    private static function tokensFormatted(array $tokens)
+    {
+        $space = false;
+
+        $tokens = self::tokensTrim($tokens);
+
+        $output = array();
+        $last = null;
+
+        foreach ($tokens as $index => $token) {
+            if (isset(self::$ignore[$token[0]])) {
+                if ($space) {
+                    continue;
+                }
+
+                $next = $tokens[self::realTokenIndex($tokens, $index)];
+
+                if (isset(self::$strip[$last[0]]) && !self::tokenIsOperator($next)) {
+                    continue;
+                }
+
+                if (isset(self::$strip[$next[0]]) && $last && !self::tokenIsOperator($last)) {
+                    continue;
+                }
+
+                $token = ' ';
+                $space = true;
+            } else {
+                $space = false;
+                $last = $token;
+            }
+
+            $output[] = $token;
+        }
+
+        return $output;
+    }
+}
diff --git a/system/ThirdParty/Kint/Kint.php b/system/ThirdParty/Kint/Kint.php
new file mode 100644
index 0000000..e0ce963
--- /dev/null
+++ b/system/ThirdParty/Kint/Kint.php
@@ -0,0 +1,756 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint;
+
+use InvalidArgumentException;
+use Kint\Object\BasicObject;
+use Kint\Parser\Parser;
+use Kint\Parser\Plugin;
+use Kint\Renderer\Renderer;
+use Kint\Renderer\TextRenderer;
+
+class Kint
+{
+    const MODE_RICH = 'r';
+    const MODE_TEXT = 't';
+    const MODE_CLI = 'c';
+    const MODE_PLAIN = 'p';
+
+    /**
+     * @var mixed Kint mode
+     *
+     * false: Disabled
+     * true: Enabled, default mode selection
+     * other: Manual mode selection
+     */
+    public static $enabled_mode = true;
+
+    /**
+     * Default mode.
+     *
+     * @var string
+     */
+    public static $mode_default = self::MODE_RICH;
+
+    /**
+     * Default mode in CLI with cli_detection on.
+     *
+     * @var string
+     */
+    public static $mode_default_cli = self::MODE_CLI;
+
+    /**
+     * @var bool Return output instead of echoing
+     */
+    public static $return;
+
+    /**
+     * @var string format of the link to the source file in trace entries.
+     *
+     * Use %f for file path, %l for line number.
+     *
+     * [!] EXAMPLE (works with for phpStorm and RemoteCall Plugin):
+     *
+     * Kint::$file_link_format = 'http://localhost:8091/?message=%f:%l';
+     */
+    public static $file_link_format = '';
+
+    /**
+     * @var bool whether to display where kint was called from
+     */
+    public static $display_called_from = true;
+
+    /**
+     * @var array base directories of your application that will be displayed instead of the full path.
+     *
+     * Keys are paths, values are replacement strings
+     *
+     * [!] EXAMPLE (for Laravel 5):
+     *
+     * Kint::$app_root_dirs = [
+     *     base_path() => '<BASE>',
+     *     app_path() => '<APP>',
+     *     config_path() => '<CONFIG>',
+     *     database_path() => '<DATABASE>',
+     *     public_path() => '<PUBLIC>',
+     *     resource_path() => '<RESOURCE>',
+     *     storage_path() => '<STORAGE>',
+     * ];
+     *
+     * Defaults to [$_SERVER['DOCUMENT_ROOT'] => '<ROOT>']
+     */
+    public static $app_root_dirs = array();
+
+    /**
+     * @var int max array/object levels to go deep, if zero no limits are applied
+     */
+    public static $max_depth = 6;
+
+    /**
+     * @var bool expand all trees by default for rich view
+     */
+    public static $expanded = false;
+
+    /**
+     * @var bool enable detection when Kint is command line.
+     *
+     * Formats output with whitespace only; does not HTML-escape it
+     */
+    public static $cli_detection = true;
+
+    /**
+     * @var array Kint aliases. Add debug functions in Kint wrappers here to fix modifiers and backtraces
+     */
+    public static $aliases = array(
+        array('Kint\\Kint', 'dump'),
+        array('Kint\\Kint', 'trace'),
+        array('Kint\\Kint', 'dumpArray'),
+    );
+
+    /**
+     * @var array<mixed, string> Array of modes to renderer class names
+     */
+    public static $renderers = array(
+        self::MODE_RICH => 'Kint\\Renderer\\RichRenderer',
+        self::MODE_PLAIN => 'Kint\\Renderer\\PlainRenderer',
+        self::MODE_TEXT => 'Kint\\Renderer\\TextRenderer',
+        self::MODE_CLI => 'Kint\\Renderer\\CliRenderer',
+    );
+
+    public static $plugins = array(
+        'Kint\\Parser\\ArrayObjectPlugin',
+        'Kint\\Parser\\Base64Plugin',
+        'Kint\\Parser\\BlacklistPlugin',
+        'Kint\\Parser\\ClassMethodsPlugin',
+        'Kint\\Parser\\ClassStaticsPlugin',
+        'Kint\\Parser\\ClosurePlugin',
+        'Kint\\Parser\\ColorPlugin',
+        'Kint\\Parser\\DateTimePlugin',
+        'Kint\\Parser\\FsPathPlugin',
+        'Kint\\Parser\\IteratorPlugin',
+        'Kint\\Parser\\JsonPlugin',
+        'Kint\\Parser\\MicrotimePlugin',
+        'Kint\\Parser\\SimpleXMLElementPlugin',
+        'Kint\\Parser\\SplFileInfoPlugin',
+        'Kint\\Parser\\SplObjectStoragePlugin',
+        'Kint\\Parser\\StreamPlugin',
+        'Kint\\Parser\\TablePlugin',
+        'Kint\\Parser\\ThrowablePlugin',
+        'Kint\\Parser\\TimestampPlugin',
+        'Kint\\Parser\\TracePlugin',
+        'Kint\\Parser\\XmlPlugin',
+    );
+
+    protected static $plugin_pool = array();
+
+    protected $parser;
+    protected $renderer;
+
+    public function __construct(Parser $p, Renderer $r)
+    {
+        $this->parser = $p;
+        $this->renderer = $r;
+    }
+
+    public function setParser(Parser $p)
+    {
+        $this->parser = $p;
+    }
+
+    public function getParser()
+    {
+        return $this->parser;
+    }
+
+    public function setRenderer(Renderer $r)
+    {
+        $this->renderer = $r;
+    }
+
+    public function getRenderer()
+    {
+        return $this->renderer;
+    }
+
+    public function setStatesFromStatics(array $statics)
+    {
+        $this->renderer->setStatics($statics);
+
+        $this->parser->setDepthLimit(isset($statics['max_depth']) ? $statics['max_depth'] : false);
+        $this->parser->clearPlugins();
+
+        if (!isset($statics['plugins'])) {
+            return;
+        }
+
+        $plugins = array();
+
+        foreach ($statics['plugins'] as $plugin) {
+            if ($plugin instanceof Plugin) {
+                $plugins[] = $plugin;
+            } elseif (\is_string($plugin) && \is_subclass_of($plugin, 'Kint\\Parser\\Plugin')) {
+                if (!isset(self::$plugin_pool[$plugin])) {
+                    $p = new $plugin();
+                    self::$plugin_pool[$plugin] = $p;
+                }
+                $plugins[] = self::$plugin_pool[$plugin];
+            }
+        }
+
+        $plugins = $this->renderer->filterParserPlugins($plugins);
+
+        foreach ($plugins as $plugin) {
+            $this->parser->addPlugin($plugin);
+        }
+    }
+
+    public function setStatesFromCallInfo(array $info)
+    {
+        $this->renderer->setCallInfo($info);
+
+        if (isset($info['modifiers']) && \is_array($info['modifiers']) && \in_array('+', $info['modifiers'], true)) {
+            $this->parser->setDepthLimit(false);
+        }
+
+        $this->parser->setCallerClass(isset($info['caller']['class']) ? $info['caller']['class'] : null);
+    }
+
+    /**
+     * Renders a list of vars including the pre and post renders.
+     *
+     * @param array         $vars Data to dump
+     * @param BasicObject[] $base Base objects
+     *
+     * @return string
+     */
+    public function dumpAll(array $vars, array $base)
+    {
+        if (\array_keys($vars) !== \array_keys($base)) {
+            throw new InvalidArgumentException('Kint::dumpAll requires arrays of identical size and keys as arguments');
+        }
+
+        $output = $this->renderer->preRender();
+
+        if ($vars === array()) {
+            $output .= $this->renderer->renderNothing();
+        }
+
+        foreach ($vars as $key => $arg) {
+            if (!$base[$key] instanceof BasicObject) {
+                throw new InvalidArgumentException('Kint::dumpAll requires all elements of the second argument to be BasicObject instances');
+            }
+            $output .= $this->dumpVar($arg, $base[$key]);
+        }
+
+        $output .= $this->renderer->postRender();
+
+        return $output;
+    }
+
+    /**
+     * Dumps and renders a var.
+     *
+     * @param mixed       $var  Data to dump
+     * @param BasicObject $base Base object
+     *
+     * @return string
+     */
+    public function dumpVar(&$var, BasicObject $base)
+    {
+        return $this->renderer->render(
+            $this->parser->parse($var, $base)
+        );
+    }
+
+    /**
+     * Gets all static settings at once.
+     *
+     * @return array Current static settings
+     */
+    public static function getStatics()
+    {
+        return array(
+            'aliases' => self::$aliases,
+            'app_root_dirs' => self::$app_root_dirs,
+            'cli_detection' => self::$cli_detection,
+            'display_called_from' => self::$display_called_from,
+            'enabled_mode' => self::$enabled_mode,
+            'expanded' => self::$expanded,
+            'file_link_format' => self::$file_link_format,
+            'max_depth' => self::$max_depth,
+            'mode_default' => self::$mode_default,
+            'mode_default_cli' => self::$mode_default_cli,
+            'plugins' => self::$plugins,
+            'renderers' => self::$renderers,
+            'return' => self::$return,
+        );
+    }
+
+    /**
+     * Creates a Kint instances based on static settings.
+     *
+     * Also calls setStatesFromStatics for you
+     *
+     * @param array $statics array of statics as returned by getStatics
+     *
+     * @return null|\Kint\Kint
+     */
+    public static function createFromStatics(array $statics)
+    {
+        $mode = false;
+
+        if (isset($statics['enabled_mode'])) {
+            $mode = $statics['enabled_mode'];
+
+            if (true === $statics['enabled_mode'] && isset($statics['mode_default'])) {
+                $mode = $statics['mode_default'];
+
+                if (PHP_SAPI === 'cli' && !empty($statics['cli_detection']) && isset($statics['mode_default_cli'])) {
+                    $mode = $statics['mode_default_cli'];
+                }
+            }
+        }
+
+        if (!$mode) {
+            return null;
+        }
+
+        if (!isset($statics['renderers'][$mode])) {
+            $renderer = new TextRenderer();
+        } else {
+            /** @var Renderer */
+            $renderer = new $statics['renderers'][$mode]();
+        }
+
+        return new self(new Parser(), $renderer);
+    }
+
+    /**
+     * Creates base objects given parameter info.
+     *
+     * @param array $params Parameters as returned from getCallInfo
+     * @param int   $argc   Number of arguments the helper was called with
+     *
+     * @return BasicObject[] Base objects for the arguments
+     */
+    public static function getBasesFromParamInfo(array $params, $argc)
+    {
+        static $blacklist = array(
+            'null',
+            'true',
+            'false',
+            'array(...)',
+            'array()',
+            '[...]',
+            '[]',
+            '(...)',
+            '()',
+            '"..."',
+            'b"..."',
+            "'...'",
+            "b'...'",
+        );
+
+        $params = \array_values($params);
+        $bases = array();
+
+        for ($i = 0; $i < $argc; ++$i) {
+            if (isset($params[$i])) {
+                $param = $params[$i];
+            } else {
+                $param = null;
+            }
+
+            if (!isset($param['name']) || \is_numeric($param['name'])) {
+                $name = null;
+            } elseif (\in_array(\strtolower($param['name']), $blacklist, true)) {
+                $name = null;
+            } else {
+                $name = $param['name'];
+            }
+
+            if (isset($param['path'])) {
+                $access_path = $param['path'];
+
+                if (!empty($param['expression'])) {
+                    $access_path = '('.$access_path.')';
+                }
+            } else {
+                $access_path = '$'.$i;
+            }
+
+            $bases[] = BasicObject::blank($name, $access_path);
+        }
+
+        return $bases;
+    }
+
+    /**
+     * Gets call info from the backtrace, alias, and argument count.
+     *
+     * Aliases must be normalized beforehand (Utils::normalizeAliases)
+     *
+     * @param array   $aliases Call aliases as found in Kint::$aliases
+     * @param array[] $trace   Backtrace
+     * @param int     $argc    Number of arguments
+     *
+     * @return array{params:null|array, modifiers:array, callee:null|array, caller:null|array, trace:array[]} Call info
+     */
+    public static function getCallInfo(array $aliases, array $trace, $argc)
+    {
+        $found = false;
+        $callee = null;
+        $caller = null;
+        $miniTrace = array();
+
+        foreach ($trace as $index => $frame) {
+            if (Utils::traceFrameIsListed($frame, $aliases)) {
+                $found = true;
+                $miniTrace = array();
+            }
+
+            if (!Utils::traceFrameIsListed($frame, array('spl_autoload_call'))) {
+                $miniTrace[] = $frame;
+            }
+        }
+
+        if ($found) {
+            $callee = \reset($miniTrace) ?: null;
+
+            /** @var null|array Psalm bug workaround */
+            $caller = \next($miniTrace) ?: null;
+        }
+
+        foreach ($miniTrace as $index => $frame) {
+            if ((0 === $index && $callee === $frame) || isset($frame['file'], $frame['line'])) {
+                unset($frame['object'], $frame['args']);
+                $miniTrace[$index] = $frame;
+            } else {
+                unset($miniTrace[$index]);
+            }
+        }
+
+        $miniTrace = \array_values($miniTrace);
+
+        $call = self::getSingleCall($callee ?: array(), $argc);
+
+        $ret = array(
+            'params' => null,
+            'modifiers' => array(),
+            'callee' => $callee,
+            'caller' => $caller,
+            'trace' => $miniTrace,
+        );
+
+        if ($call) {
+            $ret['params'] = $call['parameters'];
+            $ret['modifiers'] = $call['modifiers'];
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Dumps a backtrace.
+     *
+     * Functionally equivalent to Kint::dump(1) or Kint::dump(debug_backtrace(true))
+     *
+     * @return int|string
+     */
+    public static function trace()
+    {
+        if (!self::$enabled_mode) {
+            return 0;
+        }
+
+        Utils::normalizeAliases(self::$aliases);
+
+        $args = \func_get_args();
+
+        $call_info = self::getCallInfo(self::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \count($args));
+
+        $statics = self::getStatics();
+
+        if (\in_array('~', $call_info['modifiers'], true)) {
+            $statics['enabled_mode'] = self::MODE_TEXT;
+        }
+
+        $kintstance = self::createFromStatics($statics);
+        if (!$kintstance) {
+            // Should never happen
+            return 0; // @codeCoverageIgnore
+        }
+
+        if (\in_array('-', $call_info['modifiers'], true)) {
+            while (\ob_get_level()) {
+                \ob_end_clean();
+            }
+        }
+
+        $kintstance->setStatesFromStatics($statics);
+        $kintstance->setStatesFromCallInfo($call_info);
+
+        $trimmed_trace = array();
+        $trace = \debug_backtrace(true);
+
+        foreach ($trace as $frame) {
+            if (Utils::traceFrameIsListed($frame, self::$aliases)) {
+                $trimmed_trace = array();
+            }
+
+            $trimmed_trace[] = $frame;
+        }
+
+        $output = $kintstance->dumpAll(
+            array($trimmed_trace),
+            array(BasicObject::blank('Kint\\Kint::trace()', 'debug_backtrace(true)'))
+        );
+
+        if (self::$return || \in_array('@', $call_info['modifiers'], true)) {
+            return $output;
+        }
+
+        echo $output;
+
+        if (\in_array('-', $call_info['modifiers'], true)) {
+            \flush(); // @codeCoverageIgnore
+        }
+
+        return 0;
+    }
+
+    /**
+     * Dumps some data.
+     *
+     * Functionally equivalent to Kint::dump(1) or Kint::dump(debug_backtrace(true))
+     *
+     * @return int|string
+     */
+    public static function dump()
+    {
+        if (!self::$enabled_mode) {
+            return 0;
+        }
+
+        Utils::normalizeAliases(self::$aliases);
+
+        $args = \func_get_args();
+
+        $call_info = self::getCallInfo(self::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \count($args));
+
+        $statics = self::getStatics();
+
+        if (\in_array('~', $call_info['modifiers'], true)) {
+            $statics['enabled_mode'] = self::MODE_TEXT;
+        }
+
+        $kintstance = self::createFromStatics($statics);
+        if (!$kintstance) {
+            // Should never happen
+            return 0; // @codeCoverageIgnore
+        }
+
+        if (\in_array('-', $call_info['modifiers'], true)) {
+            while (\ob_get_level()) {
+                \ob_end_clean();
+            }
+        }
+
+        $kintstance->setStatesFromStatics($statics);
+        $kintstance->setStatesFromCallInfo($call_info);
+
+        // If the call is Kint::dump(1) then dump a backtrace instead
+        if ($args === array(1) && (!isset($call_info['params'][0]['name']) || '1' === $call_info['params'][0]['name'])) {
+            $args = \debug_backtrace(true);
+            $trace = array();
+
+            foreach ($args as $index => $frame) {
+                if (Utils::traceFrameIsListed($frame, self::$aliases)) {
+                    $trace = array();
+                }
+
+                $trace[] = $frame;
+            }
+
+            if (isset($call_info['callee']['function'])) {
+                $tracename = $call_info['callee']['function'].'(1)';
+                if (isset($call_info['callee']['class'], $call_info['callee']['type'])) {
+                    $tracename = $call_info['callee']['class'].$call_info['callee']['type'].$tracename;
+                }
+            } else {
+                $tracename = 'Kint\\Kint::dump(1)';
+            }
+
+            $tracebase = BasicObject::blank($tracename, 'debug_backtrace(true)');
+
+            $output = $kintstance->dumpAll(array($trace), array($tracebase));
+        } else {
+            $bases = self::getBasesFromParamInfo(
+                isset($call_info['params']) ? $call_info['params'] : array(),
+                \count($args)
+            );
+            $output = $kintstance->dumpAll($args, $bases);
+        }
+
+        if (self::$return || \in_array('@', $call_info['modifiers'], true)) {
+            return $output;
+        }
+
+        echo $output;
+
+        if (\in_array('-', $call_info['modifiers'], true)) {
+            \flush(); // @codeCoverageIgnore
+        }
+
+        return 0;
+    }
+
+    /**
+     * generic path display callback, can be configured in app_root_dirs; purpose is
+     * to show relevant path info and hide as much of the path as possible.
+     *
+     * @param string $file
+     *
+     * @return string
+     */
+    public static function shortenPath($file)
+    {
+        $file = \array_values(\array_filter(\explode('/', \str_replace('\\', '/', $file)), 'strlen'));
+
+        $longest_match = 0;
+        $match = '/';
+
+        foreach (self::$app_root_dirs as $path => $alias) {
+            if (empty($path)) {
+                continue;
+            }
+
+            $path = \array_values(\array_filter(\explode('/', \str_replace('\\', '/', $path)), 'strlen'));
+
+            if (\array_slice($file, 0, \count($path)) === $path && \count($path) > $longest_match) {
+                $longest_match = \count($path);
+                $match = $alias;
+            }
+        }
+
+        if ($longest_match) {
+            $file = \array_merge(array($match), \array_slice($file, $longest_match));
+
+            return \implode('/', $file);
+        }
+
+        // fallback to find common path with Kint dir
+        $kint = \array_values(\array_filter(\explode('/', \str_replace('\\', '/', KINT_DIR)), 'strlen'));
+
+        foreach ($file as $i => $part) {
+            if (!isset($kint[$i]) || $kint[$i] !== $part) {
+                return ($i ? '.../' : '/').\implode('/', \array_slice($file, $i));
+            }
+        }
+
+        return '/'.\implode('/', $file);
+    }
+
+    public static function getIdeLink($file, $line)
+    {
+        return \str_replace(array('%f', '%l'), array($file, $line), self::$file_link_format);
+    }
+
+    /**
+     * Returns specific function call info from a stack trace frame, or null if no match could be found.
+     *
+     * @param array $frame The stack trace frame in question
+     * @param int   $argc  The amount of arguments received
+     *
+     * @return null|array{parameters:array, modifiers:array} params and modifiers, or null if a specific call could not be determined
+     */
+    protected static function getSingleCall(array $frame, $argc)
+    {
+        if (!isset($frame['file'], $frame['line'], $frame['function']) || !\is_readable($frame['file'])) {
+            return null;
+        }
+
+        if (empty($frame['class'])) {
+            $callfunc = $frame['function'];
+        } else {
+            $callfunc = array($frame['class'], $frame['function']);
+        }
+
+        $calls = CallFinder::getFunctionCalls(
+            \file_get_contents($frame['file']),
+            $frame['line'],
+            $callfunc
+        );
+
+        $return = null;
+
+        foreach ($calls as $call) {
+            $is_unpack = false;
+
+            // Handle argument unpacking as a last resort
+            if (KINT_PHP56) {
+                foreach ($call['parameters'] as $i => &$param) {
+                    if (0 === \strpos($param['name'], '...')) {
+                        if ($i < $argc && $i === \count($call['parameters']) - 1) {
+                            for ($j = 1; $j + $i < $argc; ++$j) {
+                                $call['parameters'][] = array(
+                                    'name' => 'array_values('.\substr($param['name'], 3).')['.$j.']',
+                                    'path' => 'array_values('.\substr($param['path'], 3).')['.$j.']',
+                                    'expression' => false,
+                                );
+                            }
+
+                            $param['name'] = 'reset('.\substr($param['name'], 3).')';
+                            $param['path'] = 'reset('.\substr($param['path'], 3).')';
+                            $param['expression'] = false;
+                        } else {
+                            $call['parameters'] = \array_slice($call['parameters'], 0, $i);
+                        }
+
+                        $is_unpack = true;
+                        break;
+                    }
+
+                    if ($i >= $argc) {
+                        continue 2;
+                    }
+                }
+            }
+
+            if ($is_unpack || \count($call['parameters']) === $argc) {
+                if (null === $return) {
+                    $return = $call;
+                } else {
+                    // If we have multiple calls on the same line with the same amount of arguments,
+                    // we can't be sure which it is so just return null and let them figure it out
+                    return null;
+                }
+            }
+        }
+
+        return $return;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/BasicObject.php b/system/ThirdParty/Kint/Object/BasicObject.php
new file mode 100644
index 0000000..d69347e
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/BasicObject.php
@@ -0,0 +1,248 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use Kint\Object\Representation\Representation;
+
+class BasicObject
+{
+    const ACCESS_NONE = null;
+    const ACCESS_PUBLIC = 1;
+    const ACCESS_PROTECTED = 2;
+    const ACCESS_PRIVATE = 3;
+
+    const OPERATOR_NONE = null;
+    const OPERATOR_ARRAY = 1;
+    const OPERATOR_OBJECT = 2;
+    const OPERATOR_STATIC = 3;
+
+    public $name;
+    public $type;
+    public $static = false;
+    public $const = false;
+    public $access = self::ACCESS_NONE;
+    public $owner_class;
+    public $access_path;
+    public $operator = self::OPERATOR_NONE;
+    public $reference = false;
+    public $depth = 0;
+    public $size;
+    public $value;
+    public $hints = array();
+
+    protected $representations = array();
+
+    public function __construct()
+    {
+    }
+
+    public function addRepresentation(Representation $rep, $pos = null)
+    {
+        if (isset($this->representations[$rep->getName()])) {
+            return false;
+        }
+
+        if (null === $pos) {
+            $this->representations[$rep->getName()] = $rep;
+        } else {
+            $this->representations = \array_merge(
+                \array_slice($this->representations, 0, $pos),
+                array($rep->getName() => $rep),
+                \array_slice($this->representations, $pos)
+            );
+        }
+
+        return true;
+    }
+
+    public function replaceRepresentation(Representation $rep, $pos = null)
+    {
+        if (null === $pos) {
+            $this->representations[$rep->getName()] = $rep;
+        } else {
+            $this->removeRepresentation($rep);
+            $this->addRepresentation($rep, $pos);
+        }
+    }
+
+    public function removeRepresentation($rep)
+    {
+        if ($rep instanceof Representation) {
+            unset($this->representations[$rep->getName()]);
+        } elseif (\is_string($rep)) {
+            unset($this->representations[$rep]);
+        }
+    }
+
+    public function getRepresentation($name)
+    {
+        if (isset($this->representations[$name])) {
+            return $this->representations[$name];
+        }
+    }
+
+    public function getRepresentations()
+    {
+        return $this->representations;
+    }
+
+    public function clearRepresentations()
+    {
+        $this->representations = array();
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    public function getModifiers()
+    {
+        $out = $this->getAccess();
+
+        if ($this->const) {
+            $out .= ' const';
+        }
+
+        if ($this->static) {
+            $out .= ' static';
+        }
+
+        if (\strlen($out)) {
+            return \ltrim($out);
+        }
+    }
+
+    public function getAccess()
+    {
+        switch ($this->access) {
+            case self::ACCESS_PRIVATE:
+                return 'private';
+            case self::ACCESS_PROTECTED:
+                return 'protected';
+            case self::ACCESS_PUBLIC:
+                return 'public';
+        }
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getOperator()
+    {
+        switch ($this->operator) {
+            case self::OPERATOR_ARRAY:
+                return '=>';
+            case self::OPERATOR_OBJECT:
+                return '->';
+            case self::OPERATOR_STATIC:
+                return '::';
+        }
+    }
+
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    public function getValueShort()
+    {
+        if ($rep = $this->value) {
+            if ('boolean' === $this->type) {
+                return $rep->contents ? 'true' : 'false';
+            }
+
+            if ('integer' === $this->type || 'double' === $this->type) {
+                return $rep->contents;
+            }
+        }
+    }
+
+    public function getAccessPath()
+    {
+        return $this->access_path;
+    }
+
+    public function transplant(BasicObject $old)
+    {
+        $this->name = $old->name;
+        $this->size = $old->size;
+        $this->access_path = $old->access_path;
+        $this->access = $old->access;
+        $this->static = $old->static;
+        $this->const = $old->const;
+        $this->type = $old->type;
+        $this->depth = $old->depth;
+        $this->owner_class = $old->owner_class;
+        $this->operator = $old->operator;
+        $this->reference = $old->reference;
+        $this->value = $old->value;
+        $this->representations += $old->representations;
+        $this->hints = \array_merge($this->hints, $old->hints);
+    }
+
+    /**
+     * Creates a new basic object with a name and access path.
+     *
+     * @param null|string $name
+     * @param null|string $access_path
+     *
+     * @return \Kint\Object\BasicObject
+     */
+    public static function blank($name = null, $access_path = null)
+    {
+        $o = new self();
+        $o->name = $name;
+        $o->access_path = $access_path;
+
+        return $o;
+    }
+
+    public static function sortByAccess(BasicObject $a, BasicObject $b)
+    {
+        static $sorts = array(
+            self::ACCESS_PUBLIC => 1,
+            self::ACCESS_PROTECTED => 2,
+            self::ACCESS_PRIVATE => 3,
+            self::ACCESS_NONE => 4,
+        );
+
+        return $sorts[$a->access] - $sorts[$b->access];
+    }
+
+    public static function sortByName(BasicObject $a, BasicObject $b)
+    {
+        $ret = \strnatcasecmp($a->name, $b->name);
+
+        if (0 === $ret) {
+            return (int) \is_int($b->name) - (int) \is_int($a->name);
+        }
+
+        return $ret;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/BlobObject.php b/system/ThirdParty/Kint/Object/BlobObject.php
new file mode 100644
index 0000000..66d508f
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/BlobObject.php
@@ -0,0 +1,177 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+class BlobObject extends BasicObject
+{
+    /**
+     * @var array Character encodings to detect
+     *
+     * @see https://secure.php.net/function.mb-detect-order
+     *
+     * In practice, mb_detect_encoding can only successfully determine the
+     * difference between the following common charsets at once without
+     * breaking things for one of the other charsets:
+     * - ASCII
+     * - UTF-8
+     * - SJIS
+     * - EUC-JP
+     *
+     * The order of the charsets is significant. If you put UTF-8 before ASCII
+     * it will never match ASCII, because UTF-8 is a superset of ASCII.
+     * Similarly, SJIS and EUC-JP frequently match UTF-8 strings, so you should
+     * check UTF-8 first. SJIS and EUC-JP seem to work either way, but SJIS is
+     * more common so it should probably be first.
+     *
+     * While you're free to experiment with other charsets, remember to keep
+     * this behavior in mind when setting up your char_encodings array.
+     *
+     * This depends on the mbstring extension
+     */
+    public static $char_encodings = array(
+        'ASCII',
+        'UTF-8',
+    );
+
+    /**
+     * @var array Legacy character encodings to detect
+     *
+     * @see https://secure.php.net/function.iconv
+     *
+     * Assuming the other encoding checks fail, this will perform a
+     * simple iconv conversion to check for invalid bytes. If any are
+     * found it will not match.
+     *
+     * This can be useful for ambiguous single byte encodings like
+     * windows-125x and iso-8859-x which have practically undetectable
+     * differences because they use every single byte available.
+     *
+     * This is *NOT* reliable and should not be trusted implicitly. As
+     * with char_encodings, the order of the charsets is significant.
+     *
+     * This depends on the iconv extension
+     */
+    public static $legacy_encodings = array();
+
+    public $type = 'string';
+    public $encoding = false;
+    public $hints = array('string');
+
+    public function getType()
+    {
+        if (false === $this->encoding) {
+            return 'binary '.$this->type;
+        }
+
+        if ('ASCII' === $this->encoding) {
+            return $this->type;
+        }
+
+        return $this->encoding.' '.$this->type;
+    }
+
+    public function getValueShort()
+    {
+        if ($rep = $this->value) {
+            return '"'.$rep->contents.'"';
+        }
+    }
+
+    public function transplant(BasicObject $old)
+    {
+        parent::transplant($old);
+
+        if ($old instanceof self) {
+            $this->encoding = $old->encoding;
+        }
+    }
+
+    public static function strlen($string, $encoding = false)
+    {
+        if (\function_exists('mb_strlen')) {
+            if (false === $encoding) {
+                $encoding = self::detectEncoding($string);
+            }
+
+            if ($encoding && 'ASCII' !== $encoding) {
+                return \mb_strlen($string, $encoding);
+            }
+        }
+
+        return \strlen($string);
+    }
+
+    public static function substr($string, $start, $length = null, $encoding = false)
+    {
+        if (\function_exists('mb_substr')) {
+            if (false === $encoding) {
+                $encoding = self::detectEncoding($string);
+            }
+
+            if ($encoding && 'ASCII' !== $encoding) {
+                return \mb_substr($string, $start, $length, $encoding);
+            }
+        }
+
+        // Special case for substr/mb_substr discrepancy
+        if ('' === $string) {
+            return '';
+        }
+
+        return \substr($string, $start, isset($length) ? $length : PHP_INT_MAX);
+    }
+
+    public static function detectEncoding($string)
+    {
+        if (\function_exists('mb_detect_encoding')) {
+            if ($ret = \mb_detect_encoding($string, self::$char_encodings, true)) {
+                return $ret;
+            }
+        }
+
+        // Pretty much every character encoding uses first 32 bytes as control
+        // characters. If it's not a multi-byte format it's safe to say matching
+        // any control character besides tab, nl, and cr means it's binary.
+        if (\preg_match('/[\\x00-\\x08\\x0B\\x0C\\x0E-\\x1F]/', $string)) {
+            return false;
+        }
+
+        if (\function_exists('iconv')) {
+            foreach (self::$legacy_encodings as $encoding) {
+                if (@\iconv($encoding, $encoding, $string) === $string) {
+                    return $encoding;
+                }
+            }
+        } elseif (!\function_exists('mb_detect_encoding')) { // @codeCoverageIgnore
+            // If a user has neither mb_detect_encoding, nor iconv, nor the
+            // polyfills, there's not much we can do about it...
+            // Pretend it's ASCII and pray the browser renders it properly.
+            return 'ASCII'; // @codeCoverageIgnore
+        }
+
+        return false;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/ClosureObject.php b/system/ThirdParty/Kint/Object/ClosureObject.php
new file mode 100644
index 0000000..344eceb
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/ClosureObject.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+class ClosureObject extends InstanceObject
+{
+    public $parameters = array();
+    public $hints = array('object', 'callable', 'closure');
+
+    private $paramcache;
+
+    public function getAccessPath()
+    {
+        if (null !== $this->access_path) {
+            return parent::getAccessPath().'('.$this->getParams().')';
+        }
+    }
+
+    public function getSize()
+    {
+    }
+
+    public function getParams()
+    {
+        if (null !== $this->paramcache) {
+            return $this->paramcache;
+        }
+
+        $out = array();
+
+        foreach ($this->parameters as $p) {
+            $type = $p->getType();
+
+            $ref = $p->reference ? '&' : '';
+
+            if ($type) {
+                $out[] = $type.' '.$ref.$p->getName();
+            } else {
+                $out[] = $ref.$p->getName();
+            }
+        }
+
+        return $this->paramcache = \implode(', ', $out);
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/DateTimeObject.php b/system/ThirdParty/Kint/Object/DateTimeObject.php
new file mode 100644
index 0000000..f8b1b3f
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/DateTimeObject.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use DateTime;
+
+class DateTimeObject extends InstanceObject
+{
+    public $dt;
+
+    public $hints = array('object', 'datetime');
+
+    public function __construct(DateTime $dt)
+    {
+        parent::__construct();
+
+        $this->dt = clone $dt;
+    }
+
+    public function getValueShort()
+    {
+        $stamp = $this->dt->format('Y-m-d H:i:s');
+        if ((int) ($micro = $this->dt->format('u'))) {
+            $stamp .= '.'.$micro;
+        }
+        $stamp .= $this->dt->format('P T');
+
+        return $stamp;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/InstanceObject.php b/system/ThirdParty/Kint/Object/InstanceObject.php
new file mode 100644
index 0000000..943b33d
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/InstanceObject.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+class InstanceObject extends BasicObject
+{
+    public $type = 'object';
+    public $classname;
+    public $hash;
+    public $filename;
+    public $startline;
+    public $hints = array('object');
+
+    public function getType()
+    {
+        return $this->classname;
+    }
+
+    public function transplant(BasicObject $old)
+    {
+        parent::transplant($old);
+
+        if ($old instanceof self) {
+            $this->classname = $old->classname;
+            $this->hash = $old->hash;
+            $this->filename = $old->filename;
+            $this->startline = $old->startline;
+        }
+    }
+
+    public static function sortByHierarchy($a, $b)
+    {
+        if (\is_string($a) && \is_string($b)) {
+            $aclass = $a;
+            $bclass = $b;
+        } elseif (!($a instanceof BasicObject) || !($b instanceof BasicObject)) {
+            return 0;
+        } elseif ($a instanceof self && $b instanceof self) {
+            $aclass = $a->classname;
+            $bclass = $b->classname;
+        } else {
+            return 0;
+        }
+
+        if (\is_subclass_of($aclass, $bclass)) {
+            return -1;
+        }
+
+        if (\is_subclass_of($bclass, $aclass)) {
+            return 1;
+        }
+
+        return 0;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/MethodObject.php b/system/ThirdParty/Kint/Object/MethodObject.php
new file mode 100644
index 0000000..78d49de
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/MethodObject.php
@@ -0,0 +1,253 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use Kint\Object\Representation\DocstringRepresentation;
+use Kint\Utils;
+use ReflectionFunctionAbstract;
+use ReflectionMethod;
+
+class MethodObject extends BasicObject
+{
+    public $type = 'method';
+    public $filename;
+    public $startline;
+    public $endline;
+    public $parameters = array();
+    public $abstract;
+    public $final;
+    public $internal;
+    public $docstring;
+    public $returntype;
+    public $return_reference = false;
+    public $hints = array('callable', 'method');
+    public $showparams = true;
+
+    private $paramcache;
+
+    public function __construct(ReflectionFunctionAbstract $method)
+    {
+        parent::__construct();
+
+        $this->name = $method->getName();
+        $this->filename = $method->getFileName();
+        $this->startline = $method->getStartLine();
+        $this->endline = $method->getEndLine();
+        $this->internal = $method->isInternal();
+        $this->docstring = $method->getDocComment();
+        $this->return_reference = $method->returnsReference();
+
+        foreach ($method->getParameters() as $param) {
+            $this->parameters[] = new ParameterObject($param);
+        }
+
+        if (KINT_PHP70) {
+            $this->returntype = $method->getReturnType();
+            if ($this->returntype) {
+                $this->returntype = Utils::getTypeString($this->returntype);
+            }
+        }
+
+        if ($method instanceof ReflectionMethod) {
+            $this->static = $method->isStatic();
+            $this->operator = $this->static ? BasicObject::OPERATOR_STATIC : BasicObject::OPERATOR_OBJECT;
+            $this->abstract = $method->isAbstract();
+            $this->final = $method->isFinal();
+            $this->owner_class = $method->getDeclaringClass()->name;
+            $this->access = BasicObject::ACCESS_PUBLIC;
+            if ($method->isProtected()) {
+                $this->access = BasicObject::ACCESS_PROTECTED;
+            } elseif ($method->isPrivate()) {
+                $this->access = BasicObject::ACCESS_PRIVATE;
+            }
+        }
+
+        if ($this->internal) {
+            return;
+        }
+
+        $docstring = new DocstringRepresentation(
+            $this->docstring,
+            $this->filename,
+            $this->startline
+        );
+
+        $docstring->implicit_label = true;
+        $this->addRepresentation($docstring);
+        $this->value = $docstring;
+    }
+
+    public function setAccessPathFrom(InstanceObject $parent)
+    {
+        static $magic = array(
+            '__call' => true,
+            '__callstatic' => true,
+            '__clone' => true,
+            '__construct' => true,
+            '__debuginfo' => true,
+            '__destruct' => true,
+            '__get' => true,
+            '__invoke' => true,
+            '__isset' => true,
+            '__set' => true,
+            '__set_state' => true,
+            '__sleep' => true,
+            '__tostring' => true,
+            '__unset' => true,
+            '__wakeup' => true,
+        );
+
+        $name = \strtolower($this->name);
+
+        if ('__construct' === $name) {
+            $this->access_path = 'new \\'.$parent->getType();
+        } elseif ('__invoke' === $name) {
+            $this->access_path = $parent->access_path;
+        } elseif ('__clone' === $name) {
+            $this->access_path = 'clone '.$parent->access_path;
+            $this->showparams = false;
+        } elseif ('__tostring' === $name) {
+            $this->access_path = '(string) '.$parent->access_path;
+            $this->showparams = false;
+        } elseif (isset($magic[$name])) {
+            $this->access_path = null;
+        } elseif ($this->static) {
+            $this->access_path = '\\'.$this->owner_class.'::'.$this->name;
+        } else {
+            $this->access_path = $parent->access_path.'->'.$this->name;
+        }
+    }
+
+    public function getValueShort()
+    {
+        if (!$this->value || !($this->value instanceof DocstringRepresentation)) {
+            return parent::getValueShort();
+        }
+
+        $ds = $this->value->getDocstringWithoutComments();
+
+        if (!$ds) {
+            return null;
+        }
+
+        $ds = \explode("\n", $ds);
+
+        $out = '';
+
+        foreach ($ds as $line) {
+            if (0 === \strlen(\trim($line)) || '@' === $line[0]) {
+                break;
+            }
+
+            $out .= $line.' ';
+        }
+
+        if (\strlen($out)) {
+            return \rtrim($out);
+        }
+    }
+
+    public function getModifiers()
+    {
+        $mods = array(
+            $this->abstract ? 'abstract' : null,
+            $this->final ? 'final' : null,
+            $this->getAccess(),
+            $this->static ? 'static' : null,
+        );
+
+        $out = '';
+
+        foreach ($mods as $word) {
+            if (null !== $word) {
+                $out .= $word.' ';
+            }
+        }
+
+        if (\strlen($out)) {
+            return \rtrim($out);
+        }
+    }
+
+    public function getAccessPath()
+    {
+        if (null !== $this->access_path) {
+            if ($this->showparams) {
+                return parent::getAccessPath().'('.$this->getParams().')';
+            }
+
+            return parent::getAccessPath();
+        }
+    }
+
+    public function getParams()
+    {
+        if (null !== $this->paramcache) {
+            return $this->paramcache;
+        }
+
+        $out = array();
+
+        foreach ($this->parameters as $p) {
+            $type = $p->getType();
+            if ($type) {
+                $type .= ' ';
+            }
+
+            $default = $p->getDefault();
+            if ($default) {
+                $default = ' = '.$default;
+            }
+
+            $ref = $p->reference ? '&' : '';
+
+            $out[] = $type.$ref.$p->getName().$default;
+        }
+
+        return $this->paramcache = \implode(', ', $out);
+    }
+
+    public function getPhpDocUrl()
+    {
+        if (!$this->internal) {
+            return null;
+        }
+
+        if ($this->owner_class) {
+            $class = \strtolower($this->owner_class);
+        } else {
+            $class = 'function';
+        }
+
+        $funcname = \str_replace('_', '-', \strtolower($this->name));
+
+        if (0 === \strpos($funcname, '--') && 0 !== \strpos($funcname, '-', 2)) {
+            $funcname = \substr($funcname, 2);
+        }
+
+        return 'https://secure.php.net/'.$class.'.'.$funcname;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/ParameterObject.php b/system/ThirdParty/Kint/Object/ParameterObject.php
new file mode 100644
index 0000000..4bed551
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/ParameterObject.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use Kint\Utils;
+use ReflectionException;
+use ReflectionParameter;
+
+class ParameterObject extends BasicObject
+{
+    public $type_hint;
+    public $default;
+    public $position;
+    public $hints = array('parameter');
+
+    public function __construct(ReflectionParameter $param)
+    {
+        parent::__construct();
+
+        if (KINT_PHP70) {
+            if ($type = $param->getType()) {
+                $this->type_hint = Utils::getTypeString($type);
+            }
+        } else {
+            if ($param->isArray()) {
+                $this->type_hint = 'array';
+            } else {
+                try {
+                    if ($this->type_hint = $param->getClass()) {
+                        $this->type_hint = $this->type_hint->name;
+                    }
+                } catch (ReflectionException $e) {
+                    \preg_match('/\\[\\s\\<\\w+?>\\s([\\w]+)/s', $param->__toString(), $matches);
+                    $this->type_hint = isset($matches[1]) ? $matches[1] : '';
+                }
+            }
+        }
+
+        $this->reference = $param->isPassedByReference();
+        $this->name = $param->getName();
+        $this->position = $param->getPosition();
+
+        if ($param->isDefaultValueAvailable()) {
+            /** @var mixed Psalm bug workaround */
+            $default = $param->getDefaultValue();
+            switch (\gettype($default)) {
+                case 'NULL':
+                    $this->default = 'null';
+                    break;
+                case 'boolean':
+                    $this->default = $default ? 'true' : 'false';
+                    break;
+                case 'array':
+                    $this->default = \count($default) ? 'array(...)' : 'array()';
+                    break;
+                default:
+                    $this->default = \var_export($default, true);
+                    break;
+            }
+        }
+    }
+
+    public function getType()
+    {
+        return $this->type_hint;
+    }
+
+    public function getName()
+    {
+        return '$'.$this->name;
+    }
+
+    public function getDefault()
+    {
+        return $this->default;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/Representation/ColorRepresentation.php b/system/ThirdParty/Kint/Object/Representation/ColorRepresentation.php
new file mode 100644
index 0000000..d6a072f
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/Representation/ColorRepresentation.php
@@ -0,0 +1,576 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object\Representation;
+
+use InvalidArgumentException;
+
+class ColorRepresentation extends Representation
+{
+    const COLOR_NAME = 1;
+    const COLOR_HEX_3 = 2;
+    const COLOR_HEX_6 = 3;
+    const COLOR_RGB = 4;
+    const COLOR_RGBA = 5;
+    const COLOR_HSL = 6;
+    const COLOR_HSLA = 7;
+    const COLOR_HEX_4 = 8;
+    const COLOR_HEX_8 = 9;
+
+    public static $color_map = array(
+        'aliceblue' => 'f0f8ff',
+        'antiquewhite' => 'faebd7',
+        'aqua' => '00ffff',
+        'aquamarine' => '7fffd4',
+        'azure' => 'f0ffff',
+        'beige' => 'f5f5dc',
+        'bisque' => 'ffe4c4',
+        'black' => '000000',
+        'blanchedalmond' => 'ffebcd',
+        'blue' => '0000ff',
+        'blueviolet' => '8a2be2',
+        'brown' => 'a52a2a',
+        'burlywood' => 'deb887',
+        'cadetblue' => '5f9ea0',
+        'chartreuse' => '7fff00',
+        'chocolate' => 'd2691e',
+        'coral' => 'ff7f50',
+        'cornflowerblue' => '6495ed',
+        'cornsilk' => 'fff8dc',
+        'crimson' => 'dc143c',
+        'cyan' => '00ffff',
+        'darkblue' => '00008b',
+        'darkcyan' => '008b8b',
+        'darkgoldenrod' => 'b8860b',
+        'darkgray' => 'a9a9a9',
+        'darkgreen' => '006400',
+        'darkgrey' => 'a9a9a9',
+        'darkkhaki' => 'bdb76b',
+        'darkmagenta' => '8b008b',
+        'darkolivegreen' => '556b2f',
+        'darkorange' => 'ff8c00',
+        'darkorchid' => '9932cc',
+        'darkred' => '8b0000',
+        'darksalmon' => 'e9967a',
+        'darkseagreen' => '8fbc8f',
+        'darkslateblue' => '483d8b',
+        'darkslategray' => '2f4f4f',
+        'darkslategrey' => '2f4f4f',
+        'darkturquoise' => '00ced1',
+        'darkviolet' => '9400d3',
+        'deeppink' => 'ff1493',
+        'deepskyblue' => '00bfff',
+        'dimgray' => '696969',
+        'dimgrey' => '696969',
+        'dodgerblue' => '1e90ff',
+        'firebrick' => 'b22222',
+        'floralwhite' => 'fffaf0',
+        'forestgreen' => '228b22',
+        'fuchsia' => 'ff00ff',
+        'gainsboro' => 'dcdcdc',
+        'ghostwhite' => 'f8f8ff',
+        'gold' => 'ffd700',
+        'goldenrod' => 'daa520',
+        'gray' => '808080',
+        'green' => '008000',
+        'greenyellow' => 'adff2f',
+        'grey' => '808080',
+        'honeydew' => 'f0fff0',
+        'hotpink' => 'ff69b4',
+        'indianred' => 'cd5c5c',
+        'indigo' => '4b0082',
+        'ivory' => 'fffff0',
+        'khaki' => 'f0e68c',
+        'lavender' => 'e6e6fa',
+        'lavenderblush' => 'fff0f5',
+        'lawngreen' => '7cfc00',
+        'lemonchiffon' => 'fffacd',
+        'lightblue' => 'add8e6',
+        'lightcoral' => 'f08080',
+        'lightcyan' => 'e0ffff',
+        'lightgoldenrodyellow' => 'fafad2',
+        'lightgray' => 'd3d3d3',
+        'lightgreen' => '90ee90',
+        'lightgrey' => 'd3d3d3',
+        'lightpink' => 'ffb6c1',
+        'lightsalmon' => 'ffa07a',
+        'lightseagreen' => '20b2aa',
+        'lightskyblue' => '87cefa',
+        'lightslategray' => '778899',
+        'lightslategrey' => '778899',
+        'lightsteelblue' => 'b0c4de',
+        'lightyellow' => 'ffffe0',
+        'lime' => '00ff00',
+        'limegreen' => '32cd32',
+        'linen' => 'faf0e6',
+        'magenta' => 'ff00ff',
+        'maroon' => '800000',
+        'mediumaquamarine' => '66cdaa',
+        'mediumblue' => '0000cd',
+        'mediumorchid' => 'ba55d3',
+        'mediumpurple' => '9370db',
+        'mediumseagreen' => '3cb371',
+        'mediumslateblue' => '7b68ee',
+        'mediumspringgreen' => '00fa9a',
+        'mediumturquoise' => '48d1cc',
+        'mediumvioletred' => 'c71585',
+        'midnightblue' => '191970',
+        'mintcream' => 'f5fffa',
+        'mistyrose' => 'ffe4e1',
+        'moccasin' => 'ffe4b5',
+        'navajowhite' => 'ffdead',
+        'navy' => '000080',
+        'oldlace' => 'fdf5e6',
+        'olive' => '808000',
+        'olivedrab' => '6b8e23',
+        'orange' => 'ffa500',
+        'orangered' => 'ff4500',
+        'orchid' => 'da70d6',
+        'palegoldenrod' => 'eee8aa',
+        'palegreen' => '98fb98',
+        'paleturquoise' => 'afeeee',
+        'palevioletred' => 'db7093',
+        'papayawhip' => 'ffefd5',
+        'peachpuff' => 'ffdab9',
+        'peru' => 'cd853f',
+        'pink' => 'ffc0cb',
+        'plum' => 'dda0dd',
+        'powderblue' => 'b0e0e6',
+        'purple' => '800080',
+        'rebeccapurple' => '663399',
+        'red' => 'ff0000',
+        'rosybrown' => 'bc8f8f',
+        'royalblue' => '4169e1',
+        'saddlebrown' => '8b4513',
+        'salmon' => 'fa8072',
+        'sandybrown' => 'f4a460',
+        'seagreen' => '2e8b57',
+        'seashell' => 'fff5ee',
+        'sienna' => 'a0522d',
+        'silver' => 'c0c0c0',
+        'skyblue' => '87ceeb',
+        'slateblue' => '6a5acd',
+        'slategray' => '708090',
+        'slategrey' => '708090',
+        'snow' => 'fffafa',
+        'springgreen' => '00ff7f',
+        'steelblue' => '4682b4',
+        'tan' => 'd2b48c',
+        'teal' => '008080',
+        'thistle' => 'd8bfd8',
+        'tomato' => 'ff6347',
+        // To quote MDN:
+        // "Technically, transparent is a shortcut for rgba(0,0,0,0)."
+        'transparent' => '00000000',
+        'turquoise' => '40e0d0',
+        'violet' => 'ee82ee',
+        'wheat' => 'f5deb3',
+        'white' => 'ffffff',
+        'whitesmoke' => 'f5f5f5',
+        'yellow' => 'ffff00',
+        'yellowgreen' => '9acd32',
+    );
+
+    public $r = 0;
+    public $g = 0;
+    public $b = 0;
+    public $a = 1.0;
+    public $variant;
+    public $implicit_label = true;
+    public $hints = array('color');
+
+    public function __construct($value)
+    {
+        parent::__construct('Color');
+
+        $this->contents = $value;
+        $this->setValues($value);
+    }
+
+    public function getColor($variant = null)
+    {
+        if (!$variant) {
+            $variant = $this->variant;
+        }
+
+        switch ($variant) {
+            case self::COLOR_NAME:
+                $hex = \sprintf('%02x%02x%02x', $this->r, $this->g, $this->b);
+                $hex_alpha = \sprintf('%02x%02x%02x%02x', $this->r, $this->g, $this->b, \round($this->a * 0xFF));
+
+                return \array_search($hex, self::$color_map, true) ?: \array_search($hex_alpha, self::$color_map, true);
+           case self::COLOR_HEX_3:
+                if (0 === $this->r % 0x11 && 0 === $this->g % 0x11 && 0 === $this->b % 0x11) {
+                    return \sprintf(
+                        '#%1X%1X%1X',
+                        \round($this->r / 0x11),
+                        \round($this->g / 0x11),
+                        \round($this->b / 0x11)
+                    );
+                }
+
+                return false;
+            case self::COLOR_HEX_6:
+                return \sprintf('#%02X%02X%02X', $this->r, $this->g, $this->b);
+            case self::COLOR_RGB:
+                if (1.0 === $this->a) {
+                    return \sprintf('rgb(%d, %d, %d)', $this->r, $this->g, $this->b);
+                }
+
+                return \sprintf('rgb(%d, %d, %d, %s)', $this->r, $this->g, $this->b, \round($this->a, 4));
+            case self::COLOR_RGBA:
+                return \sprintf('rgba(%d, %d, %d, %s)', $this->r, $this->g, $this->b, \round($this->a, 4));
+            case self::COLOR_HSL:
+                $val = self::rgbToHsl($this->r, $this->g, $this->b);
+                if (1.0 === $this->a) {
+                    return \vsprintf('hsl(%d, %d%%, %d%%)', $val);
+                }
+
+                return \sprintf('hsl(%d, %d%%, %d%%, %s)', $val[0], $val[1], $val[2], \round($this->a, 4));
+            case self::COLOR_HSLA:
+                $val = self::rgbToHsl($this->r, $this->g, $this->b);
+
+                return \sprintf('hsla(%d, %d%%, %d%%, %s)', $val[0], $val[1], $val[2], \round($this->a, 4));
+            case self::COLOR_HEX_4:
+                if (0 === $this->r % 0x11 && 0 === $this->g % 0x11 && 0 === $this->b % 0x11 && 0 === ($this->a * 255) % 0x11) {
+                    return \sprintf(
+                        '#%1X%1X%1X%1X',
+                        \round($this->r / 0x11),
+                        \round($this->g / 0x11),
+                        \round($this->b / 0x11),
+                        \round($this->a * 0xF)
+                    );
+                }
+
+                return false;
+
+            case self::COLOR_HEX_8:
+                return \sprintf('#%02X%02X%02X%02X', $this->r, $this->g, $this->b, \round($this->a * 0xFF));
+        }
+
+        return false;
+    }
+
+    public function hasAlpha($variant = null)
+    {
+        if (null === $variant) {
+            $variant = $this->variant;
+        }
+
+        switch ($variant) {
+            case self::COLOR_NAME:
+            case self::COLOR_RGB:
+            case self::COLOR_HSL:
+                return \abs($this->a - 1) >= 0.0001;
+            case self::COLOR_RGBA:
+            case self::COLOR_HSLA:
+            case self::COLOR_HEX_4:
+            case self::COLOR_HEX_8:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    protected function setValues($value)
+    {
+        $value = \strtolower(\trim($value));
+        // Find out which variant of color input it is
+        if (isset(self::$color_map[$value])) {
+            if (!$this->setValuesFromHex(self::$color_map[$value])) {
+                return;
+            }
+
+            $variant = self::COLOR_NAME;
+        } elseif ('#' === $value[0]) {
+            $variant = $this->setValuesFromHex(\substr($value, 1));
+
+            if (!$variant) {
+                return;
+            }
+        } else {
+            $variant = $this->setValuesFromFunction($value);
+
+            if (!$variant) {
+                return;
+            }
+        }
+
+        // If something has gone horribly wrong
+        if ($this->r > 0xFF || $this->g > 0xFF || $this->b > 0xFF || $this->a > 1) {
+            $this->variant = null; // @codeCoverageIgnore
+        } else {
+            $this->variant = $variant;
+            $this->r = (int) $this->r;
+            $this->g = (int) $this->g;
+            $this->b = (int) $this->b;
+            $this->a = (float) $this->a;
+        }
+    }
+
+    protected function setValuesFromHex($hex)
+    {
+        if (!\ctype_xdigit($hex)) {
+            return null;
+        }
+
+        switch (\strlen($hex)) {
+            case 3:
+                $variant = self::COLOR_HEX_3;
+                break;
+            case 6:
+                $variant = self::COLOR_HEX_6;
+                break;
+            case 4:
+                $variant = self::COLOR_HEX_4;
+                break;
+            case 8:
+                $variant = self::COLOR_HEX_8;
+                break;
+            default:
+                return null;
+        }
+
+        switch ($variant) {
+            case self::COLOR_HEX_4:
+                $this->a = \hexdec($hex[3]) / 0xF;
+                // no break
+            case self::COLOR_HEX_3:
+                $this->r = \hexdec($hex[0]) * 0x11;
+                $this->g = \hexdec($hex[1]) * 0x11;
+                $this->b = \hexdec($hex[2]) * 0x11;
+                break;
+            case self::COLOR_HEX_8:
+                $this->a = \hexdec(\substr($hex, 6, 2)) / 0xFF;
+                // no break
+            case self::COLOR_HEX_6:
+                $hex = \str_split($hex, 2);
+                $this->r = \hexdec($hex[0]);
+                $this->g = \hexdec($hex[1]);
+                $this->b = \hexdec($hex[2]);
+                break;
+        }
+
+        return $variant;
+    }
+
+    protected function setValuesFromFunction($value)
+    {
+        if (!\preg_match('/^((?:rgb|hsl)a?)\\s*\\(([0-9\\.%,\\s\\/\\-]+)\\)$/i', $value, $match)) {
+            return null;
+        }
+
+        switch (\strtolower($match[1])) {
+            case 'rgb':
+                $variant = self::COLOR_RGB;
+                break;
+            case 'rgba':
+                $variant = self::COLOR_RGBA;
+                break;
+            case 'hsl':
+                $variant = self::COLOR_HSL;
+                break;
+            case 'hsla':
+                $variant = self::COLOR_HSLA;
+                break;
+            default:
+                return null; // @codeCoverageIgnore
+        }
+
+        $params = \preg_replace('/[,\\s\\/]+/', ',', \trim($match[2]));
+        $params = \explode(',', $params);
+        $params = \array_map('trim', $params);
+
+        if (\count($params) < 3 || \count($params) > 4) {
+            return null;
+        }
+
+        foreach ($params as $i => &$color) {
+            if (false !== \strpos($color, '%')) {
+                $color = (float) \str_replace('%', '', $color);
+
+                if (3 === $i) {
+                    $color = $color / 100;
+                } elseif (\in_array($variant, array(self::COLOR_RGB, self::COLOR_RGBA), true)) {
+                    $color = \round($color / 100 * 0xFF);
+                }
+            }
+
+            $color = (float) $color;
+
+            if (0 === $i && \in_array($variant, array(self::COLOR_HSL, self::COLOR_HSLA), true)) {
+                $color = ($color % 360 + 360) % 360;
+            }
+        }
+
+        /** @var float[] Psalm bug workaround */
+        $params = \array_map('floatval', $params);
+
+        switch ($variant) {
+            case self::COLOR_RGBA:
+            case self::COLOR_RGB:
+                if (\min($params) < 0 || \max($params) > 0xFF) {
+                    return null;
+                }
+                break;
+            case self::COLOR_HSLA:
+            case self::COLOR_HSL:
+                if (\min($params) < 0 || $params[0] > 360 || \max($params[1], $params[2]) > 100) {
+                    return null;
+                }
+                break;
+        }
+
+        if (4 === \count($params)) {
+            if ($params[3] > 1) {
+                return null;
+            }
+
+            $this->a = $params[3];
+        }
+
+        if (self::COLOR_HSLA === $variant || self::COLOR_HSL === $variant) {
+            $params = self::hslToRgb($params[0], $params[1], $params[2]);
+        }
+
+        list($this->r, $this->g, $this->b) = $params;
+
+        return $variant;
+    }
+
+    /**
+     * Turns HSL color to RGB. Black magic.
+     *
+     * @param float $h Hue
+     * @param float $s Saturation
+     * @param float $l Lightness
+     *
+     * @return int[] RGB array
+     */
+    public static function hslToRgb($h, $s, $l)
+    {
+        if (\min($h, $s, $l) < 0) {
+            throw new InvalidArgumentException('The parameters for hslToRgb should be no less than 0');
+        }
+
+        if ($h > 360 || \max($s, $l) > 100) {
+            throw new InvalidArgumentException('The parameters for hslToRgb should be no more than 360, 100, and 100 respectively');
+        }
+
+        $h /= 360;
+        $s /= 100;
+        $l /= 100;
+
+        $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
+        $m1 = $l * 2 - $m2;
+
+        return array(
+            (int) \round(self::hueToRgb($m1, $m2, $h + 1 / 3) * 0xFF),
+            (int) \round(self::hueToRgb($m1, $m2, $h) * 0xFF),
+            (int) \round(self::hueToRgb($m1, $m2, $h - 1 / 3) * 0xFF),
+        );
+    }
+
+    /**
+     * Converts RGB to HSL. Color inversion of previous black magic is white magic?
+     *
+     * @param float|int $red   Red
+     * @param float|int $green Green
+     * @param float|int $blue  Blue
+     *
+     * @return float[] HSL array
+     */
+    public static function rgbToHsl($red, $green, $blue)
+    {
+        if (\min($red, $green, $blue) < 0) {
+            throw new InvalidArgumentException('The parameters for rgbToHsl should be no less than 0');
+        }
+
+        if (\max($red, $green, $blue) > 0xFF) {
+            throw new InvalidArgumentException('The parameters for rgbToHsl should be no more than 255');
+        }
+
+        $clrMin = \min($red, $green, $blue);
+        $clrMax = \max($red, $green, $blue);
+        $deltaMax = $clrMax - $clrMin;
+
+        $L = ($clrMax + $clrMin) / 510;
+
+        if (0 == $deltaMax) {
+            $H = 0;
+            $S = 0;
+        } else {
+            if (0.5 > $L) {
+                $S = $deltaMax / ($clrMax + $clrMin);
+            } else {
+                $S = $deltaMax / (510 - $clrMax - $clrMin);
+            }
+
+            if ($clrMax === $red) {
+                $H = ($green - $blue) / (6.0 * $deltaMax);
+
+                if (0 > $H) {
+                    $H += 1.0;
+                }
+            } elseif ($clrMax === $green) {
+                $H = 1 / 3 + ($blue - $red) / (6.0 * $deltaMax);
+            } else {
+                $H = 2 / 3 + ($red - $green) / (6.0 * $deltaMax);
+            }
+        }
+
+        return array(
+            (float) ($H * 360 % 360),
+            (float) ($S * 100),
+            (float) ($L * 100),
+        );
+    }
+
+    /**
+     * Helper function for hslToRgb. Even blacker magic.
+     *
+     *
+     * @param float $m1
+     * @param float $m2
+     * @param float $hue
+     *
+     * @return float Color value
+     */
+    private static function hueToRgb($m1, $m2, $hue)
+    {
+        $hue = ($hue < 0) ? $hue + 1 : (($hue > 1) ? $hue - 1 : $hue);
+        if ($hue * 6 < 1) {
+            return $m1 + ($m2 - $m1) * $hue * 6;
+        }
+        if ($hue * 2 < 1) {
+            return $m2;
+        }
+        if ($hue * 3 < 2) {
+            return $m1 + ($m2 - $m1) * (2 / 3 - $hue) * 6;
+        }
+
+        return $m1;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/Representation/DocstringRepresentation.php b/system/ThirdParty/Kint/Object/Representation/DocstringRepresentation.php
new file mode 100644
index 0000000..488d8d6
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/Representation/DocstringRepresentation.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object\Representation;
+
+class DocstringRepresentation extends Representation
+{
+    public $file;
+    public $line;
+    public $class;
+    public $hints = array('docstring');
+
+    public function __construct($docstring, $file, $line, $class = null)
+    {
+        parent::__construct('Docstring');
+
+        $this->file = $file;
+        $this->line = $line;
+        $this->class = $class;
+        $this->contents = $docstring;
+    }
+
+    /**
+     * Returns the representation's docstring without surrounding comments.
+     *
+     * Note that this will not work flawlessly.
+     *
+     * On comments with whitespace after the stars the lines will begin with
+     * whitespace, since we can't accurately guess how much of an indentation
+     * is required.
+     *
+     * And on lines without stars on the left this may eat bullet points.
+     *
+     * Long story short: If you want the docstring read the contents. If you
+     * absolutely must have it without comments (ie renderValueShort) this will
+     * probably do.
+     *
+     * @return null|string Docstring with comments stripped
+     */
+    public function getDocstringWithoutComments()
+    {
+        if (!$this->contents) {
+            return null;
+        }
+
+        $string = \substr($this->contents, 3, -2);
+        $string = \preg_replace('/^\\s*\\*\\s*?(\\S|$)/m', '\\1', $string);
+
+        return \trim($string);
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/Representation/MicrotimeRepresentation.php b/system/ThirdParty/Kint/Object/Representation/MicrotimeRepresentation.php
new file mode 100644
index 0000000..b9f4dac
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/Representation/MicrotimeRepresentation.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object\Representation;
+
+use DateTime;
+
+class MicrotimeRepresentation extends Representation
+{
+    public $seconds;
+    public $microseconds;
+    public $group;
+    public $lap;
+    public $total;
+    public $avg;
+    public $i = 0;
+    public $mem = 0;
+    public $mem_real = 0;
+    public $mem_peak = 0;
+    public $mem_peak_real = 0;
+    public $hints = array('microtime');
+
+    public function __construct($seconds, $microseconds, $group, $lap = null, $total = null, $i = 0)
+    {
+        parent::__construct('Microtime');
+
+        $this->seconds = (int) $seconds;
+        $this->microseconds = (int) $microseconds;
+
+        $this->group = $group;
+        $this->lap = $lap;
+        $this->total = $total;
+        $this->i = $i;
+
+        if ($i) {
+            $this->avg = $total / $i;
+        }
+
+        $this->mem = \memory_get_usage();
+        $this->mem_real = \memory_get_usage(true);
+        $this->mem_peak = \memory_get_peak_usage();
+        $this->mem_peak_real = \memory_get_peak_usage(true);
+    }
+
+    public function getDateTime()
+    {
+        return DateTime::createFromFormat('U u', $this->seconds.' '.\str_pad($this->microseconds, 6, '0', STR_PAD_LEFT));
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/Representation/Representation.php b/system/ThirdParty/Kint/Object/Representation/Representation.php
new file mode 100644
index 0000000..0c911a4
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/Representation/Representation.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object\Representation;
+
+class Representation
+{
+    public $label;
+    public $implicit_label = false;
+    public $hints = array();
+    public $contents = array();
+
+    protected $name;
+
+    public function __construct($label, $name = null)
+    {
+        $this->label = $label;
+
+        if (null === $name) {
+            $name = $label;
+        }
+
+        $this->setName($name);
+    }
+
+    public function getLabel()
+    {
+        if (\is_array($this->contents) && \count($this->contents) > 1) {
+            return $this->label.' ('.\count($this->contents).')';
+        }
+
+        return $this->label;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = \preg_replace('/[^a-z0-9]+/', '_', \strtolower($name));
+    }
+
+    public function labelIsImplicit()
+    {
+        return $this->implicit_label;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/Representation/SourceRepresentation.php b/system/ThirdParty/Kint/Object/Representation/SourceRepresentation.php
new file mode 100644
index 0000000..c2cf120
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/Representation/SourceRepresentation.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object\Representation;
+
+class SourceRepresentation extends Representation
+{
+    public $hints = array('source');
+    public $source = array();
+    public $filename;
+    public $line = 0;
+    public $showfilename = false;
+
+    public function __construct($filename, $line, $padding = 7)
+    {
+        parent::__construct('Source');
+
+        $this->filename = $filename;
+        $this->line = $line;
+
+        $start_line = \max($line - $padding, 1);
+        $length = $line + $padding + 1 - $start_line;
+        $this->source = self::getSource($filename, $start_line, $length);
+        if (null !== $this->source) {
+            $this->contents = \implode("\n", $this->source);
+        }
+    }
+
+    /**
+     * Gets section of source code.
+     *
+     * @param string   $filename   Full path to file
+     * @param int      $start_line The first line to display (1 based)
+     * @param null|int $length     Amount of lines to show
+     *
+     * @return null|array
+     */
+    public static function getSource($filename, $start_line = 1, $length = null)
+    {
+        if (!$filename || !\file_exists($filename) || !\is_readable($filename)) {
+            return null;
+        }
+
+        $source = \preg_split("/\r\n|\n|\r/", \file_get_contents($filename));
+        $source = \array_combine(\range(1, \count($source)), $source);
+        $source = \array_slice($source, $start_line - 1, $length, true);
+
+        return $source;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/Representation/SplFileInfoRepresentation.php b/system/ThirdParty/Kint/Object/Representation/SplFileInfoRepresentation.php
new file mode 100644
index 0000000..3df50e6
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/Representation/SplFileInfoRepresentation.php
@@ -0,0 +1,177 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object\Representation;
+
+use Kint\Utils;
+use SplFileInfo;
+
+class SplFileInfoRepresentation extends Representation
+{
+    public $perms;
+    public $flags;
+    public $path;
+    public $realpath;
+    public $linktarget;
+    public $size;
+    public $is_dir = false;
+    public $is_file = false;
+    public $is_link = false;
+    public $owner;
+    public $group;
+    public $ctime;
+    public $mtime;
+    public $typename = 'Unknown file';
+    public $typeflag = '-';
+    public $hints = array('fspath');
+
+    public function __construct(SplFileInfo $fileInfo)
+    {
+        parent::__construct('SplFileInfo');
+
+        if ($fileInfo->getRealPath()) {
+            $this->realpath = $fileInfo->getRealPath();
+            $this->perms = $fileInfo->getPerms();
+            $this->size = $fileInfo->getSize();
+            $this->owner = $fileInfo->getOwner();
+            $this->group = $fileInfo->getGroup();
+            $this->ctime = $fileInfo->getCTime();
+            $this->mtime = $fileInfo->getMTime();
+        }
+
+        $this->path = $fileInfo->getPathname();
+
+        $this->is_dir = $fileInfo->isDir();
+        $this->is_file = $fileInfo->isFile();
+        $this->is_link = $fileInfo->isLink();
+
+        if ($this->is_link) {
+            $this->linktarget = $fileInfo->getLinkTarget();
+        }
+
+        switch ($this->perms & 0xF000) {
+            case 0xC000:
+                $this->typename = 'Socket';
+                $this->typeflag = 's';
+                break;
+            case 0x6000:
+                $this->typename = 'Block device';
+                $this->typeflag = 'b';
+                break;
+            case 0x2000:
+                $this->typename = 'Character device';
+                $this->typeflag = 'c';
+                break;
+            case 0x1000:
+                $this->typename = 'Named pipe';
+                $this->typeflag = 'p';
+                break;
+            default:
+                if ($this->is_file) {
+                    if ($this->is_link) {
+                        $this->typename = 'File symlink';
+                        $this->typeflag = 'l';
+                    } else {
+                        $this->typename = 'File';
+                        $this->typeflag = '-';
+                    }
+                } elseif ($this->is_dir) {
+                    if ($this->is_link) {
+                        $this->typename = 'Directory symlink';
+                        $this->typeflag = 'l';
+                    } else {
+                        $this->typename = 'Directory';
+                        $this->typeflag = 'd';
+                    }
+                }
+                break;
+        }
+
+        $this->flags = array($this->typeflag);
+
+        // User
+        $this->flags[] = (($this->perms & 0400) ? 'r' : '-');
+        $this->flags[] = (($this->perms & 0200) ? 'w' : '-');
+        if ($this->perms & 0100) {
+            $this->flags[] = ($this->perms & 04000) ? 's' : 'x';
+        } else {
+            $this->flags[] = ($this->perms & 04000) ? 'S' : '-';
+        }
+
+        // Group
+        $this->flags[] = (($this->perms & 0040) ? 'r' : '-');
+        $this->flags[] = (($this->perms & 0020) ? 'w' : '-');
+        if ($this->perms & 0010) {
+            $this->flags[] = ($this->perms & 02000) ? 's' : 'x';
+        } else {
+            $this->flags[] = ($this->perms & 02000) ? 'S' : '-';
+        }
+
+        // Other
+        $this->flags[] = (($this->perms & 0004) ? 'r' : '-');
+        $this->flags[] = (($this->perms & 0002) ? 'w' : '-');
+        if ($this->perms & 0001) {
+            $this->flags[] = ($this->perms & 01000) ? 's' : 'x';
+        } else {
+            $this->flags[] = ($this->perms & 01000) ? 'S' : '-';
+        }
+
+        $this->contents = \implode($this->flags).' '.$this->owner.' '.$this->group;
+        $this->contents .= ' '.$this->getSize().' '.$this->getMTime().' ';
+
+        if ($this->is_link && $this->linktarget) {
+            $this->contents .= $this->path.' -> '.$this->linktarget;
+        } elseif (null !== $this->realpath && \strlen($this->realpath) < \strlen($this->path)) {
+            $this->contents .= $this->realpath;
+        } else {
+            $this->contents .= $this->path;
+        }
+    }
+
+    public function getLabel()
+    {
+        return $this->typename.' ('.$this->getSize().')';
+    }
+
+    public function getSize()
+    {
+        if ($this->size) {
+            $size = Utils::getHumanReadableBytes($this->size);
+
+            return \round($size['value'], 2).$size['unit'];
+        }
+    }
+
+    public function getMTime()
+    {
+        $year = \date('Y', $this->mtime);
+
+        if ($year !== \date('Y')) {
+            return \date('M d Y', $this->mtime);
+        }
+
+        return \date('M d H:i', $this->mtime);
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/ResourceObject.php b/system/ThirdParty/Kint/Object/ResourceObject.php
new file mode 100644
index 0000000..a43f85d
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/ResourceObject.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+class ResourceObject extends BasicObject
+{
+    public $resource_type;
+
+    public function getType()
+    {
+        if ($this->resource_type) {
+            return $this->resource_type.' resource';
+        }
+
+        return 'resource';
+    }
+
+    public function transplant(BasicObject $old)
+    {
+        parent::transplant($old);
+
+        if ($old instanceof self) {
+            $this->resource_type = $old->resource_type;
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/StreamObject.php b/system/ThirdParty/Kint/Object/StreamObject.php
new file mode 100644
index 0000000..358f274
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/StreamObject.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use Kint\Kint;
+
+class StreamObject extends ResourceObject
+{
+    public $stream_meta;
+
+    public function __construct(array $meta = null)
+    {
+        parent::__construct();
+        $this->stream_meta = $meta;
+    }
+
+    public function getValueShort()
+    {
+        if (empty($this->stream_meta['uri'])) {
+            return;
+        }
+
+        $uri = $this->stream_meta['uri'];
+
+        if (\stream_is_local($uri)) {
+            return Kint::shortenPath($uri);
+        }
+
+        return $uri;
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/ThrowableObject.php b/system/ThirdParty/Kint/Object/ThrowableObject.php
new file mode 100644
index 0000000..2a86d57
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/ThrowableObject.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use Exception;
+use InvalidArgumentException;
+use Throwable;
+
+class ThrowableObject extends InstanceObject
+{
+    public $message;
+    public $hints = array('object', 'throwable');
+
+    public function __construct($throw)
+    {
+        if (!$throw instanceof Exception && (!KINT_PHP70 || !$throw instanceof Throwable)) {
+            throw new InvalidArgumentException('ThrowableObject must be constructed with a Throwable');
+        }
+
+        parent::__construct();
+
+        $this->message = $throw->getMessage();
+    }
+
+    public function getValueShort()
+    {
+        if (\strlen($this->message)) {
+            return '"'.$this->message.'"';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/TraceFrameObject.php b/system/ThirdParty/Kint/Object/TraceFrameObject.php
new file mode 100644
index 0000000..4259aee
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/TraceFrameObject.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+use Kint\Object\Representation\Representation;
+use Kint\Object\Representation\SourceRepresentation;
+use ReflectionFunction;
+use ReflectionMethod;
+
+class TraceFrameObject extends BasicObject
+{
+    public $trace;
+    public $hints = array('trace_frame');
+
+    public function __construct(BasicObject $base, array $raw_frame)
+    {
+        parent::__construct();
+
+        $this->transplant($base);
+
+        $this->trace = array(
+            'function' => isset($raw_frame['function']) ? $raw_frame['function'] : null,
+            'line' => isset($raw_frame['line']) ? $raw_frame['line'] : null,
+            'file' => isset($raw_frame['file']) ? $raw_frame['file'] : null,
+            'class' => isset($raw_frame['class']) ? $raw_frame['class'] : null,
+            'type' => isset($raw_frame['type']) ? $raw_frame['type'] : null,
+            'object' => null,
+            'args' => null,
+        );
+
+        if ($this->trace['class'] && \method_exists($this->trace['class'], $this->trace['function'])) {
+            $func = new ReflectionMethod($this->trace['class'], $this->trace['function']);
+            $this->trace['function'] = new MethodObject($func);
+        } elseif (!$this->trace['class'] && \function_exists($this->trace['function'])) {
+            $func = new ReflectionFunction($this->trace['function']);
+            $this->trace['function'] = new MethodObject($func);
+        }
+
+        foreach ($this->value->contents as $frame_prop) {
+            if ('object' === $frame_prop->name) {
+                $this->trace['object'] = $frame_prop;
+                $this->trace['object']->name = null;
+                $this->trace['object']->operator = BasicObject::OPERATOR_NONE;
+            }
+            if ('args' === $frame_prop->name) {
+                $this->trace['args'] = $frame_prop->value->contents;
+
+                if ($this->trace['function'] instanceof MethodObject) {
+                    foreach (\array_values($this->trace['function']->parameters) as $param) {
+                        if (isset($this->trace['args'][$param->position])) {
+                            $this->trace['args'][$param->position]->name = $param->getName();
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->clearRepresentations();
+
+        if (isset($this->trace['file'], $this->trace['line']) && \is_readable($this->trace['file'])) {
+            $this->addRepresentation(new SourceRepresentation($this->trace['file'], $this->trace['line']));
+        }
+
+        if ($this->trace['args']) {
+            $args = new Representation('Arguments');
+            $args->contents = $this->trace['args'];
+            $this->addRepresentation($args);
+        }
+
+        if ($this->trace['object']) {
+            $callee = new Representation('object');
+            $callee->label = 'Callee object ['.$this->trace['object']->classname.']';
+            $callee->contents[] = $this->trace['object'];
+            $this->addRepresentation($callee);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/TraceObject.php b/system/ThirdParty/Kint/Object/TraceObject.php
new file mode 100644
index 0000000..a780b08
--- /dev/null
+++ b/system/ThirdParty/Kint/Object/TraceObject.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Object;
+
+class TraceObject extends BasicObject
+{
+    public $hints = array('trace');
+
+    public function getType()
+    {
+        return 'Debug Backtrace';
+    }
+
+    public function getSize()
+    {
+        if (!$this->size) {
+            return 'empty';
+        }
+
+        return parent::getSize();
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php b/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php
new file mode 100644
index 0000000..286d255
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use ArrayObject;
+use Kint\Object\BasicObject;
+
+class ArrayObjectPlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_BEGIN;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof ArrayObject) {
+            return;
+        }
+
+        $flags = $var->getFlags();
+
+        if (ArrayObject::STD_PROP_LIST === $flags) {
+            return;
+        }
+
+        $var->setFlags(ArrayObject::STD_PROP_LIST);
+
+        $o = $this->parser->parse($var, $o);
+
+        $var->setFlags($flags);
+
+        $this->parser->haltParse();
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/Base64Plugin.php b/system/ThirdParty/Kint/Parser/Base64Plugin.php
new file mode 100644
index 0000000..3d7d6bc
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/Base64Plugin.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+
+class Base64Plugin extends Plugin
+{
+    /**
+     * The minimum length before a string will be considered for base64 decoding.
+     *
+     * @var int
+     */
+    public static $min_length_hard = 16;
+
+    /**
+     * The minimum length before the base64 decoding will take precedence.
+     *
+     * @var int
+     */
+    public static $min_length_soft = 50;
+
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (\strlen($var) < self::$min_length_hard || \strlen($var) % 4) {
+            return;
+        }
+
+        if (\preg_match('/^[A-Fa-f0-9]+$/', $var)) {
+            return;
+        }
+
+        if (!\preg_match('/^[A-Za-z0-9+\\/=]+$/', $var)) {
+            return;
+        }
+
+        /** @var false|string */
+        $data = \base64_decode($var, true);
+
+        if (false === $data) {
+            return;
+        }
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth + 1;
+        $base_obj->name = 'base64_decode('.$o->name.')';
+
+        if ($o->access_path) {
+            $base_obj->access_path = 'base64_decode('.$o->access_path.')';
+        }
+
+        $r = new Representation('Base64');
+        $r->contents = $this->parser->parse($data, $base_obj);
+
+        if (\strlen($var) > self::$min_length_soft) {
+            $o->addRepresentation($r, 0);
+        } else {
+            $o->addRepresentation($r);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/BinaryPlugin.php b/system/ThirdParty/Kint/Parser/BinaryPlugin.php
new file mode 100644
index 0000000..327c297
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/BinaryPlugin.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+
+class BinaryPlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$o instanceof BlobObject || !\in_array($o->encoding, array('ASCII', 'UTF-8'), true)) {
+            $o->value->hints[] = 'binary';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
new file mode 100644
index 0000000..b37e45f
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\InstanceObject;
+
+class BlacklistPlugin extends Plugin
+{
+    /**
+     * List of classes and interfaces to blacklist.
+     *
+     * @var array
+     */
+    public static $blacklist = array();
+
+    /**
+     * List of classes and interfaces to blacklist except when dumped directly.
+     *
+     * @var array
+     */
+    public static $shallow_blacklist = array();
+
+    /**
+     * Maximum size of arrays before blacklisting.
+     *
+     * @var int
+     */
+    public static $array_limit = 10000;
+
+    /**
+     * Maximum size of arrays before blacklisting except when dumped directly.
+     *
+     * @var int
+     */
+    public static $shallow_array_limit = 1000;
+
+    public function getTypes()
+    {
+        return array('object', 'array');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_BEGIN;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (\is_object($var)) {
+            return $this->parseObject($var, $o);
+        }
+        if (\is_array($var)) {
+            return $this->parseArray($var, $o);
+        }
+    }
+
+    protected function parseObject(&$var, BasicObject &$o)
+    {
+        foreach (self::$blacklist as $class) {
+            if ($var instanceof $class) {
+                return $this->blacklistObject($var, $o);
+            }
+        }
+
+        if ($o->depth <= 0) {
+            return;
+        }
+
+        foreach (self::$shallow_blacklist as $class) {
+            if ($var instanceof $class) {
+                return $this->blacklistObject($var, $o);
+            }
+        }
+    }
+
+    protected function blacklistObject(&$var, BasicObject &$o)
+    {
+        $object = new InstanceObject();
+        $object->transplant($o);
+        $object->classname = \get_class($var);
+        $object->hash = \spl_object_hash($var);
+        $object->clearRepresentations();
+        $object->value = null;
+        $object->size = null;
+        $object->hints[] = 'blacklist';
+
+        $o = $object;
+
+        $this->parser->haltParse();
+    }
+
+    protected function parseArray(array &$var, BasicObject &$o)
+    {
+        if (\count($var) > self::$array_limit) {
+            return $this->blacklistArray($var, $o);
+        }
+
+        if ($o->depth <= 0) {
+            return;
+        }
+
+        if (\count($var) > self::$shallow_array_limit) {
+            return $this->blacklistArray($var, $o);
+        }
+    }
+
+    protected function blacklistArray(array &$var, BasicObject &$o)
+    {
+        $object = new BasicObject();
+        $object->transplant($o);
+        $object->value = null;
+        $object->size = \count($var);
+        $object->hints[] = 'blacklist';
+
+        $o = $object;
+
+        $this->parser->haltParse();
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php b/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php
new file mode 100644
index 0000000..e4c2371
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\InstanceObject;
+use Kint\Object\MethodObject;
+use Kint\Object\Representation\Representation;
+use ReflectionClass;
+
+class ClassMethodsPlugin extends Plugin
+{
+    private static $cache = array();
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        $class = \get_class($var);
+
+        // assuming class definition will not change inside one request
+        if (!isset(self::$cache[$class])) {
+            $methods = array();
+
+            $reflection = new ReflectionClass($class);
+
+            foreach ($reflection->getMethods() as $method) {
+                $methods[] = new MethodObject($method);
+            }
+
+            \usort($methods, array('Kint\\Parser\\ClassMethodsPlugin', 'sort'));
+
+            self::$cache[$class] = $methods;
+        }
+
+        if (!empty(self::$cache[$class])) {
+            $rep = new Representation('Available methods', 'methods');
+
+            // Can't cache access paths
+            foreach (self::$cache[$class] as $m) {
+                $method = clone $m;
+                $method->depth = $o->depth + 1;
+
+                if (!$this->parser->childHasPath($o, $method)) {
+                    $method->access_path = null;
+                } else {
+                    $method->setAccessPathFrom($o);
+                }
+
+                if ($method->owner_class !== $class && $ds = $method->getRepresentation('docstring')) {
+                    $ds = clone $ds;
+                    $ds->class = $method->owner_class;
+                    $method->replaceRepresentation($ds);
+                }
+
+                $rep->contents[] = $method;
+            }
+
+            $o->addRepresentation($rep);
+        }
+    }
+
+    private static function sort(MethodObject $a, MethodObject $b)
+    {
+        $sort = ((int) $a->static) - ((int) $b->static);
+        if ($sort) {
+            return $sort;
+        }
+
+        $sort = BasicObject::sortByAccess($a, $b);
+        if ($sort) {
+            return $sort;
+        }
+
+        $sort = InstanceObject::sortByHierarchy($a->owner_class, $b->owner_class);
+        if ($sort) {
+            return $sort;
+        }
+
+        return $a->startline - $b->startline;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php b/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php
new file mode 100644
index 0000000..0ba58ca
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php
@@ -0,0 +1,122 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\InstanceObject;
+use Kint\Object\Representation\Representation;
+use ReflectionClass;
+use ReflectionProperty;
+
+class ClassStaticsPlugin extends Plugin
+{
+    private static $cache = array();
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        $class = \get_class($var);
+        $reflection = new ReflectionClass($class);
+
+        // Constants
+        // TODO: PHP 7.1 allows private consts but reflection doesn't have a way to check them yet
+        if (!isset(self::$cache[$class])) {
+            $consts = array();
+
+            foreach ($reflection->getConstants() as $name => $val) {
+                $const = BasicObject::blank($name, '\\'.$class.'::'.$name);
+                $const->const = true;
+                $const->depth = $o->depth + 1;
+                $const->owner_class = $class;
+                $const->operator = BasicObject::OPERATOR_STATIC;
+                $const = $this->parser->parse($val, $const);
+
+                $consts[] = $const;
+            }
+
+            self::$cache[$class] = $consts;
+        }
+
+        $statics = new Representation('Static class properties', 'statics');
+        $statics->contents = self::$cache[$class];
+
+        foreach ($reflection->getProperties(ReflectionProperty::IS_STATIC) as $static) {
+            $prop = new BasicObject();
+            $prop->name = '$'.$static->getName();
+            $prop->depth = $o->depth + 1;
+            $prop->static = true;
+            $prop->operator = BasicObject::OPERATOR_STATIC;
+            $prop->owner_class = $static->getDeclaringClass()->name;
+
+            $prop->access = BasicObject::ACCESS_PUBLIC;
+            if ($static->isProtected()) {
+                $prop->access = BasicObject::ACCESS_PROTECTED;
+            } elseif ($static->isPrivate()) {
+                $prop->access = BasicObject::ACCESS_PRIVATE;
+            }
+
+            if ($this->parser->childHasPath($o, $prop)) {
+                $prop->access_path = '\\'.$prop->owner_class.'::'.$prop->name;
+            }
+
+            $static->setAccessible(true);
+            $static = $static->getValue();
+            $statics->contents[] = $this->parser->parse($static, $prop);
+        }
+
+        if (empty($statics->contents)) {
+            return;
+        }
+
+        \usort($statics->contents, array('Kint\\Parser\\ClassStaticsPlugin', 'sort'));
+
+        $o->addRepresentation($statics);
+    }
+
+    private static function sort(BasicObject $a, BasicObject $b)
+    {
+        $sort = ((int) $a->const) - ((int) $b->const);
+        if ($sort) {
+            return $sort;
+        }
+
+        $sort = BasicObject::sortByAccess($a, $b);
+        if ($sort) {
+            return $sort;
+        }
+
+        return InstanceObject::sortByHierarchy($a->owner_class, $b->owner_class);
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ClosurePlugin.php b/system/ThirdParty/Kint/Parser/ClosurePlugin.php
new file mode 100644
index 0000000..73e367b
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ClosurePlugin.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Closure;
+use Kint\Object\BasicObject;
+use Kint\Object\ClosureObject;
+use Kint\Object\ParameterObject;
+use Kint\Object\Representation\Representation;
+use ReflectionFunction;
+
+class ClosurePlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof Closure) {
+            return;
+        }
+
+        $object = new ClosureObject();
+        $object->transplant($o);
+        $o = $object;
+        $object->removeRepresentation('properties');
+
+        $closure = new ReflectionFunction($var);
+
+        $o->filename = $closure->getFileName();
+        $o->startline = $closure->getStartLine();
+
+        foreach ($closure->getParameters() as $param) {
+            $o->parameters[] = new ParameterObject($param);
+        }
+
+        $p = new Representation('Parameters');
+        $p->contents = &$o->parameters;
+        $o->addRepresentation($p, 0);
+
+        $statics = array();
+
+        if (\method_exists($closure, 'getClosureThis') && $v = $closure->getClosureThis()) {
+            $statics = array('this' => $v);
+        }
+
+        if (\count($statics = $statics + $closure->getStaticVariables())) {
+            $statics_parsed = array();
+
+            foreach ($statics as $name => &$static) {
+                $obj = BasicObject::blank('$'.$name);
+                $obj->depth = $o->depth + 1;
+                $statics_parsed[$name] = $this->parser->parse($static, $obj);
+                if (null === $statics_parsed[$name]->value) {
+                    $statics_parsed[$name]->access_path = null;
+                }
+            }
+
+            $r = new Representation('Uses');
+            $r->contents = $statics_parsed;
+            $o->addRepresentation($r, 0);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ColorPlugin.php b/system/ThirdParty/Kint/Parser/ColorPlugin.php
new file mode 100644
index 0000000..0d748f2
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ColorPlugin.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\ColorRepresentation;
+
+class ColorPlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (\strlen($var) > 32) {
+            return;
+        }
+
+        $trimmed = \strtolower(\trim($var));
+
+        if (!isset(ColorRepresentation::$color_map[$trimmed]) && !\preg_match('/^(?:(?:rgb|hsl)[^\\)]{6,}\\)|#[0-9a-fA-F]{3,8})$/', $trimmed)) {
+            return;
+        }
+
+        $rep = new ColorRepresentation($var);
+
+        if ($rep->variant) {
+            $o->removeRepresentation($o->value);
+            $o->addRepresentation($rep, 0);
+            $o->hints[] = 'color';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php b/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php
new file mode 100644
index 0000000..ec08d31
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php
@@ -0,0 +1,328 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use DOMNamedNodeMap;
+use DOMNode;
+use DOMNodeList;
+use Kint\Object\BasicObject;
+use Kint\Object\InstanceObject;
+use Kint\Object\Representation\Representation;
+
+/**
+ * The DOMDocument parser plugin is particularly useful as it is both the only
+ * way to see inside the DOMNode without print_r, and the only way to see mixed
+ * text and node inside XML (SimpleXMLElement will strip out the text).
+ */
+class DOMDocumentPlugin extends Plugin
+{
+    /**
+     * List of properties to skip parsing.
+     *
+     * The properties of a DOMNode can do a *lot* of damage to debuggers. The
+     * DOMNode contains not one, not two, not three, not four, not 5, not 6,
+     * not 7 but 8 different ways to recurse into itself:
+     * * firstChild
+     * * lastChild
+     * * previousSibling
+     * * nextSibling
+     * * ownerDocument
+     * * parentNode
+     * * childNodes
+     * * attributes
+     *
+     * All of this combined: the tiny SVGs used as the caret in Kint are already
+     * enough to make parsing and rendering take over a second, and send memory
+     * usage over 128 megs. So we blacklist every field we don't strictly need
+     * and hope that that's good enough.
+     *
+     * In retrospect - this is probably why print_r does the same
+     *
+     * @var array
+     */
+    public static $blacklist = array(
+        'parentNode' => 'DOMNode',
+        'firstChild' => 'DOMNode',
+        'lastChild' => 'DOMNode',
+        'previousSibling' => 'DOMNode',
+        'nextSibling' => 'DOMNode',
+        'ownerDocument' => 'DOMDocument',
+    );
+
+    /**
+     * Show all properties and methods.
+     *
+     * @var bool
+     */
+    public static $verbose = false;
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$o instanceof InstanceObject) {
+            return;
+        }
+
+        if ($var instanceof DOMNamedNodeMap || $var instanceof DOMNodeList) {
+            return $this->parseList($var, $o, $trigger);
+        }
+
+        if ($var instanceof DOMNode) {
+            return $this->parseNode($var, $o);
+        }
+    }
+
+    protected function parseList(&$var, InstanceObject &$o, $trigger)
+    {
+        // Recursion should never happen, should always be stopped at the parent
+        // DOMNode.  Depth limit on the other hand we're going to skip since
+        // that would show an empty iterator and rather useless. Let the depth
+        // limit hit the children (DOMNodeList only has DOMNode as children)
+        if ($trigger & Parser::TRIGGER_RECURSION) {
+            return;
+        }
+
+        $o->size = $var->length;
+        if (0 === $o->size) {
+            $o->replaceRepresentation(new Representation('Iterator'));
+            $o->size = null;
+
+            return;
+        }
+
+        // Depth limit
+        // Make empty iterator representation since we need it in DOMNode to point out depth limits
+        if ($this->parser->getDepthLimit() && $o->depth + 1 >= $this->parser->getDepthLimit()) {
+            $b = new BasicObject();
+            $b->name = $o->classname.' Iterator Contents';
+            $b->access_path = 'iterator_to_array('.$o->access_path.')';
+            $b->depth = $o->depth + 1;
+            $b->hints[] = 'depth_limit';
+
+            $r = new Representation('Iterator');
+            $r->contents = array($b);
+            $o->replaceRepresentation($r, 0);
+
+            return;
+        }
+
+        $data = \iterator_to_array($var);
+
+        $r = new Representation('Iterator');
+        $o->replaceRepresentation($r, 0);
+
+        foreach ($data as $key => $item) {
+            $base_obj = new BasicObject();
+            $base_obj->depth = $o->depth + 1;
+            $base_obj->name = $item->nodeName;
+
+            if ($o->access_path) {
+                if ($var instanceof DOMNamedNodeMap) {
+                    $base_obj->access_path = $o->access_path.'->getNamedItem('.\var_export($key, true).')';
+                } elseif ($var instanceof DOMNodeList) {
+                    $base_obj->access_path = $o->access_path.'->item('.\var_export($key, true).')';
+                } else {
+                    $base_obj->access_path = 'iterator_to_array('.$o->access_path.')';
+                }
+            }
+
+            $r->contents[] = $this->parser->parse($item, $base_obj);
+        }
+    }
+
+    protected function parseNode(&$var, InstanceObject &$o)
+    {
+        // Fill the properties
+        // They can't be enumerated through reflection or casting,
+        // so we have to trust the docs and try them one at a time
+        $known_properties = array(
+            'nodeValue',
+            'childNodes',
+            'attributes',
+        );
+
+        if (self::$verbose) {
+            $known_properties = array(
+                'nodeName',
+                'nodeValue',
+                'nodeType',
+                'parentNode',
+                'childNodes',
+                'firstChild',
+                'lastChild',
+                'previousSibling',
+                'nextSibling',
+                'attributes',
+                'ownerDocument',
+                'namespaceURI',
+                'prefix',
+                'localName',
+                'baseURI',
+                'textContent',
+            );
+        }
+
+        $childNodes = array();
+        $attributes = array();
+
+        $rep = $o->value;
+
+        foreach ($known_properties as $prop) {
+            $prop_obj = $this->parseProperty($o, $prop, $var);
+            $rep->contents[] = $prop_obj;
+
+            if ('childNodes' === $prop) {
+                $childNodes = $prop_obj->getRepresentation('iterator');
+            } elseif ('attributes' === $prop) {
+                $attributes = $prop_obj->getRepresentation('iterator');
+            }
+        }
+
+        if (!self::$verbose) {
+            $o->removeRepresentation('methods');
+            $o->removeRepresentation('properties');
+        }
+
+        // Attributes and comments and text nodes don't
+        // need children or attributes of their own
+        if (\in_array($o->classname, array('DOMAttr', 'DOMText', 'DOMComment'), true)) {
+            return;
+        }
+
+        // Set the attributes
+        if ($attributes) {
+            $a = new Representation('Attributes');
+            foreach ($attributes->contents as $attribute) {
+                $a->contents[] = self::textualNodeToString($attribute);
+            }
+            $o->addRepresentation($a, 0);
+        }
+
+        // Set the children
+        if ($childNodes) {
+            $c = new Representation('Children');
+
+            if (1 === \count($childNodes->contents) && ($node = \reset($childNodes->contents)) && \in_array('depth_limit', $node->hints, true)) {
+                $n = new InstanceObject();
+                $n->transplant($node);
+                $n->name = 'childNodes';
+                $n->classname = 'DOMNodeList';
+                $c->contents = array($n);
+            } else {
+                foreach ($childNodes->contents as $index => $node) {
+                    // Shortcircuit text nodes to plain strings
+                    if ('DOMText' === $node->classname || 'DOMComment' === $node->classname) {
+                        $node = self::textualNodeToString($node);
+
+                        // And remove them if they're empty
+                        if (\ctype_space($node->value->contents) || '' === $node->value->contents) {
+                            continue;
+                        }
+                    }
+
+                    $c->contents[] = $node;
+                }
+            }
+
+            $o->addRepresentation($c, 0);
+        }
+
+        if (isset($c) && \count($c->contents)) {
+            $o->size = \count($c->contents);
+        }
+
+        if (!$o->size) {
+            $o->size = null;
+        }
+    }
+
+    protected function parseProperty(InstanceObject $o, $prop, &$var)
+    {
+        // Duplicating (And slightly optimizing) the Parser::parseObject() code here
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth + 1;
+        $base_obj->owner_class = $o->classname;
+        $base_obj->name = $prop;
+        $base_obj->operator = BasicObject::OPERATOR_OBJECT;
+        $base_obj->access = BasicObject::ACCESS_PUBLIC;
+
+        if (null !== $o->access_path) {
+            $base_obj->access_path = $o->access_path;
+
+            if (\preg_match('/^[A-Za-z0-9_]+$/', $base_obj->name)) {
+                $base_obj->access_path .= '->'.$base_obj->name;
+            } else {
+                $base_obj->access_path .= '->{'.\var_export($base_obj->name, true).'}';
+            }
+        }
+
+        if (!isset($var->{$prop})) {
+            $base_obj->type = 'null';
+        } elseif (isset(self::$blacklist[$prop])) {
+            $b = new InstanceObject();
+            $b->transplant($base_obj);
+            $base_obj = $b;
+
+            $base_obj->hints[] = 'blacklist';
+            $base_obj->classname = self::$blacklist[$prop];
+        } elseif ('attributes' === $prop) {
+            $base_obj = $this->parser->parseDeep($var->{$prop}, $base_obj);
+        } else {
+            $base_obj = $this->parser->parse($var->{$prop}, $base_obj);
+        }
+
+        return $base_obj;
+    }
+
+    protected static function textualNodeToString(InstanceObject $o)
+    {
+        if (empty($o->value) || empty($o->value->contents) || empty($o->classname)) {
+            return;
+        }
+
+        if (!\in_array($o->classname, array('DOMText', 'DOMAttr', 'DOMComment'), true)) {
+            return;
+        }
+
+        foreach ($o->value->contents as $property) {
+            if ('nodeValue' === $property->name) {
+                $ret = clone $property;
+                $ret->name = $o->name;
+
+                return $ret;
+            }
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/DateTimePlugin.php b/system/ThirdParty/Kint/Parser/DateTimePlugin.php
new file mode 100644
index 0000000..f2cebb6
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/DateTimePlugin.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use DateTime;
+use Kint\Object\BasicObject;
+use Kint\Object\DateTimeObject;
+
+class DateTimePlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof DateTime) {
+            return;
+        }
+
+        $object = new DateTimeObject($var);
+        $object->transplant($o);
+
+        $o = $object;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/FsPathPlugin.php b/system/ThirdParty/Kint/Parser/FsPathPlugin.php
new file mode 100644
index 0000000..3a8d1e0
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/FsPathPlugin.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\SplFileInfoRepresentation;
+use SplFileInfo;
+
+class FsPathPlugin extends Plugin
+{
+    public static $blacklist = array('/', '.');
+
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (\strlen($var) > 2048) {
+            return;
+        }
+
+        if (!\preg_match('/[\\/\\'.DIRECTORY_SEPARATOR.']/', $var)) {
+            return;
+        }
+
+        if (\preg_match('/[?<>"*|]/', $var)) {
+            return;
+        }
+
+        if (!@\file_exists($var)) {
+            return;
+        }
+
+        if (\in_array($var, self::$blacklist, true)) {
+            return;
+        }
+
+        $r = new SplFileInfoRepresentation(new SplFileInfo($var));
+        $r->hints[] = 'fspath';
+        $o->addRepresentation($r, 0);
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/IteratorPlugin.php b/system/ThirdParty/Kint/Parser/IteratorPlugin.php
new file mode 100644
index 0000000..0487a38
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/IteratorPlugin.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+use Traversable;
+
+class IteratorPlugin extends Plugin
+{
+    /**
+     * List of classes and interfaces to blacklist.
+     *
+     * Certain classes (Such as PDOStatement) irreversibly lose information
+     * when traversed. Others are just huge. Either way, put them in here
+     * and you won't have to worry about them being parsed.
+     *
+     * @var array
+     */
+    public static $blacklist = array(
+        'DOMNamedNodeMap',
+        'DOMNodeList',
+        'mysqli_result',
+        'PDOStatement',
+        'SplFileObject',
+    );
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof Traversable) {
+            return;
+        }
+
+        foreach (self::$blacklist as $class) {
+            if ($var instanceof $class) {
+                $b = new BasicObject();
+                $b->name = $class.' Iterator Contents';
+                $b->access_path = 'iterator_to_array('.$o->access_path.', true)';
+                $b->depth = $o->depth + 1;
+                $b->hints[] = 'blacklist';
+
+                $r = new Representation('Iterator');
+                $r->contents = array($b);
+
+                $o->addRepresentation($r);
+
+                return;
+            }
+        }
+
+        /** @var array|false */
+        $data = \iterator_to_array($var);
+
+        if (false === $data) {
+            return;
+        }
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth;
+
+        if ($o->access_path) {
+            $base_obj->access_path = 'iterator_to_array('.$o->access_path.')';
+        }
+
+        $r = new Representation('Iterator');
+        $r->contents = $this->parser->parse($data, $base_obj);
+        $r->contents = $r->contents->value->contents;
+
+        $primary = $o->getRepresentations();
+        $primary = \reset($primary);
+        if ($primary && $primary === $o->value && $primary->contents === array()) {
+            $o->addRepresentation($r, 0);
+        } else {
+            $o->addRepresentation($r);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/JsonPlugin.php b/system/ThirdParty/Kint/Parser/JsonPlugin.php
new file mode 100644
index 0000000..84b2519
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/JsonPlugin.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+
+class JsonPlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!isset($var[0]) || ('{' !== $var[0] && '[' !== $var[0])) {
+            return;
+        }
+
+        $json = \json_decode($var, true);
+
+        if (!$json) {
+            return;
+        }
+
+        $json = (array) $json;
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth;
+
+        if ($o->access_path) {
+            $base_obj->access_path = 'json_decode('.$o->access_path.', true)';
+        }
+
+        $r = new Representation('Json');
+        $r->contents = $this->parser->parse($json, $base_obj);
+
+        if (!\in_array('depth_limit', $r->contents->hints, true)) {
+            $r->contents = $r->contents->value->contents;
+        }
+
+        $o->addRepresentation($r, 0);
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/MicrotimePlugin.php b/system/ThirdParty/Kint/Parser/MicrotimePlugin.php
new file mode 100644
index 0000000..5062b59
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/MicrotimePlugin.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\MicrotimeRepresentation;
+
+class MicrotimePlugin extends Plugin
+{
+    private static $last = null;
+    private static $start = null;
+    private static $times = 0;
+    private static $group = 0;
+
+    public function getTypes()
+    {
+        return array('string', 'double');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (0 !== $o->depth) {
+            return;
+        }
+
+        if (\is_string($var)) {
+            if ('microtime()' !== $o->name || !\preg_match('/^0\\.[0-9]{8} [0-9]{10}$/', $var)) {
+                return;
+            }
+
+            $usec = (int) \substr($var, 2, 6);
+            $sec = (int) \substr($var, 11, 10);
+        } else {
+            if ('microtime(...)' !== $o->name) {
+                return;
+            }
+
+            $sec = \floor($var);
+            $usec = $var - $sec;
+            $usec = \floor($usec * 1000000);
+        }
+
+        $time = $sec + ($usec / 1000000);
+
+        if (null !== self::$last) {
+            $last_time = self::$last[0] + (self::$last[1] / 1000000);
+            $lap = $time - $last_time;
+            ++self::$times;
+        } else {
+            $lap = null;
+            self::$start = $time;
+        }
+
+        self::$last = array($sec, $usec);
+
+        if (null !== $lap) {
+            $total = $time - self::$start;
+            $r = new MicrotimeRepresentation($sec, $usec, self::$group, $lap, $total, self::$times);
+        } else {
+            $r = new MicrotimeRepresentation($sec, $usec, self::$group);
+        }
+        $r->contents = $var;
+        $r->implicit_label = true;
+
+        $o->removeRepresentation($o->value);
+        $o->addRepresentation($r);
+        $o->hints[] = 'microtime';
+    }
+
+    public static function clean()
+    {
+        self::$last = null;
+        self::$start = null;
+        self::$times = 0;
+        ++self::$group;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/MysqliPlugin.php b/system/ThirdParty/Kint/Parser/MysqliPlugin.php
new file mode 100644
index 0000000..265299b
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/MysqliPlugin.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Mysqli;
+
+/**
+ * Adds support for Mysqli object parsing.
+ *
+ * Due to the way mysqli is implemented in PHP, this will cause
+ * warnings on certain Mysqli objects if screaming is enabled.
+ */
+class MysqliPlugin extends Plugin
+{
+    // These 'properties' are actually globals
+    protected $always_readable = array(
+        'client_version' => true,
+        'connect_errno' => true,
+        'connect_error' => true,
+    );
+
+    // These are readable on empty mysqli objects, but not on failed connections
+    protected $empty_readable = array(
+        'client_info' => true,
+        'errno' => true,
+        'error' => true,
+    );
+
+    // These are only readable on connected mysqli objects
+    protected $connected_readable = array(
+        'affected_rows' => true,
+        'error_list' => true,
+        'field_count' => true,
+        'host_info' => true,
+        'info' => true,
+        'insert_id' => true,
+        'server_info' => true,
+        'server_version' => true,
+        'stat' => true,
+        'sqlstate' => true,
+        'protocol_version' => true,
+        'thread_id' => true,
+        'warning_count' => true,
+    );
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_COMPLETE;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof Mysqli) {
+            return;
+        }
+
+        $connected = false;
+        $empty = false;
+
+        if (\is_string(@$var->sqlstate)) {
+            $connected = true;
+        } elseif (\is_string(@$var->client_info)) {
+            $empty = true;
+        }
+
+        foreach ($o->value->contents as $key => $obj) {
+            if (isset($this->connected_readable[$obj->name])) {
+                if (!$connected) {
+                    continue;
+                }
+            } elseif (isset($this->empty_readable[$obj->name])) {
+                if (!$connected && !$empty) {
+                    continue;
+                }
+            } elseif (!isset($this->always_readable[$obj->name])) {
+                continue;
+            }
+
+            if ('null' !== $obj->type) {
+                continue;
+            }
+
+            $param = $var->{$obj->name};
+
+            if (null === $param) {
+                continue;
+            }
+
+            $base = BasicObject::blank($obj->name, $obj->access_path);
+
+            $base->depth = $obj->depth;
+            $base->owner_class = $obj->owner_class;
+            $base->operator = $obj->operator;
+            $base->access = $obj->access;
+            $base->reference = $obj->reference;
+
+            $o->value->contents[$key] = $this->parser->parse($param, $base);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/Parser.php b/system/ThirdParty/Kint/Parser/Parser.php
new file mode 100644
index 0000000..b7f81c6
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/Parser.php
@@ -0,0 +1,604 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use DomainException;
+use Exception;
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+use Kint\Object\InstanceObject;
+use Kint\Object\Representation\Representation;
+use Kint\Object\ResourceObject;
+use ReflectionObject;
+use stdClass;
+
+class Parser
+{
+    /**
+     * Plugin triggers.
+     *
+     * These are constants indicating trigger points for plugins
+     *
+     * BEGIN: Before normal parsing
+     * SUCCESS: After successful parsing
+     * RECURSION: After parsing cancelled by recursion
+     * DEPTH_LIMIT: After parsing cancelled by depth limit
+     * COMPLETE: SUCCESS | RECURSION | DEPTH_LIMIT
+     *
+     * While a plugin's getTriggers may return any of these
+     */
+    const TRIGGER_NONE = 0;
+    const TRIGGER_BEGIN = 1;
+    const TRIGGER_SUCCESS = 2;
+    const TRIGGER_RECURSION = 4;
+    const TRIGGER_DEPTH_LIMIT = 8;
+    const TRIGGER_COMPLETE = 14;
+
+    protected $caller_class;
+    protected $depth_limit = false;
+    protected $marker;
+    protected $object_hashes = array();
+    protected $parse_break = false;
+    protected $plugins = array();
+
+    /**
+     * @param false|int   $depth_limit Maximum depth to parse data
+     * @param null|string $caller      Caller class name
+     */
+    public function __construct($depth_limit = false, $caller = null)
+    {
+        $this->marker = \uniqid("kint\0", true);
+
+        $this->caller_class = $caller;
+
+        if ($depth_limit) {
+            $this->depth_limit = $depth_limit;
+        }
+    }
+
+    /**
+     * Set the caller class.
+     *
+     * @param null|string $caller Caller class name
+     */
+    public function setCallerClass($caller = null)
+    {
+        $this->noRecurseCall();
+
+        $this->caller_class = $caller;
+    }
+
+    public function getCallerClass()
+    {
+        return $this->caller_class;
+    }
+
+    /**
+     * Set the depth limit.
+     *
+     * @param false|int $depth_limit Maximum depth to parse data
+     */
+    public function setDepthLimit($depth_limit = false)
+    {
+        $this->noRecurseCall();
+
+        $this->depth_limit = $depth_limit;
+    }
+
+    public function getDepthLimit()
+    {
+        return $this->depth_limit;
+    }
+
+    /**
+     * Disables the depth limit and parses a variable.
+     *
+     * This should not be used unless you know what you're doing!
+     *
+     * @param mixed       $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    public function parseDeep(&$var, BasicObject $o)
+    {
+        $depth_limit = $this->depth_limit;
+        $this->depth_limit = false;
+
+        $out = $this->parse($var, $o);
+
+        $this->depth_limit = $depth_limit;
+
+        return $out;
+    }
+
+    /**
+     * Parses a variable into a Kint object structure.
+     *
+     * @param mixed       $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    public function parse(&$var, BasicObject $o)
+    {
+        $o->type = \strtolower(\gettype($var));
+
+        if (!$this->applyPlugins($var, $o, self::TRIGGER_BEGIN)) {
+            return $o;
+        }
+
+        switch ($o->type) {
+            case 'array':
+                return $this->parseArray($var, $o);
+            case 'boolean':
+            case 'double':
+            case 'integer':
+            case 'null':
+                return $this->parseGeneric($var, $o);
+            case 'object':
+                return $this->parseObject($var, $o);
+            case 'resource':
+                return $this->parseResource($var, $o);
+            case 'string':
+                return $this->parseString($var, $o);
+            default:
+                return $this->parseUnknown($var, $o);
+        }
+    }
+
+    public function addPlugin(Plugin $p)
+    {
+        if (!$types = $p->getTypes()) {
+            return false;
+        }
+
+        if (!$triggers = $p->getTriggers()) {
+            return false;
+        }
+
+        $p->setParser($this);
+
+        foreach ($types as $type) {
+            if (!isset($this->plugins[$type])) {
+                $this->plugins[$type] = array(
+                    self::TRIGGER_BEGIN => array(),
+                    self::TRIGGER_SUCCESS => array(),
+                    self::TRIGGER_RECURSION => array(),
+                    self::TRIGGER_DEPTH_LIMIT => array(),
+                );
+            }
+
+            foreach ($this->plugins[$type] as $trigger => &$pool) {
+                if ($triggers & $trigger) {
+                    $pool[] = $p;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function clearPlugins()
+    {
+        $this->plugins = array();
+    }
+
+    public function haltParse()
+    {
+        $this->parse_break = true;
+    }
+
+    public function childHasPath(InstanceObject $parent, BasicObject $child)
+    {
+        if ('object' === $parent->type && (null !== $parent->access_path || $child->static || $child->const)) {
+            if (BasicObject::ACCESS_PUBLIC === $child->access) {
+                return true;
+            }
+
+            if (BasicObject::ACCESS_PRIVATE === $child->access && $this->caller_class) {
+                if ($this->caller_class === $child->owner_class) {
+                    return true;
+                }
+            } elseif (BasicObject::ACCESS_PROTECTED === $child->access && $this->caller_class) {
+                if ($this->caller_class === $child->owner_class) {
+                    return true;
+                }
+
+                if (\is_subclass_of($this->caller_class, $child->owner_class)) {
+                    return true;
+                }
+
+                if (\is_subclass_of($child->owner_class, $this->caller_class)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns an array without the recursion marker in it.
+     *
+     * DO NOT pass an array that has had it's marker removed back
+     * into the parser, it will result in an extra recursion
+     *
+     * @param array $array Array potentially containing a recursion marker
+     *
+     * @return array Array with recursion marker removed
+     */
+    public function getCleanArray(array $array)
+    {
+        unset($array[$this->marker]);
+
+        return $array;
+    }
+
+    protected function noRecurseCall()
+    {
+        $bt = \debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS);
+
+        $caller_frame = array(
+            'function' => __FUNCTION__,
+        );
+
+        while (isset($bt[0]['object']) && $bt[0]['object'] === $this) {
+            $caller_frame = \array_shift($bt);
+        }
+
+        foreach ($bt as $frame) {
+            if (isset($frame['object']) && $frame['object'] === $this) {
+                throw new DomainException(__CLASS__.'::'.$caller_frame['function'].' cannot be called from inside a parse');
+            }
+        }
+    }
+
+    private function parseGeneric(&$var, BasicObject $o)
+    {
+        $rep = new Representation('Contents');
+        $rep->contents = $var;
+        $rep->implicit_label = true;
+        $o->addRepresentation($rep);
+        $o->value = $rep;
+
+        $this->applyPlugins($var, $o, self::TRIGGER_SUCCESS);
+
+        return $o;
+    }
+
+    /**
+     * Parses a string into a Kint BlobObject structure.
+     *
+     * @param string      $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    private function parseString(&$var, BasicObject $o)
+    {
+        $string = new BlobObject();
+        $string->transplant($o);
+        $string->encoding = BlobObject::detectEncoding($var);
+        $string->size = BlobObject::strlen($var, $string->encoding);
+
+        $rep = new Representation('Contents');
+        $rep->contents = $var;
+        $rep->implicit_label = true;
+
+        $string->addRepresentation($rep);
+        $string->value = $rep;
+
+        $this->applyPlugins($var, $string, self::TRIGGER_SUCCESS);
+
+        return $string;
+    }
+
+    /**
+     * Parses an array into a Kint object structure.
+     *
+     * @param array       $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    private function parseArray(array &$var, BasicObject $o)
+    {
+        $array = new BasicObject();
+        $array->transplant($o);
+        $array->size = \count($var);
+
+        if (isset($var[$this->marker])) {
+            --$array->size;
+            $array->hints[] = 'recursion';
+
+            $this->applyPlugins($var, $array, self::TRIGGER_RECURSION);
+
+            return $array;
+        }
+
+        $rep = new Representation('Contents');
+        $rep->implicit_label = true;
+        $array->addRepresentation($rep);
+        $array->value = $rep;
+
+        if (!$array->size) {
+            $this->applyPlugins($var, $array, self::TRIGGER_SUCCESS);
+
+            return $array;
+        }
+
+        if ($this->depth_limit && $o->depth >= $this->depth_limit) {
+            $array->hints[] = 'depth_limit';
+
+            $this->applyPlugins($var, $array, self::TRIGGER_DEPTH_LIMIT);
+
+            return $array;
+        }
+
+        $copy = \array_values($var);
+
+        // It's really really hard to access numeric string keys in arrays,
+        // and it's really really hard to access integer properties in
+        // objects, so we just use array_values and index by counter to get
+        // at it reliably for reference testing. This also affects access
+        // paths since it's pretty much impossible to access these things
+        // without complicated stuff you should never need to do.
+        $i = 0;
+
+        // Set the marker for recursion
+        $var[$this->marker] = $array->depth;
+
+        $refmarker = new stdClass();
+
+        foreach ($var as $key => &$val) {
+            if ($key === $this->marker) {
+                continue;
+            }
+
+            $child = new BasicObject();
+            $child->name = $key;
+            $child->depth = $array->depth + 1;
+            $child->access = BasicObject::ACCESS_NONE;
+            $child->operator = BasicObject::OPERATOR_ARRAY;
+
+            if (null !== $array->access_path) {
+                if (\is_string($key) && (string) (int) $key === $key) {
+                    $child->access_path = 'array_values('.$array->access_path.')['.$i.']'; // @codeCoverageIgnore
+                } else {
+                    $child->access_path = $array->access_path.'['.\var_export($key, true).']';
+                }
+            }
+
+            $stash = $val;
+            $copy[$i] = $refmarker;
+            if ($val === $refmarker) {
+                $child->reference = true;
+                $val = $stash;
+            }
+
+            $rep->contents[] = $this->parse($val, $child);
+            ++$i;
+        }
+
+        $this->applyPlugins($var, $array, self::TRIGGER_SUCCESS);
+        unset($var[$this->marker]);
+
+        return $array;
+    }
+
+    /**
+     * Parses an object into a Kint InstanceObject structure.
+     *
+     * @param object      $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    private function parseObject(&$var, BasicObject $o)
+    {
+        $hash = \spl_object_hash($var);
+        $values = (array) $var;
+
+        $object = new InstanceObject();
+        $object->transplant($o);
+        $object->classname = \get_class($var);
+        $object->hash = $hash;
+        $object->size = \count($values);
+
+        if (isset($this->object_hashes[$hash])) {
+            $object->hints[] = 'recursion';
+
+            $this->applyPlugins($var, $object, self::TRIGGER_RECURSION);
+
+            return $object;
+        }
+
+        $this->object_hashes[$hash] = $object;
+
+        if ($this->depth_limit && $o->depth >= $this->depth_limit) {
+            $object->hints[] = 'depth_limit';
+
+            $this->applyPlugins($var, $object, self::TRIGGER_DEPTH_LIMIT);
+            unset($this->object_hashes[$hash]);
+
+            return $object;
+        }
+
+        $reflector = new ReflectionObject($var);
+
+        if ($reflector->isUserDefined()) {
+            $object->filename = $reflector->getFileName();
+            $object->startline = $reflector->getStartLine();
+        }
+
+        $rep = new Representation('Properties');
+
+        $copy = \array_values($values);
+        $refmarker = new stdClass();
+        $i = 0;
+
+        // Reflection will not show parent classes private properties, and if a
+        // property was unset it will happly trigger a notice looking for it.
+        foreach ($values as $key => &$val) {
+            // Casting object to array:
+            // private properties show in the form "\0$owner_class_name\0$property_name";
+            // protected properties show in the form "\0*\0$property_name";
+            // public properties show in the form "$property_name";
+            // http://www.php.net/manual/en/language.types.array.php#language.types.array.casting
+
+            $child = new BasicObject();
+            $child->depth = $object->depth + 1;
+            $child->owner_class = $object->classname;
+            $child->operator = BasicObject::OPERATOR_OBJECT;
+            $child->access = BasicObject::ACCESS_PUBLIC;
+
+            $split_key = \explode("\0", $key, 3);
+
+            if (3 === \count($split_key) && '' === $split_key[0]) {
+                $child->name = $split_key[2];
+                if ('*' === $split_key[1]) {
+                    $child->access = BasicObject::ACCESS_PROTECTED;
+                } else {
+                    $child->access = BasicObject::ACCESS_PRIVATE;
+                    $child->owner_class = $split_key[1];
+                }
+            } elseif (KINT_PHP72) {
+                $child->name = (string) $key;
+            } else {
+                $child->name = $key; // @codeCoverageIgnore
+            }
+
+            if ($this->childHasPath($object, $child)) {
+                $child->access_path = $object->access_path;
+
+                if (!KINT_PHP72 && \is_int($child->name)) {
+                    $child->access_path = 'array_values((array) '.$child->access_path.')['.$i.']'; // @codeCoverageIgnore
+                } elseif (\preg_match('/^[a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*$/', $child->name)) {
+                    $child->access_path .= '->'.$child->name;
+                } else {
+                    $child->access_path .= '->{'.\var_export((string) $child->name, true).'}';
+                }
+            }
+
+            $stash = $val;
+            $copy[$i] = $refmarker;
+            if ($val === $refmarker) {
+                $child->reference = true;
+                $val = $stash;
+            }
+
+            $rep->contents[] = $this->parse($val, $child);
+            ++$i;
+        }
+
+        $object->addRepresentation($rep);
+        $object->value = $rep;
+        $this->applyPlugins($var, $object, self::TRIGGER_SUCCESS);
+        unset($this->object_hashes[$hash]);
+
+        return $object;
+    }
+
+    /**
+     * Parses a resource into a Kint ResourceObject structure.
+     *
+     * @param resource    $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    private function parseResource(&$var, BasicObject $o)
+    {
+        $resource = new ResourceObject();
+        $resource->transplant($o);
+        $resource->resource_type = \get_resource_type($var);
+
+        $this->applyPlugins($var, $resource, self::TRIGGER_SUCCESS);
+
+        return $resource;
+    }
+
+    /**
+     * Parses an unknown into a Kint object structure.
+     *
+     * @param mixed       $var The input variable
+     * @param BasicObject $o   The base object
+     *
+     * @return BasicObject
+     */
+    private function parseUnknown(&$var, BasicObject $o)
+    {
+        $o->type = 'unknown';
+        $this->applyPlugins($var, $o, self::TRIGGER_SUCCESS);
+
+        return $o;
+    }
+
+    /**
+     * Applies plugins for an object type.
+     *
+     * @param mixed       $var     variable
+     * @param BasicObject $o       Kint object parsed so far
+     * @param int         $trigger The trigger to check for the plugins
+     *
+     * @return bool Continue parsing
+     */
+    private function applyPlugins(&$var, BasicObject &$o, $trigger)
+    {
+        $break_stash = $this->parse_break;
+
+        /** @var bool Psalm bug workaround */
+        $this->parse_break = false;
+
+        $plugins = array();
+
+        if (isset($this->plugins[$o->type][$trigger])) {
+            $plugins = $this->plugins[$o->type][$trigger];
+        }
+
+        foreach ($plugins as $plugin) {
+            try {
+                $plugin->parse($var, $o, $trigger);
+            } catch (Exception $e) {
+                \trigger_error(
+                    'An exception ('.\get_class($e).') was thrown in '.$e->getFile().' on line '.$e->getLine().' while executing Kint Parser Plugin "'.\get_class($plugin).'". Error message: '.$e->getMessage(),
+                    E_USER_WARNING
+                );
+            }
+
+            if ($this->parse_break) {
+                $this->parse_break = $break_stash;
+
+                return false;
+            }
+        }
+
+        $this->parse_break = $break_stash;
+
+        return true;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/Plugin.php b/system/ThirdParty/Kint/Parser/Plugin.php
new file mode 100644
index 0000000..51d5f0b
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/Plugin.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+
+abstract class Plugin
+{
+    protected $parser;
+
+    public function setParser(Parser $p)
+    {
+        $this->parser = $p;
+    }
+
+    /**
+     * An array of types (As returned by gettype) for all data this plugin can operate on.
+     *
+     * @return array List of types
+     */
+    public function getTypes()
+    {
+        return array();
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_NONE;
+    }
+
+    abstract public function parse(&$variable, BasicObject &$o, $trigger);
+}
diff --git a/system/ThirdParty/Kint/Parser/ProxyPlugin.php b/system/ThirdParty/Kint/Parser/ProxyPlugin.php
new file mode 100644
index 0000000..3376d3a
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ProxyPlugin.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use InvalidArgumentException;
+use Kint\Object\BasicObject;
+
+class ProxyPlugin extends Plugin
+{
+    protected $types;
+    protected $triggers;
+    protected $callback;
+
+    public function __construct(array $types, $triggers, $callback)
+    {
+        if (!\is_int($triggers)) {
+            throw new InvalidArgumentException('ProxyPlugin triggers must be an int bitmask');
+        }
+
+        if (!\is_callable($callback)) {
+            throw new InvalidArgumentException('ProxyPlugin callback must be callable');
+        }
+
+        $this->types = $types;
+        $this->triggers = $triggers;
+        $this->callback = $callback;
+    }
+
+    public function getTypes()
+    {
+        return $this->types;
+    }
+
+    public function getTriggers()
+    {
+        return $this->triggers;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        return \call_user_func_array($this->callback, array(&$var, &$o, $trigger, $this->parser));
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/SerializePlugin.php b/system/ThirdParty/Kint/Parser/SerializePlugin.php
new file mode 100644
index 0000000..c5dadb8
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/SerializePlugin.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+
+class SerializePlugin extends Plugin
+{
+    /**
+     * Disables automatic unserialization on arrays and objects.
+     *
+     * As the PHP manual notes:
+     *
+     * > Unserialization can result in code being loaded and executed due to
+     * > object instantiation and autoloading, and a malicious user may be able
+     * > to exploit this.
+     *
+     * The natural way to stop that from happening is to just refuse to unserialize
+     * stuff by default. Which is what we're doing for anything that's not scalar.
+     *
+     * @var bool
+     */
+    public static $safe_mode = true;
+    public static $options = array(true);
+
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        $trimmed = \rtrim($var);
+
+        if ('N;' !== $trimmed && !\preg_match('/^(?:[COabis]:\\d+[:;]|d:\\d+(?:\\.\\d+);)/', $trimmed)) {
+            return;
+        }
+
+        if (!self::$safe_mode || !\in_array($trimmed[0], array('C', 'O', 'a'), true)) {
+            // Second parameter only supported on PHP 7
+            if (KINT_PHP70) {
+                // Suppress warnings on unserializeable variable
+                $data = @\unserialize($trimmed, self::$options);
+            } else {
+                $data = @\unserialize($trimmed);
+            }
+
+            if (false === $data && 'b:0;' !== \substr($trimmed, 0, 4)) {
+                return;
+            }
+        }
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth + 1;
+        $base_obj->name = 'unserialize('.$o->name.')';
+
+        if ($o->access_path) {
+            $base_obj->access_path = 'unserialize('.$o->access_path;
+            if (!KINT_PHP70 || self::$options === array(true)) {
+                $base_obj->access_path .= ')';
+            } elseif (self::$options === array(false)) {
+                $base_obj->access_path .= ', false)';
+            } else {
+                $base_obj->access_path .= ', Serialize::$options)';
+            }
+        }
+
+        $r = new Representation('Serialized');
+
+        if (isset($data)) {
+            $r->contents = $this->parser->parse($data, $base_obj);
+        } else {
+            $base_obj->hints[] = 'blacklist';
+            $r->contents = $base_obj;
+        }
+
+        $o->addRepresentation($r, 0);
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php b/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php
new file mode 100644
index 0000000..b90c863
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php
@@ -0,0 +1,154 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+use Kint\Object\Representation\Representation;
+use SimpleXMLElement;
+
+class SimpleXMLElementPlugin extends Plugin
+{
+    /**
+     * Show all properties and methods.
+     *
+     * @var bool
+     */
+    public static $verbose = false;
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof SimpleXMLElement) {
+            return;
+        }
+
+        $o->hints[] = 'simplexml_element';
+
+        if (!self::$verbose) {
+            $o->removeRepresentation('properties');
+            $o->removeRepresentation('iterator');
+            $o->removeRepresentation('methods');
+        }
+
+        // Attributes
+        $a = new Representation('Attributes');
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth;
+
+        if ($o->access_path) {
+            $base_obj->access_path = '(string) '.$o->access_path;
+        }
+
+        if ($attribs = $var->attributes()) {
+            $attribs = \iterator_to_array($attribs);
+            $attribs = \array_map('strval', $attribs);
+        } else {
+            $attribs = array();
+        }
+
+        // XML attributes are by definition strings and don't have children,
+        // so up the depth limit in case we're just below the limit since
+        // there won't be any recursive stuff anyway.
+        $a->contents = $this->parser->parseDeep($attribs, $base_obj)->value->contents;
+
+        $o->addRepresentation($a, 0);
+
+        // Children
+        // We need to check children() separately from the values we already parsed because
+        // text contents won't show up in children() but they will show up in properties.
+        //
+        // Why do we still need to check for attributes if we already have an attributes()
+        // method? Hell if I know!
+        $children = $var->children();
+
+        if ($o->value) {
+            $c = new Representation('Children');
+
+            foreach ($o->value->contents as $value) {
+                if ('@attributes' === $value->name) {
+                    continue;
+                }
+
+                if (isset($children->{$value->name})) {
+                    $i = 0;
+
+                    while (isset($children->{$value->name}[$i])) {
+                        $base_obj = new BasicObject();
+                        $base_obj->depth = $o->depth + 1;
+                        $base_obj->name = $value->name;
+                        if ($value->access_path) {
+                            $base_obj->access_path = $value->access_path.'['.$i.']';
+                        }
+
+                        $value = $this->parser->parse($children->{$value->name}[$i], $base_obj);
+
+                        if ($value->access_path && 'string' === $value->type) {
+                            $value->access_path = '(string) '.$value->access_path;
+                        }
+
+                        $c->contents[] = $value;
+
+                        ++$i;
+                    }
+                }
+            }
+
+            $o->size = \count($c->contents);
+
+            if (!$o->size) {
+                $o->size = null;
+
+                if (\strlen((string) $var)) {
+                    $base_obj = new BlobObject();
+                    $base_obj->depth = $o->depth + 1;
+                    $base_obj->name = $o->name;
+                    if ($o->access_path) {
+                        $base_obj->access_path = '(string) '.$o->access_path;
+                    }
+
+                    $value = (string) $var;
+
+                    $c = new Representation('Contents');
+                    $c->implicit_label = true;
+                    $c->contents = array($this->parser->parseDeep($value, $base_obj));
+                }
+            }
+
+            $o->addRepresentation($c, 0);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php b/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php
new file mode 100644
index 0000000..8b72193
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\SplFileInfoRepresentation;
+use SplFileInfo;
+use SplFileObject;
+
+class SplFileInfoPlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_COMPLETE;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof SplFileInfo || $var instanceof SplFileObject) {
+            return;
+        }
+
+        $r = new SplFileInfoRepresentation(clone $var);
+        $o->addRepresentation($r, 0);
+        $o->size = $r->getSize();
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php b/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php
new file mode 100644
index 0000000..03ff301
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use SplObjectStorage;
+
+class SplObjectStoragePlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_COMPLETE;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof SplObjectStorage || !($r = $o->getRepresentation('iterator'))) {
+            return;
+        }
+
+        $r = $o->getRepresentation('iterator');
+        if ($r) {
+            $o->size = !\is_array($r->contents) ? null : \count($r->contents);
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/StreamPlugin.php b/system/ThirdParty/Kint/Parser/StreamPlugin.php
new file mode 100644
index 0000000..464a3ff
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/StreamPlugin.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+use Kint\Object\ResourceObject;
+use Kint\Object\StreamObject;
+
+class StreamPlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('resource');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$o instanceof ResourceObject || 'stream' !== $o->resource_type) {
+            return;
+        }
+
+        if (!$meta = \stream_get_meta_data($var)) {
+            return;
+        }
+
+        $rep = new Representation('Stream');
+        $rep->implicit_label = true;
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth;
+
+        if ($o->access_path) {
+            $base_obj->access_path = 'stream_get_meta_data('.$o->access_path.')';
+        }
+
+        $rep->contents = $this->parser->parse($meta, $base_obj);
+
+        if (!\in_array('depth_limit', $rep->contents->hints, true)) {
+            $rep->contents = $rep->contents->value->contents;
+        }
+
+        $o->addRepresentation($rep, 0);
+        $o->value = $rep;
+
+        $stream = new StreamObject($meta);
+        $stream->transplant($o);
+        $o = $stream;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/TablePlugin.php b/system/ThirdParty/Kint/Parser/TablePlugin.php
new file mode 100644
index 0000000..510c4ff
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/TablePlugin.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+
+class TablePlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('array');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (empty($o->value->contents)) {
+            return;
+        }
+
+        $array = $this->parser->getCleanArray($var);
+
+        if (\count($array) < 2) {
+            return;
+        }
+
+        // Ensure this is an array of arrays and that all child arrays have the
+        // same keys. We don't care about their children - if there's another
+        // "table" inside we'll just make another one down the value tab
+        $keys = null;
+        foreach ($array as $elem) {
+            if (!\is_array($elem) || \count($elem) < 2) {
+                return;
+            }
+
+            if (null === $keys) {
+                $keys = \array_keys($elem);
+            } elseif (\array_keys($elem) !== $keys) {
+                return;
+            }
+        }
+
+        // Ensure none of the child arrays are recursion or depth limit. We
+        // don't care if their children are since they are the table cells
+        foreach ($o->value->contents as $childarray) {
+            if (empty($childarray->value->contents)) {
+                return;
+            }
+        }
+
+        // Objects by reference for the win! We can do a copy-paste of the value
+        // representation contents and just slap a new hint on there and hey
+        // presto we have our table representation with no extra memory used!
+        $table = new Representation('Table');
+        $table->contents = $o->value->contents;
+        $table->hints[] = 'table';
+        $o->addRepresentation($table, 0);
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ThrowablePlugin.php b/system/ThirdParty/Kint/Parser/ThrowablePlugin.php
new file mode 100644
index 0000000..8490d1d
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ThrowablePlugin.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Exception;
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\SourceRepresentation;
+use Kint\Object\ThrowableObject;
+use Throwable;
+
+class ThrowablePlugin extends Plugin
+{
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$var instanceof Exception && (!KINT_PHP70 || !$var instanceof Throwable)) {
+            return;
+        }
+
+        $throw = new ThrowableObject($var);
+        $throw->transplant($o);
+        $r = new SourceRepresentation($var->getFile(), $var->getLine());
+        $r->showfilename = true;
+        $throw->addRepresentation($r, 0);
+
+        $o = $throw;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/TimestampPlugin.php b/system/ThirdParty/Kint/Parser/TimestampPlugin.php
new file mode 100644
index 0000000..72958d6
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/TimestampPlugin.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+
+class TimestampPlugin extends Plugin
+{
+    public static $blacklist = array(
+        2147483648,
+        2147483647,
+        1073741824,
+        1073741823,
+    );
+
+    public function getTypes()
+    {
+        return array('string', 'integer');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (\is_string($var) && !\ctype_digit($var)) {
+            return;
+        }
+
+        if (\in_array($var, self::$blacklist, true)) {
+            return;
+        }
+
+        $len = \strlen($var);
+
+        // Guess for anything between March 1973 and November 2286
+        if (9 === $len || 10 === $len) {
+            // If it's an int or string that's this short it probably has no other meaning
+            // Additionally it's highly unlikely the shortValue will be clipped for length
+            // If you're writing a plugin that interferes with this, just put your
+            // parser plugin further down the list so that it gets loaded afterwards.
+            $o->value->label = 'Timestamp';
+            $o->value->hints[] = 'timestamp';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ToStringPlugin.php b/system/ThirdParty/Kint/Parser/ToStringPlugin.php
new file mode 100644
index 0000000..8b7a65f
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ToStringPlugin.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+use ReflectionClass;
+
+class ToStringPlugin extends Plugin
+{
+    public static $blacklist = array(
+        'SimpleXMLElement',
+        'SplFileObject',
+    );
+
+    public function getTypes()
+    {
+        return array('object');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        $reflection = new ReflectionClass($var);
+        if (!$reflection->hasMethod('__toString')) {
+            return;
+        }
+
+        foreach (self::$blacklist as $class) {
+            if ($var instanceof $class) {
+                return;
+            }
+        }
+
+        $r = new Representation('toString');
+        $r->contents = (string) $var;
+
+        $o->addRepresentation($r);
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/TracePlugin.php b/system/ThirdParty/Kint/Parser/TracePlugin.php
new file mode 100644
index 0000000..3554993
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/TracePlugin.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use Kint\Object\BasicObject;
+use Kint\Object\TraceFrameObject;
+use Kint\Object\TraceObject;
+use Kint\Utils;
+
+class TracePlugin extends Plugin
+{
+    public static $blacklist = array('spl_autoload_call');
+
+    public function getTypes()
+    {
+        return array('array');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if (!$o->value) {
+            return;
+        }
+
+        $trace = $this->parser->getCleanArray($var);
+
+        if (\count($trace) !== \count($o->value->contents) || !Utils::isTrace($trace)) {
+            return;
+        }
+
+        $traceobj = new TraceObject();
+        $traceobj->transplant($o);
+        $rep = $traceobj->value;
+
+        $old_trace = $rep->contents;
+
+        Utils::normalizeAliases(self::$blacklist);
+
+        $rep->contents = array();
+
+        foreach ($old_trace as $frame) {
+            $index = $frame->name;
+
+            if (!isset($trace[$index]['function'])) {
+                // Something's very very wrong here, but it's probably a plugin's fault
+                continue;
+            }
+
+            if (Utils::traceFrameIsListed($trace[$index], self::$blacklist)) {
+                continue;
+            }
+
+            $rep->contents[$index] = new TraceFrameObject($frame, $trace[$index]);
+        }
+
+        \ksort($rep->contents);
+        $rep->contents = \array_values($rep->contents);
+
+        $traceobj->clearRepresentations();
+        $traceobj->addRepresentation($rep);
+        $traceobj->size = \count($rep->contents);
+        $o = $traceobj;
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/XmlPlugin.php b/system/ThirdParty/Kint/Parser/XmlPlugin.php
new file mode 100644
index 0000000..0947e9a
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/XmlPlugin.php
@@ -0,0 +1,150 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Parser;
+
+use DOMDocument;
+use Exception;
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\Representation;
+
+class XmlPlugin extends Plugin
+{
+    /**
+     * Which method to parse the variable with.
+     *
+     * DOMDocument provides more information including the text between nodes,
+     * however it's memory usage is very high and it takes longer to parse and
+     * render. Plus it's a pain to work with. So SimpleXML is the default.
+     *
+     * @var string
+     */
+    public static $parse_method = 'SimpleXML';
+
+    public function getTypes()
+    {
+        return array('string');
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_SUCCESS;
+    }
+
+    public function parse(&$var, BasicObject &$o, $trigger)
+    {
+        if ('<?xml' !== \substr($var, 0, 5)) {
+            return;
+        }
+
+        if (!\method_exists(\get_class($this), 'xmlTo'.self::$parse_method)) {
+            return;
+        }
+
+        $xml = \call_user_func(array(\get_class($this), 'xmlTo'.self::$parse_method), $var, $o->access_path);
+
+        if (empty($xml)) {
+            return;
+        }
+
+        list($xml, $access_path, $name) = $xml;
+
+        $base_obj = new BasicObject();
+        $base_obj->depth = $o->depth + 1;
+        $base_obj->name = $name;
+        $base_obj->access_path = $access_path;
+
+        $r = new Representation('XML');
+        $r->contents = $this->parser->parse($xml, $base_obj);
+
+        $o->addRepresentation($r, 0);
+    }
+
+    protected static function xmlToSimpleXML($var, $parent_path)
+    {
+        try {
+            $errors = \libxml_use_internal_errors(true);
+            $xml = \simplexml_load_string($var);
+            \libxml_use_internal_errors($errors);
+        } catch (Exception $e) {
+            if (isset($errors)) {
+                \libxml_use_internal_errors($errors);
+            }
+
+            return;
+        }
+
+        if (!$xml) {
+            return;
+        }
+
+        if (null === $parent_path) {
+            $access_path = null;
+        } else {
+            $access_path = 'simplexml_load_string('.$parent_path.')';
+        }
+
+        $name = $xml->getName();
+
+        return array($xml, $access_path, $name);
+    }
+
+    /**
+     * Get the DOMDocument info.
+     *
+     * The documentation of DOMDocument::loadXML() states that while you can
+     * call it statically, it will give an E_STRICT warning. On my system it
+     * actually gives an E_DEPRECATED warning, but it works so we'll just add
+     * an error-silencing '@' to the access path.
+     *
+     * If it errors loading then we wouldn't have gotten this far in the first place.
+     *
+     * @param string      $var         The XML string
+     * @param null|string $parent_path The path to the parent, in this case the XML string
+     *
+     * @return null|array The root element DOMNode, the access path, and the root element name
+     */
+    protected static function xmlToDOMDocument($var, $parent_path)
+    {
+        // There's no way to check validity in DOMDocument without making errors. For shame!
+        if (!self::xmlToSimpleXML($var, $parent_path)) {
+            return null;
+        }
+
+        $xml = new DOMDocument();
+        $xml->loadXML($var);
+        $xml = $xml->firstChild;
+
+        if (null === $parent_path) {
+            $access_path = null;
+        } else {
+            $access_path = '@\\DOMDocument::loadXML('.$parent_path.')->firstChild';
+        }
+
+        $name = $xml->nodeName;
+
+        return array($xml, $access_path, $name);
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/CliRenderer.php b/system/ThirdParty/Kint/Renderer/CliRenderer.php
new file mode 100644
index 0000000..0d0846a
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/CliRenderer.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer;
+
+use Kint\Object\BasicObject;
+
+class CliRenderer extends TextRenderer
+{
+    /**
+     * @var bool enable colors when Kint is run in *UNIX* command line
+     */
+    public static $cli_colors = true;
+
+    /**
+     * Forces utf8 output on windows.
+     *
+     * @var bool
+     */
+    public static $force_utf8 = false;
+
+    /**
+     * Detects the terminal width on startup.
+     *
+     * @var bool
+     */
+    public static $detect_width = true;
+
+    /**
+     * The minimum width to detect terminal size as.
+     *
+     * Less than this is ignored and falls back to default width.
+     *
+     * @var int
+     */
+    public static $min_terminal_width = 40;
+
+    protected static $terminal_width = null;
+
+    protected $windows_output = false;
+
+    protected $colors = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        if (!self::$force_utf8) {
+            $this->windows_output = KINT_WIN;
+        }
+
+        if (!self::$terminal_width) {
+            if (!KINT_WIN && self::$detect_width) {
+                self::$terminal_width = \exec('tput cols');
+            }
+
+            if (self::$terminal_width < self::$min_terminal_width) {
+                self::$terminal_width = self::$default_width;
+            }
+        }
+
+        $this->colors = $this->windows_output ? false : self::$cli_colors;
+
+        $this->header_width = self::$terminal_width;
+    }
+
+    public function colorValue($string)
+    {
+        if (!$this->colors) {
+            return $string;
+        }
+
+        return "\x1b[32m".\str_replace("\n", "\x1b[0m\n\x1b[32m", $string)."\x1b[0m";
+    }
+
+    public function colorType($string)
+    {
+        if (!$this->colors) {
+            return $string;
+        }
+
+        return "\x1b[35;1m".\str_replace("\n", "\x1b[0m\n\x1b[35;1m", $string)."\x1b[0m";
+    }
+
+    public function colorTitle($string)
+    {
+        if (!$this->colors) {
+            return $string;
+        }
+
+        return "\x1b[36m".\str_replace("\n", "\x1b[0m\n\x1b[36m", $string)."\x1b[0m";
+    }
+
+    public function renderTitle(BasicObject $o)
+    {
+        if ($this->windows_output) {
+            return $this->utf8ToWindows(parent::renderTitle($o));
+        }
+
+        return parent::renderTitle($o);
+    }
+
+    public function preRender()
+    {
+        return PHP_EOL;
+    }
+
+    public function postRender()
+    {
+        if ($this->windows_output) {
+            return $this->utf8ToWindows(parent::postRender());
+        }
+
+        return parent::postRender();
+    }
+
+    public function escape($string, $encoding = false)
+    {
+        return \str_replace("\x1b", '\\x1b', $string);
+    }
+
+    protected function utf8ToWindows($string)
+    {
+        return \str_replace(
+            array('ā”Œ', 'ā•', 'ā”', 'ā”‚', 'ā””', 'ā”€', 'ā”˜'),
+            array("\xda", "\xdc", "\xbf", "\xb3", "\xc0", "\xc4", "\xd9"),
+            $string
+        );
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/PlainRenderer.php b/system/ThirdParty/Kint/Renderer/PlainRenderer.php
new file mode 100644
index 0000000..493a774
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/PlainRenderer.php
@@ -0,0 +1,237 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer;
+
+use Kint\Kint;
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+
+class PlainRenderer extends TextRenderer
+{
+    public static $pre_render_sources = array(
+        'script' => array(
+            array('Kint\\Renderer\\PlainRenderer', 'renderJs'),
+            array('Kint\\Renderer\\Text\\MicrotimePlugin', 'renderJs'),
+        ),
+        'style' => array(
+            array('Kint\\Renderer\\PlainRenderer', 'renderCss'),
+        ),
+        'raw' => array(),
+    );
+
+    /**
+     * Path to the CSS file to load by default.
+     *
+     * @var string
+     */
+    public static $theme = 'plain.css';
+
+    /**
+     * Output htmlentities instead of utf8.
+     *
+     * @var bool
+     */
+    public static $disable_utf8 = false;
+
+    public static $needs_pre_render = true;
+
+    public static $always_pre_render = false;
+
+    protected $force_pre_render = false;
+    protected $pre_render;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->pre_render = self::$needs_pre_render;
+
+        if (self::$always_pre_render) {
+            $this->setPreRender(true);
+        }
+    }
+
+    public function setCallInfo(array $info)
+    {
+        parent::setCallInfo($info);
+
+        if (\in_array('@', $this->call_info['modifiers'], true)) {
+            $this->setPreRender(true);
+        }
+    }
+
+    public function setStatics(array $statics)
+    {
+        parent::setStatics($statics);
+
+        if (!empty($statics['return'])) {
+            $this->setPreRender(true);
+        }
+    }
+
+    public function setPreRender($pre_render)
+    {
+        $this->pre_render = $pre_render;
+        $this->force_pre_render = true;
+    }
+
+    public function getPreRender()
+    {
+        return $this->pre_render;
+    }
+
+    public function colorValue($string)
+    {
+        return '<i>'.$string.'</i>';
+    }
+
+    public function colorType($string)
+    {
+        return '<b>'.$string.'</b>';
+    }
+
+    public function colorTitle($string)
+    {
+        return '<u>'.$string.'</u>';
+    }
+
+    public function renderTitle(BasicObject $o)
+    {
+        if (self::$disable_utf8) {
+            return $this->utf8ToHtmlentity(parent::renderTitle($o));
+        }
+
+        return parent::renderTitle($o);
+    }
+
+    public function preRender()
+    {
+        $output = '';
+
+        if ($this->pre_render) {
+            foreach (self::$pre_render_sources as $type => $values) {
+                $contents = '';
+                foreach ($values as $v) {
+                    $contents .= \call_user_func($v, $this);
+                }
+
+                if (!\strlen($contents)) {
+                    continue;
+                }
+
+                switch ($type) {
+                    case 'script':
+                        $output .= '<script class="kint-plain-script">'.$contents.'</script>';
+                        break;
+                    case 'style':
+                        $output .= '<style class="kint-plain-style">'.$contents.'</style>';
+                        break;
+                    default:
+                        $output .= $contents;
+                }
+            }
+
+            // Don't pre-render on every dump
+            if (!$this->force_pre_render) {
+                self::$needs_pre_render = false;
+            }
+        }
+
+        return $output.'<div class="kint-plain">';
+    }
+
+    public function postRender()
+    {
+        if (self::$disable_utf8) {
+            return $this->utf8ToHtmlentity(parent::postRender()).'</div>';
+        }
+
+        return parent::postRender().'</div>';
+    }
+
+    public function ideLink($file, $line)
+    {
+        $path = $this->escape(Kint::shortenPath($file)).':'.$line;
+        $ideLink = Kint::getIdeLink($file, $line);
+
+        if (!$ideLink) {
+            return $path;
+        }
+
+        $class = '';
+
+        if (\preg_match('/https?:\\/\\//i', $ideLink)) {
+            $class = 'class="kint-ide-link" ';
+        }
+
+        return '<a '.$class.'href="'.$this->escape($ideLink).'">'.$path.'</a>';
+    }
+
+    public function escape($string, $encoding = false)
+    {
+        if (false === $encoding) {
+            $encoding = BlobObject::detectEncoding($string);
+        }
+
+        $original_encoding = $encoding;
+
+        if (false === $encoding || 'ASCII' === $encoding) {
+            $encoding = 'UTF-8';
+        }
+
+        $string = \htmlspecialchars($string, ENT_NOQUOTES, $encoding);
+
+        // this call converts all non-ASCII characters into numeirc htmlentities
+        if (\function_exists('mb_encode_numericentity') && 'ASCII' !== $original_encoding) {
+            $string = \mb_encode_numericentity($string, array(0x80, 0xffff, 0, 0xffff), $encoding);
+        }
+
+        return $string;
+    }
+
+    protected function utf8ToHtmlentity($string)
+    {
+        return \str_replace(
+            array('ā”Œ', 'ā•', 'ā”', 'ā”‚', 'ā””', 'ā”€', 'ā”˜'),
+            array('&#9484;', '&#9552;', '&#9488;', '&#9474;', '&#9492;', '&#9472;', '&#9496;'),
+            $string
+        );
+    }
+
+    protected static function renderJs()
+    {
+        return \file_get_contents(KINT_DIR.'/resources/compiled/shared.js').\file_get_contents(KINT_DIR.'/resources/compiled/plain.js');
+    }
+
+    protected static function renderCss()
+    {
+        if (\file_exists(KINT_DIR.'/resources/compiled/'.self::$theme)) {
+            return \file_get_contents(KINT_DIR.'/resources/compiled/'.self::$theme);
+        }
+
+        return \file_get_contents(self::$theme);
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Renderer.php b/system/ThirdParty/Kint/Renderer/Renderer.php
new file mode 100644
index 0000000..cf8b0a7
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Renderer.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer;
+
+use Kint\Object\BasicObject;
+use Kint\Object\InstanceObject;
+
+abstract class Renderer
+{
+    const SORT_NONE = 0;
+    const SORT_VISIBILITY = 1;
+    const SORT_FULL = 2;
+
+    protected $call_info = array();
+    protected $statics = array();
+    protected $show_trace = true;
+
+    abstract public function render(BasicObject $o);
+
+    abstract public function renderNothing();
+
+    public function setCallInfo(array $info)
+    {
+        if (!isset($info['params'])) {
+            $info['params'] = null;
+        }
+
+        if (!isset($info['modifiers']) || !\is_array($info['modifiers'])) {
+            $info['modifiers'] = array();
+        }
+
+        if (!isset($info['callee'])) {
+            $info['callee'] = null;
+        }
+
+        if (!isset($info['caller'])) {
+            $info['caller'] = null;
+        }
+
+        if (!isset($info['trace']) || !\is_array($info['trace'])) {
+            $info['trace'] = array();
+        }
+
+        $this->call_info = array(
+            'params' => $info['params'],
+            'modifiers' => $info['modifiers'],
+            'callee' => $info['callee'],
+            'caller' => $info['caller'],
+            'trace' => $info['trace'],
+        );
+    }
+
+    public function getCallInfo()
+    {
+        return $this->call_info;
+    }
+
+    public function setStatics(array $statics)
+    {
+        $this->statics = $statics;
+        $this->setShowTrace(!empty($statics['display_called_from']));
+    }
+
+    public function getStatics()
+    {
+        return $this->statics;
+    }
+
+    public function setShowTrace($show_trace)
+    {
+        $this->show_trace = $show_trace;
+    }
+
+    public function getShowTrace()
+    {
+        return $this->show_trace;
+    }
+
+    /**
+     * Returns the first compatible plugin available.
+     *
+     * @param array $plugins Array of hints to class strings
+     * @param array $hints   Array of object hints
+     *
+     * @return array Array of hints to class strings filtered and sorted by object hints
+     */
+    public function matchPlugins(array $plugins, array $hints)
+    {
+        $out = array();
+
+        foreach ($hints as $key) {
+            if (isset($plugins[$key])) {
+                $out[$key] = $plugins[$key];
+            }
+        }
+
+        return $out;
+    }
+
+    public function filterParserPlugins(array $plugins)
+    {
+        return $plugins;
+    }
+
+    public function preRender()
+    {
+        return '';
+    }
+
+    public function postRender()
+    {
+        return '';
+    }
+
+    public static function sortPropertiesFull(BasicObject $a, BasicObject $b)
+    {
+        $sort = BasicObject::sortByAccess($a, $b);
+        if ($sort) {
+            return $sort;
+        }
+
+        $sort = BasicObject::sortByName($a, $b);
+        if ($sort) {
+            return $sort;
+        }
+
+        return InstanceObject::sortByHierarchy($a->owner_class, $b->owner_class);
+    }
+
+    /**
+     * Sorts an array of BasicObject.
+     *
+     * @param BasicObject[] $contents Object properties to sort
+     * @param int           $sort
+     *
+     * @return BasicObject[]
+     */
+    public static function sortProperties(array $contents, $sort)
+    {
+        switch ($sort) {
+            case self::SORT_VISIBILITY:
+                /** @var array<array-key, BasicObject[]> Containers to quickly stable sort by type */
+                $containers = array(
+                    BasicObject::ACCESS_PUBLIC => array(),
+                    BasicObject::ACCESS_PROTECTED => array(),
+                    BasicObject::ACCESS_PRIVATE => array(),
+                    BasicObject::ACCESS_NONE => array(),
+                );
+
+                foreach ($contents as $item) {
+                    $containers[$item->access][] = $item;
+                }
+
+                return \call_user_func_array('array_merge', $containers);
+            case self::SORT_FULL:
+                \usort($contents, array('Kint\\Renderer\\Renderer', 'sortPropertiesFull'));
+                // no break
+            default:
+                return $contents;
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php
new file mode 100644
index 0000000..5b4d613
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\Representation\Representation;
+
+class BinaryPlugin extends Plugin implements TabPluginInterface
+{
+    public static $line_length = 0x10;
+    public static $chunk_length = 0x4;
+
+    public function renderTab(Representation $r)
+    {
+        $out = '<pre>';
+
+        $chunks = \str_split($r->contents, self::$line_length);
+
+        foreach ($chunks as $index => $chunk) {
+            $out .= \sprintf('%08X', $index * self::$line_length).":\t";
+            $out .= \implode(' ', \str_split(\str_pad(\bin2hex($chunk), 2 * self::$line_length, ' '), self::$chunk_length));
+            $out .= "\t".\preg_replace('/[^\\x20-\\x7E]/', '.', $chunk)."\n";
+        }
+
+        $out .= '</pre>';
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php
new file mode 100644
index 0000000..fcfedc1
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+
+class BlacklistPlugin extends Plugin implements ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        return '<dl>'.$this->renderLockedHeader($o, '<var>Blacklisted</var>').'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php
new file mode 100644
index 0000000..5834017
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+use Kint\Object\ClosureObject;
+use Kint\Object\MethodObject;
+use Kint\Renderer\RichRenderer;
+
+class CallablePlugin extends Plugin implements ObjectPluginInterface
+{
+    protected static $method_cache = array();
+
+    public function renderObject(BasicObject $o)
+    {
+        if ($o instanceof MethodObject) {
+            return $this->renderMethod($o);
+        }
+
+        if ($o instanceof ClosureObject) {
+            return $this->renderClosure($o);
+        }
+
+        return $this->renderCallable($o);
+    }
+
+    protected function renderClosure(ClosureObject $o)
+    {
+        $children = $this->renderer->renderChildren($o);
+
+        $header = '';
+
+        if (null !== ($s = $o->getModifiers())) {
+            $header .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getName())) {
+            $header .= '<dfn>'.$this->renderer->escape($s).'('.$this->renderer->escape($o->getParams()).')</dfn>';
+        }
+
+        if (null !== ($s = $o->getValueShort())) {
+            if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
+                $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+            }
+            $header .= ' '.$this->renderer->escape($s);
+        }
+
+        return '<dl>'.$this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header).$children.'</dl>';
+    }
+
+    protected function renderCallable(BasicObject $o)
+    {
+        $children = $this->renderer->renderChildren($o);
+
+        $header = '';
+
+        if (null !== ($s = $o->getModifiers())) {
+            $header .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getName())) {
+            $header .= '<dfn>'.$this->renderer->escape($s).'</dfn>';
+        }
+
+        if (null !== ($s = $o->getValueShort())) {
+            if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
+                $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+            }
+            $header .= ' '.$this->renderer->escape($s);
+        }
+
+        return '<dl>'.$this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header).$children.'</dl>';
+    }
+
+    protected function renderMethod(MethodObject $o)
+    {
+        if (!empty(self::$method_cache[$o->owner_class][$o->name])) {
+            $children = self::$method_cache[$o->owner_class][$o->name]['children'];
+
+            $header = $this->renderer->renderHeaderWrapper(
+                $o,
+                (bool) \strlen($children),
+                self::$method_cache[$o->owner_class][$o->name]['header']
+            );
+
+            return '<dl>'.$header.$children.'</dl>';
+        }
+
+        $children = $this->renderer->renderChildren($o);
+
+        $header = '';
+
+        if (null !== ($s = $o->getModifiers()) || $o->return_reference) {
+            $header .= '<var>'.$s;
+
+            if ($o->return_reference) {
+                if ($s) {
+                    $header .= ' ';
+                }
+                $header .= $this->renderer->escape('&');
+            }
+
+            $header .= '</var> ';
+        }
+
+        if (null !== ($s = $o->getName())) {
+            $function = $this->renderer->escape($s).'('.$this->renderer->escape($o->getParams()).')';
+
+            if (null !== ($url = $o->getPhpDocUrl())) {
+                $function = '<a href="'.$url.'" target=_blank>'.$function.'</a>';
+            }
+
+            $header .= '<dfn>'.$function.'</dfn>';
+        }
+
+        if (!empty($o->returntype)) {
+            $header .= ': <var>';
+
+            if ($o->return_reference) {
+                $header .= $this->renderer->escape('&');
+            }
+
+            $header .= $this->renderer->escape($o->returntype).'</var>';
+        } elseif ($o->docstring) {
+            if (\preg_match('/@return\\s+(.*)\\r?\\n/m', $o->docstring, $matches)) {
+                if (\trim($matches[1])) {
+                    $header .= ': <var>'.$this->renderer->escape(\trim($matches[1])).'</var>';
+                }
+            }
+        }
+
+        if (null !== ($s = $o->getValueShort())) {
+            if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
+                $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+            }
+            $header .= ' '.$this->renderer->escape($s);
+        }
+
+        if (\strlen($o->owner_class) && \strlen($o->name)) {
+            self::$method_cache[$o->owner_class][$o->name] = array(
+                'header' => $header,
+                'children' => $children,
+            );
+        }
+
+        $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
+
+        return '<dl>'.$header.$children.'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php
new file mode 100644
index 0000000..79a9926
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Kint;
+use Kint\Object\BasicObject;
+use Kint\Object\ClosureObject;
+
+class ClosurePlugin extends Plugin implements ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        $children = $this->renderer->renderChildren($o);
+
+        if (!($o instanceof ClosureObject)) {
+            $header = $this->renderer->renderHeader($o);
+        } else {
+            $header = '';
+
+            if (null !== ($s = $o->getModifiers())) {
+                $header .= '<var>'.$s.'</var> ';
+            }
+
+            if (null !== ($s = $o->getName())) {
+                $header .= '<dfn>'.$this->renderer->escape($s).'('.$this->renderer->escape($o->getParams()).')</dfn> ';
+            }
+
+            $header .= '<var>Closure</var> ';
+            $header .= $this->renderer->escape(Kint::shortenPath($o->filename)).':'.(int) $o->startline;
+        }
+
+        $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
+
+        return '<dl>'.$header.$children.'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php
new file mode 100644
index 0000000..241a815
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\ColorRepresentation;
+use Kint\Object\Representation\Representation;
+
+class ColorPlugin extends Plugin implements TabPluginInterface, ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        $r = $o->getRepresentation('color');
+
+        if (!$r instanceof ColorRepresentation) {
+            return;
+        }
+
+        $children = $this->renderer->renderChildren($o);
+
+        $header = $this->renderer->renderHeader($o);
+        $header .= '<div class="kint-color-preview"><div style="background:';
+        $header .= $r->getColor(ColorRepresentation::COLOR_RGBA);
+        $header .= '"></div></div>';
+
+        $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
+
+        return '<dl>'.$header.$children.'</dl>';
+    }
+
+    public function renderTab(Representation $r)
+    {
+        if (!$r instanceof ColorRepresentation) {
+            return;
+        }
+
+        $out = '';
+
+        if ($color = $r->getColor(ColorRepresentation::COLOR_NAME)) {
+            $out .= '<dfn>'.$color."</dfn>\n";
+        }
+        if ($color = $r->getColor(ColorRepresentation::COLOR_HEX_3)) {
+            $out .= '<dfn>'.$color."</dfn>\n";
+        }
+        if ($color = $r->getColor(ColorRepresentation::COLOR_HEX_6)) {
+            $out .= '<dfn>'.$color."</dfn>\n";
+        }
+
+        if ($r->hasAlpha()) {
+            if ($color = $r->getColor(ColorRepresentation::COLOR_HEX_4)) {
+                $out .= '<dfn>'.$color."</dfn>\n";
+            }
+            if ($color = $r->getColor(ColorRepresentation::COLOR_HEX_8)) {
+                $out .= '<dfn>'.$color."</dfn>\n";
+            }
+            if ($color = $r->getColor(ColorRepresentation::COLOR_RGBA)) {
+                $out .= '<dfn>'.$color."</dfn>\n";
+            }
+            if ($color = $r->getColor(ColorRepresentation::COLOR_HSLA)) {
+                $out .= '<dfn>'.$color."</dfn>\n";
+            }
+        } else {
+            if ($color = $r->getColor(ColorRepresentation::COLOR_RGB)) {
+                $out .= '<dfn>'.$color."</dfn>\n";
+            }
+            if ($color = $r->getColor(ColorRepresentation::COLOR_HSL)) {
+                $out .= '<dfn>'.$color."</dfn>\n";
+            }
+        }
+
+        if (!\strlen($out)) {
+            return false;
+        }
+
+        return '<pre>'.$out.'</pre>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php
new file mode 100644
index 0000000..cd92b41
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+
+class DepthLimitPlugin extends Plugin implements ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        return '<dl>'.$this->renderLockedHeader($o, '<var>Depth Limit</var>').'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php
new file mode 100644
index 0000000..19c5309
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Kint;
+use Kint\Object\Representation\DocstringRepresentation;
+use Kint\Object\Representation\Representation;
+
+class DocstringPlugin extends Plugin implements TabPluginInterface
+{
+    public function renderTab(Representation $r)
+    {
+        if (!($r instanceof DocstringRepresentation)) {
+            return false;
+        }
+
+        $docstring = array();
+        foreach (\explode("\n", $r->contents) as $line) {
+            $docstring[] = \trim($line);
+        }
+
+        $docstring = \implode("\n", $docstring);
+
+        $location = array();
+
+        if ($r->class) {
+            $location[] = 'Inherited from '.$this->renderer->escape($r->class);
+        }
+        if ($r->file && $r->line) {
+            $location[] = 'Defined in '.$this->renderer->escape(Kint::shortenPath($r->file)).':'.((int) $r->line);
+        }
+
+        $location = \implode("\n", $location);
+
+        if ($location) {
+            if (\strlen($docstring)) {
+                $docstring .= "\n\n";
+            }
+
+            $location = '<small>'.$location.'</small>';
+        } elseif (0 === \strlen($docstring)) {
+            return '';
+        }
+
+        return '<pre>'.$this->renderer->escape($docstring).$location.'</pre>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php
new file mode 100644
index 0000000..a56bb23
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\Representation\MicrotimeRepresentation;
+use Kint\Object\Representation\Representation;
+use Kint\Utils;
+
+class MicrotimePlugin extends Plugin implements TabPluginInterface
+{
+    public function renderTab(Representation $r)
+    {
+        if (!($r instanceof MicrotimeRepresentation)) {
+            return false;
+        }
+
+        $out = $r->getDateTime()->format('Y-m-d H:i:s.u');
+        if (null !== $r->lap) {
+            $out .= '<br><b>SINCE LAST CALL:</b> <span class="kint-microtime-lap">'.\round($r->lap, 4).'</span>s.';
+        }
+        if (null !== $r->total) {
+            $out .= '<br><b>SINCE START:</b> '.\round($r->total, 4).'s.';
+        }
+        if (null !== $r->avg) {
+            $out .= '<br><b>AVERAGE DURATION:</b> <span class="kint-microtime-avg">'.\round($r->avg, 4).'</span>s.';
+        }
+
+        $bytes = Utils::getHumanReadableBytes($r->mem);
+        $out .= '<br><b>MEMORY USAGE:</b> '.$r->mem.' bytes ('.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+        $bytes = Utils::getHumanReadableBytes($r->mem_real);
+        $out .= ' (real '.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+
+        $bytes = Utils::getHumanReadableBytes($r->mem_peak);
+        $out .= '<br><b>PEAK MEMORY USAGE:</b> '.$r->mem_peak.' bytes ('.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+        $bytes = Utils::getHumanReadableBytes($r->mem_peak_real);
+        $out .= ' (real '.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+
+        return '<pre data-kint-microtime-group="'.$r->group.'">'.$out.'</pre>';
+    }
+
+    public static function renderJs()
+    {
+        return \file_get_contents(KINT_DIR.'/resources/compiled/microtime.js');
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ObjectPluginInterface.php b/system/ThirdParty/Kint/Renderer/Rich/ObjectPluginInterface.php
new file mode 100644
index 0000000..f46aa29
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/ObjectPluginInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+
+interface ObjectPluginInterface extends PluginInterface
+{
+    public function renderObject(BasicObject $o);
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/Plugin.php b/system/ThirdParty/Kint/Renderer/Rich/Plugin.php
new file mode 100644
index 0000000..06710bc
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/Plugin.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+use Kint\Renderer\RichRenderer;
+
+abstract class Plugin implements PluginInterface
+{
+    protected $renderer;
+
+    public function __construct(RichRenderer $r)
+    {
+        $this->renderer = $r;
+    }
+
+    /**
+     * Renders a locked header.
+     *
+     * @param BasicObject $o
+     * @param string      $content
+     */
+    public function renderLockedHeader(BasicObject $o, $content)
+    {
+        $header = '<dt class="kint-parent kint-locked">';
+
+        if (RichRenderer::$access_paths && $o->depth > 0 && $ap = $o->getAccessPath()) {
+            $header .= '<span class="kint-access-path-trigger" title="Show access path">&rlarr;</span>';
+        }
+
+        $header .= '<span class="kint-popup-trigger" title="Open in new window">&boxbox;</span><nav></nav>';
+
+        if (null !== ($s = $o->getModifiers())) {
+            $header .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getName())) {
+            $header .= '<dfn>'.$this->renderer->escape($s).'</dfn> ';
+
+            if ($s = $o->getOperator()) {
+                $header .= $this->renderer->escape($s, 'ASCII').' ';
+            }
+        }
+
+        if (null !== ($s = $o->getType())) {
+            $s = $this->renderer->escape($s);
+
+            if ($o->reference) {
+                $s = '&amp;'.$s;
+            }
+
+            $header .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getSize())) {
+            $header .= '('.$this->renderer->escape($s).') ';
+        }
+
+        $header .= $content;
+
+        if (!empty($ap)) {
+            $header .= '<div class="access-path">'.$this->renderer->escape($ap).'</div>';
+        }
+
+        return $header.'</dt>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/PluginInterface.php b/system/ThirdParty/Kint/Renderer/Rich/PluginInterface.php
new file mode 100644
index 0000000..79828e7
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/PluginInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Renderer\RichRenderer;
+
+interface PluginInterface
+{
+    public function __construct(RichRenderer $r);
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php
new file mode 100644
index 0000000..618d217
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+
+class RecursionPlugin extends Plugin implements ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        return '<dl>'.$this->renderLockedHeader($o, '<var>Recursion</var>').'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php
new file mode 100644
index 0000000..6c18931
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+use Kint\Renderer\RichRenderer;
+
+class SimpleXMLElementPlugin extends Plugin implements ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        $children = $this->renderer->renderChildren($o);
+
+        $header = '';
+
+        if (null !== ($s = $o->getModifiers())) {
+            $header .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getName())) {
+            $header .= '<dfn>'.$this->renderer->escape($s).'</dfn> ';
+
+            if ($s = $o->getOperator()) {
+                $header .= $this->renderer->escape($s, 'ASCII').' ';
+            }
+        }
+
+        if (null !== ($s = $o->getType())) {
+            $s = $this->renderer->escape($s);
+
+            if ($o->reference) {
+                $s = '&amp;'.$s;
+            }
+
+            $header .= '<var>'.$this->renderer->escape($s).'</var> ';
+        }
+
+        if (null !== ($s = $o->getSize())) {
+            $header .= '('.$this->renderer->escape($s).') ';
+        }
+
+        if (null === $s && $c = $o->getRepresentation('contents')) {
+            $c = \reset($c->contents);
+
+            if ($c && null !== ($s = $c->getValueShort())) {
+                if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
+                    $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+                }
+                $header .= $this->renderer->escape($s);
+            }
+        }
+
+        $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
+
+        return '<dl>'.$header.$children.'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php
new file mode 100644
index 0000000..5443dbf
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\Representation\Representation;
+use Kint\Object\Representation\SourceRepresentation;
+
+class SourcePlugin extends Plugin implements TabPluginInterface
+{
+    public function renderTab(Representation $r)
+    {
+        if (!($r instanceof SourceRepresentation) || empty($r->source)) {
+            return false;
+        }
+
+        $source = $r->source;
+
+        // Trim empty lines from the start and end of the source
+        foreach ($source as $linenum => $line) {
+            if (\strlen(\trim($line)) || $linenum === $r->line) {
+                break;
+            }
+
+            unset($source[$linenum]);
+        }
+
+        foreach (\array_reverse($source, true) as $linenum => $line) {
+            if (\strlen(\trim($line)) || $linenum === $r->line) {
+                break;
+            }
+
+            unset($source[$linenum]);
+        }
+
+        $output = '';
+
+        foreach ($source as $linenum => $line) {
+            if ($linenum === $r->line) {
+                $output .= '<div class="kint-highlight">'.$this->renderer->escape($line)."\n".'</div>';
+            } else {
+                $output .= '<div>'.$this->renderer->escape($line)."\n".'</div>';
+            }
+        }
+
+        if ($output) {
+            \reset($source);
+
+            $data = '';
+            if ($r->showfilename) {
+                $data = ' data-kint-filename="'.$this->renderer->escape($r->filename).'"';
+            }
+
+            return '<div><pre class="kint-source"'.$data.' style="counter-reset: kint-l '.((int) \key($source) - 1).';">'.$output.'</pre></div><div></div>';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php b/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php
new file mode 100644
index 0000000..7cdbde7
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\Representation\Representation;
+
+interface TabPluginInterface extends PluginInterface
+{
+    public function renderTab(Representation $o);
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php
new file mode 100644
index 0000000..cc3ee0f
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BlobObject;
+use Kint\Object\Representation\Representation;
+use Kint\Renderer\RichRenderer;
+
+class TablePlugin extends Plugin implements TabPluginInterface
+{
+    public static $respect_str_length = true;
+
+    public function renderTab(Representation $r)
+    {
+        $out = '<pre><table><thead><tr><th></th>';
+
+        $firstrow = \reset($r->contents);
+
+        foreach ($firstrow->value->contents as $field) {
+            $out .= '<th>'.$this->renderer->escape($field->name).'</th>';
+        }
+
+        $out .= '</tr></thead><tbody>';
+
+        foreach ($r->contents as $row) {
+            $out .= '<tr><th>';
+            $out .= $this->renderer->escape($row->name);
+            $out .= '</th>';
+
+            foreach ($row->value->contents as $field) {
+                $out .= '<td';
+                $type = '';
+                $size = '';
+                $ref = '';
+
+                if (null !== ($s = $field->getType())) {
+                    $type = $this->renderer->escape($s);
+
+                    if ($field->reference) {
+                        $ref = '&amp;';
+                        $type = $ref.$type;
+                    }
+
+                    if (null !== ($s = $field->getSize())) {
+                        $size .= ' ('.$this->renderer->escape($s).')';
+                    }
+                }
+
+                if ($type) {
+                    $out .= ' title="'.$type.$size.'"';
+                }
+
+                $out .= '>';
+
+                switch ($field->type) {
+                    case 'boolean':
+                        $out .= $field->value->contents ? '<var>'.$ref.'true</var>' : '<var>'.$ref.'false</var>';
+                        break;
+                    case 'integer':
+                    case 'double':
+                        $out .= (string) $field->value->contents;
+                        break;
+                    case 'null':
+                        $out .= '<var>'.$ref.'null</var>';
+                        break;
+                    case 'string':
+                        if ($field->encoding) {
+                            $val = $field->value->contents;
+                            if (RichRenderer::$strlen_max && self::$respect_str_length && BlobObject::strlen($val) > RichRenderer::$strlen_max) {
+                                $val = \substr($val, 0, RichRenderer::$strlen_max).'...';
+                            }
+
+                            $out .= $this->renderer->escape($val);
+                        } else {
+                            $out .= '<var>'.$type.'</var>';
+                        }
+                        break;
+                    case 'array':
+                        $out .= '<var>'.$ref.'array</var>'.$size;
+                        break;
+                    case 'object':
+                        $out .= '<var>'.$ref.$this->renderer->escape($field->classname).'</var>'.$size;
+                        break;
+                    case 'resource':
+                        $out .= '<var>'.$ref.'resource</var>';
+                        break;
+                    default:
+                        $out .= '<var>'.$ref.'unknown</var>';
+                        break;
+                }
+
+                if (\in_array('blacklist', $field->hints, true)) {
+                    $out .= ' <var>Blacklisted</var>';
+                } elseif (\in_array('recursion', $field->hints, true)) {
+                    $out .= ' <var>Recursion</var>';
+                } elseif (\in_array('depth_limit', $field->hints, true)) {
+                    $out .= ' <var>Depth Limit</var>';
+                }
+
+                $out .= '</td>';
+            }
+
+            $out .= '</tr>';
+        }
+
+        $out .= '</tbody></table></pre>';
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php
new file mode 100644
index 0000000..6e3a2f8
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use DateTime;
+use DateTimeZone;
+use Kint\Object\Representation\Representation;
+
+class TimestampPlugin extends Plugin implements TabPluginInterface
+{
+    public function renderTab(Representation $r)
+    {
+        $dt = DateTime::createFromFormat('U', $r->contents);
+
+        if ($dt) {
+            return '<pre>'.$dt->setTimeZone(new DateTimeZone('UTC'))->format('Y-m-d H:i:s T').'</pre>';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php
new file mode 100644
index 0000000..6ca19bb
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Object\BasicObject;
+use Kint\Object\TraceFrameObject;
+
+class TraceFramePlugin extends Plugin implements ObjectPluginInterface
+{
+    public function renderObject(BasicObject $o)
+    {
+        if (!$o instanceof TraceFrameObject) {
+            return;
+        }
+
+        if (!empty($o->trace['file']) && !empty($o->trace['line'])) {
+            $header = '<var>'.$this->renderer->ideLink($o->trace['file'], (int) $o->trace['line']).'</var> ';
+        } else {
+            $header = '<var>PHP internal call</var> ';
+        }
+
+        if ($o->trace['class']) {
+            $header .= $this->renderer->escape($o->trace['class'].$o->trace['type']);
+        }
+
+        if (\is_string($o->trace['function'])) {
+            $function = $this->renderer->escape($o->trace['function'].'()');
+        } else {
+            $function = $this->renderer->escape(
+                $o->trace['function']->getName().'('.$o->trace['function']->getParams().')'
+            );
+
+            if (null !== ($url = $o->trace['function']->getPhpDocUrl())) {
+                $function = '<a href="'.$url.'" target=_blank>'.$function.'</a>';
+            }
+        }
+
+        $header .= '<dfn>'.$function.'</dfn>';
+
+        $children = $this->renderer->renderChildren($o);
+        $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
+
+        return '<dl>'.$header.$children.'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/RichRenderer.php b/system/ThirdParty/Kint/Renderer/RichRenderer.php
new file mode 100644
index 0000000..dcd39ee
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/RichRenderer.php
@@ -0,0 +1,612 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer;
+
+use Kint\Kint;
+use Kint\Object\BasicObject;
+use Kint\Object\BlobObject;
+use Kint\Object\InstanceObject;
+use Kint\Object\Representation\Representation;
+use Kint\Utils;
+
+class RichRenderer extends Renderer
+{
+    /**
+     * RichRenderer object plugins should implement Kint\Renderer\Rich\ObjectPluginInterface.
+     */
+    public static $object_plugins = array(
+        'blacklist' => 'Kint\\Renderer\\Rich\\BlacklistPlugin',
+        'callable' => 'Kint\\Renderer\\Rich\\CallablePlugin',
+        'closure' => 'Kint\\Renderer\\Rich\\ClosurePlugin',
+        'color' => 'Kint\\Renderer\\Rich\\ColorPlugin',
+        'depth_limit' => 'Kint\\Renderer\\Rich\\DepthLimitPlugin',
+        'recursion' => 'Kint\\Renderer\\Rich\\RecursionPlugin',
+        'simplexml_element' => 'Kint\\Renderer\\Rich\\SimpleXMLElementPlugin',
+        'trace_frame' => 'Kint\\Renderer\\Rich\\TraceFramePlugin',
+    );
+
+    /**
+     * RichRenderer tab plugins should implement Kint\Renderer\Rich\TabPluginInterface.
+     */
+    public static $tab_plugins = array(
+        'binary' => 'Kint\\Renderer\\Rich\\BinaryPlugin',
+        'color' => 'Kint\\Renderer\\Rich\\ColorPlugin',
+        'docstring' => 'Kint\\Renderer\\Rich\\DocstringPlugin',
+        'microtime' => 'Kint\\Renderer\\Rich\\MicrotimePlugin',
+        'source' => 'Kint\\Renderer\\Rich\\SourcePlugin',
+        'table' => 'Kint\\Renderer\\Rich\\TablePlugin',
+        'timestamp' => 'Kint\\Renderer\\Rich\\TimestampPlugin',
+    );
+
+    public static $pre_render_sources = array(
+        'script' => array(
+            array('Kint\\Renderer\\RichRenderer', 'renderJs'),
+            array('Kint\\Renderer\\Rich\\MicrotimePlugin', 'renderJs'),
+        ),
+        'style' => array(
+            array('Kint\\Renderer\\RichRenderer', 'renderCss'),
+        ),
+        'raw' => array(),
+    );
+
+    /**
+     * Whether or not to render access paths.
+     *
+     * Access paths can become incredibly heavy with very deep and wide
+     * structures. Given mostly public variables it will typically make
+     * up one quarter of the output HTML size.
+     *
+     * If this is an unacceptably large amount and your browser is groaning
+     * under the weight of the access paths - your first order of buisiness
+     * should be to get a new browser. Failing that, use this to turn them off.
+     *
+     * @var bool
+     */
+    public static $access_paths = true;
+
+    /**
+     * The maximum length of a string before it is truncated.
+     *
+     * Falsey to disable
+     *
+     * @var int
+     */
+    public static $strlen_max = 80;
+
+    /**
+     * Path to the CSS file to load by default.
+     *
+     * @var string
+     */
+    public static $theme = 'original.css';
+
+    /**
+     * Assume types and sizes don't need to be escaped.
+     *
+     * Turn this off if you use anything but ascii in your class names,
+     * but it'll cause a slowdown of around 10%
+     *
+     * @var bool
+     */
+    public static $escape_types = false;
+
+    /**
+     * Move all dumps to a folder at the bottom of the body.
+     *
+     * @var bool
+     */
+    public static $folder = true;
+
+    /**
+     * Sort mode for object properties.
+     *
+     * @var int
+     */
+    public static $sort = self::SORT_NONE;
+
+    public static $needs_pre_render = true;
+    public static $needs_folder_render = true;
+
+    public static $always_pre_render = false;
+
+    protected $plugin_objs = array();
+    protected $expand = false;
+    protected $force_pre_render = false;
+    protected $pre_render;
+    protected $use_folder;
+
+    public function __construct()
+    {
+        $this->pre_render = self::$needs_pre_render;
+        $this->use_folder = self::$folder;
+
+        if (self::$always_pre_render) {
+            $this->setForcePreRender();
+        }
+    }
+
+    public function setCallInfo(array $info)
+    {
+        parent::setCallInfo($info);
+
+        if (\in_array('!', $this->call_info['modifiers'], true)) {
+            $this->setExpand(true);
+            $this->use_folder = false;
+        }
+
+        if (\in_array('@', $this->call_info['modifiers'], true)) {
+            $this->setForcePreRender();
+        }
+    }
+
+    public function setStatics(array $statics)
+    {
+        parent::setStatics($statics);
+
+        if (!empty($statics['expanded'])) {
+            $this->setExpand(true);
+        }
+
+        if (!empty($statics['return'])) {
+            $this->setForcePreRender();
+        }
+    }
+
+    public function setExpand($expand)
+    {
+        $this->expand = $expand;
+    }
+
+    public function getExpand()
+    {
+        return $this->expand;
+    }
+
+    public function setForcePreRender()
+    {
+        $this->force_pre_render = true;
+        $this->pre_render = true;
+    }
+
+    public function setPreRender($pre_render)
+    {
+        $this->setForcePreRender(); // TODO: Remove line in next major version
+        $this->pre_render = $pre_render;
+    }
+
+    public function getPreRender()
+    {
+        return $this->pre_render;
+    }
+
+    public function setUseFolder($use_folder)
+    {
+        $this->use_folder = $use_folder;
+    }
+
+    public function getUseFolder()
+    {
+        return $this->use_folder;
+    }
+
+    public function render(BasicObject $o)
+    {
+        if ($plugin = $this->getPlugin(self::$object_plugins, $o->hints)) {
+            if (\strlen($output = $plugin->renderObject($o))) {
+                return $output;
+            }
+        }
+
+        $children = $this->renderChildren($o);
+        $header = $this->renderHeaderWrapper($o, (bool) \strlen($children), $this->renderHeader($o));
+
+        return '<dl>'.$header.$children.'</dl>';
+    }
+
+    public function renderNothing()
+    {
+        return '<dl><dt><var>No argument</var></dt></dl>';
+    }
+
+    public function renderHeaderWrapper(BasicObject $o, $has_children, $contents)
+    {
+        $out = '<dt';
+
+        if ($has_children) {
+            $out .= ' class="kint-parent';
+
+            if ($this->expand) {
+                $out .= ' kint-show';
+            }
+
+            $out .= '"';
+        }
+
+        $out .= '>';
+
+        if (self::$access_paths && $o->depth > 0 && $ap = $o->getAccessPath()) {
+            $out .= '<span class="kint-access-path-trigger" title="Show access path">&rlarr;</span>';
+        }
+
+        if ($has_children) {
+            $out .= '<span class="kint-popup-trigger" title="Open in new window">&boxbox;</span>';
+
+            if (0 === $o->depth) {
+                $out .= '<span class="kint-search-trigger" title="Show search box">&telrec;</span>';
+                $out .= '<input type="text" class="kint-search" value="">';
+            }
+
+            $out .= '<nav></nav>';
+        }
+
+        $out .= $contents;
+
+        if (!empty($ap)) {
+            $out .= '<div class="access-path">'.$this->escape($ap).'</div>';
+        }
+
+        return $out.'</dt>';
+    }
+
+    public function renderHeader(BasicObject $o)
+    {
+        $output = '';
+
+        if (null !== ($s = $o->getModifiers())) {
+            $output .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getName())) {
+            $output .= '<dfn>'.$this->escape($s).'</dfn> ';
+
+            if ($s = $o->getOperator()) {
+                $output .= $this->escape($s, 'ASCII').' ';
+            }
+        }
+
+        if (null !== ($s = $o->getType())) {
+            if (self::$escape_types) {
+                $s = $this->escape($s);
+            }
+
+            if ($o->reference) {
+                $s = '&amp;'.$s;
+            }
+
+            $output .= '<var>'.$s.'</var> ';
+        }
+
+        if (null !== ($s = $o->getSize())) {
+            if (self::$escape_types) {
+                $s = $this->escape($s);
+            }
+            $output .= '('.$s.') ';
+        }
+
+        if (null !== ($s = $o->getValueShort())) {
+            $s = \preg_replace('/\\s+/', ' ', $s);
+
+            if (self::$strlen_max) {
+                $s = Utils::truncateString($s, self::$strlen_max);
+            }
+
+            $output .= $this->escape($s);
+        }
+
+        return \trim($output);
+    }
+
+    public function renderChildren(BasicObject $o)
+    {
+        $contents = array();
+        $tabs = array();
+
+        foreach ($o->getRepresentations() as $rep) {
+            $result = $this->renderTab($o, $rep);
+            if (\strlen($result)) {
+                $contents[] = $result;
+                $tabs[] = $rep;
+            }
+        }
+
+        if (empty($tabs)) {
+            return '';
+        }
+
+        $output = '<dd>';
+
+        if (1 === \count($tabs) && $tabs[0]->labelIsImplicit()) {
+            $output .= \reset($contents);
+        } else {
+            $output .= '<ul class="kint-tabs">';
+
+            foreach ($tabs as $i => $tab) {
+                if (0 === $i) {
+                    $output .= '<li class="kint-active-tab">';
+                } else {
+                    $output .= '<li>';
+                }
+
+                $output .= $this->escape($tab->getLabel()).'</li>';
+            }
+
+            $output .= '</ul><ul>';
+
+            foreach ($contents as $tab) {
+                $output .= '<li>'.$tab.'</li>';
+            }
+
+            $output .= '</ul>';
+        }
+
+        return $output.'</dd>';
+    }
+
+    public function preRender()
+    {
+        $output = '';
+
+        if ($this->pre_render) {
+            foreach (self::$pre_render_sources as $type => $values) {
+                $contents = '';
+                foreach ($values as $v) {
+                    $contents .= \call_user_func($v, $this);
+                }
+
+                if (!\strlen($contents)) {
+                    continue;
+                }
+
+                switch ($type) {
+                    case 'script':
+                        $output .= '<script class="kint-rich-script">'.$contents.'</script>';
+                        break;
+                    case 'style':
+                        $output .= '<style class="kint-rich-style">'.$contents.'</style>';
+                        break;
+                    default:
+                        $output .= $contents;
+                }
+            }
+
+            // Don't pre-render on every dump
+            if (!$this->force_pre_render) {
+                self::$needs_pre_render = false;
+            }
+        }
+
+        $output .= '<div class="kint-rich';
+
+        if ($this->use_folder) {
+            $output .= ' kint-file';
+
+            if (self::$needs_folder_render || $this->force_pre_render) {
+                $output = $this->renderFolder().$output;
+
+                if (!$this->force_pre_render) {
+                    self::$needs_folder_render = false;
+                }
+            }
+        }
+
+        $output .= '">';
+
+        return $output;
+    }
+
+    public function postRender()
+    {
+        if (!$this->show_trace) {
+            return '</div>';
+        }
+
+        $output = '<footer>';
+        $output .= '<span class="kint-popup-trigger" title="Open in new window">&boxbox;</span> ';
+
+        if (!empty($this->call_info['trace']) && \count($this->call_info['trace']) > 1) {
+            $output .= '<nav></nav>';
+        }
+
+        if (isset($this->call_info['callee']['file'])) {
+            $output .= 'Called from '.$this->ideLink(
+                $this->call_info['callee']['file'],
+                $this->call_info['callee']['line']
+            );
+        }
+
+        if (isset($this->call_info['callee']['function']) && (
+                !empty($this->call_info['callee']['class']) ||
+                !\in_array(
+                    $this->call_info['callee']['function'],
+                    array('include', 'include_once', 'require', 'require_once'),
+                    true
+                )
+            )
+        ) {
+            $output .= ' [';
+            if (isset($this->call_info['callee']['class'])) {
+                $output .= $this->call_info['callee']['class'];
+            }
+            if (isset($this->call_info['callee']['type'])) {
+                $output .= $this->call_info['callee']['type'];
+            }
+            $output .= $this->call_info['callee']['function'].'()]';
+        }
+
+        if (!empty($this->call_info['trace']) && \count($this->call_info['trace']) > 1) {
+            $output .= '<ol>';
+            foreach ($this->call_info['trace'] as $index => $step) {
+                if (!$index) {
+                    continue;
+                }
+
+                $output .= '<li>'.$this->ideLink($step['file'], $step['line']); // closing tag not required
+                if (isset($step['function'])
+                    && !\in_array($step['function'], array('include', 'include_once', 'require', 'require_once'), true)
+                ) {
+                    $output .= ' [';
+                    if (isset($step['class'])) {
+                        $output .= $step['class'];
+                    }
+                    if (isset($step['type'])) {
+                        $output .= $step['type'];
+                    }
+                    $output .= $step['function'].'()]';
+                }
+            }
+            $output .= '</ol>';
+        }
+
+        $output .= '</footer></div>';
+
+        return $output;
+    }
+
+    public function escape($string, $encoding = false)
+    {
+        if (false === $encoding) {
+            $encoding = BlobObject::detectEncoding($string);
+        }
+
+        $original_encoding = $encoding;
+
+        if (false === $encoding || 'ASCII' === $encoding) {
+            $encoding = 'UTF-8';
+        }
+
+        $string = \htmlspecialchars($string, ENT_NOQUOTES, $encoding);
+
+        // this call converts all non-ASCII characters into numeirc htmlentities
+        if (\function_exists('mb_encode_numericentity') && 'ASCII' !== $original_encoding) {
+            $string = \mb_encode_numericentity($string, array(0x80, 0xffff, 0, 0xffff), $encoding);
+        }
+
+        return $string;
+    }
+
+    public function ideLink($file, $line)
+    {
+        $path = $this->escape(Kint::shortenPath($file)).':'.$line;
+        $ideLink = Kint::getIdeLink($file, $line);
+
+        if (!$ideLink) {
+            return $path;
+        }
+
+        $class = '';
+
+        if (\preg_match('/https?:\\/\\//i', $ideLink)) {
+            $class = 'class="kint-ide-link" ';
+        }
+
+        return '<a '.$class.'href="'.$this->escape($ideLink).'">'.$path.'</a>';
+    }
+
+    protected function renderTab(BasicObject $o, Representation $rep)
+    {
+        if ($plugin = $this->getPlugin(self::$tab_plugins, $rep->hints)) {
+            if (\strlen($output = $plugin->renderTab($rep))) {
+                return $output;
+            }
+        }
+
+        if (\is_array($rep->contents)) {
+            $output = '';
+
+            if ($o instanceof InstanceObject && 'properties' === $rep->getName()) {
+                foreach (self::sortProperties($rep->contents, self::$sort) as $obj) {
+                    $output .= $this->render($obj);
+                }
+            } else {
+                foreach ($rep->contents as $obj) {
+                    $output .= $this->render($obj);
+                }
+            }
+
+            return $output;
+        }
+
+        if (\is_string($rep->contents)) {
+            $show_contents = false;
+
+            // If it is the value representation of a string and its whitespace
+            // was truncated in the header, always display the full string
+            if ('string' !== $o->type || $o->value !== $rep) {
+                $show_contents = true;
+            } else {
+                if (\preg_match('/(:?[\\r\\n\\t\\f\\v]| {2})/', $rep->contents)) {
+                    $show_contents = true;
+                } elseif (self::$strlen_max && BlobObject::strlen($o->getValueShort()) > self::$strlen_max) {
+                    $show_contents = true;
+                }
+
+                if (empty($o->encoding)) {
+                    $show_contents = false;
+                }
+            }
+
+            if ($show_contents) {
+                return '<pre>'.$this->escape($rep->contents)."\n</pre>";
+            }
+        }
+
+        if ($rep->contents instanceof BasicObject) {
+            return $this->render($rep->contents);
+        }
+    }
+
+    protected function getPlugin(array $plugins, array $hints)
+    {
+        if ($plugins = $this->matchPlugins($plugins, $hints)) {
+            $plugin = \end($plugins);
+
+            if (!isset($this->plugin_objs[$plugin])) {
+                $this->plugin_objs[$plugin] = new $plugin($this);
+            }
+
+            return $this->plugin_objs[$plugin];
+        }
+    }
+
+    protected static function renderJs()
+    {
+        return \file_get_contents(KINT_DIR.'/resources/compiled/shared.js').\file_get_contents(KINT_DIR.'/resources/compiled/rich.js');
+    }
+
+    protected static function renderCss()
+    {
+        if (\file_exists(KINT_DIR.'/resources/compiled/'.self::$theme)) {
+            return \file_get_contents(KINT_DIR.'/resources/compiled/'.self::$theme);
+        }
+
+        return \file_get_contents(self::$theme);
+    }
+
+    protected static function renderFolder()
+    {
+        return '<div class="kint-rich kint-folder"><dl><dt class="kint-parent"><nav></nav>Kint</dt><dd class="kint-folder"></dd></dl></div>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php b/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php
new file mode 100644
index 0000000..127d32a
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Object\BasicObject;
+
+class BlacklistPlugin extends Plugin
+{
+    public function render(BasicObject $o)
+    {
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->renderer->colorTitle($this->renderer->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderer->renderHeader($o).' '.$this->renderer->colorValue('BLACKLISTED').PHP_EOL;
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php b/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php
new file mode 100644
index 0000000..310b87e
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Object\BasicObject;
+
+class DepthLimitPlugin extends Plugin
+{
+    public function render(BasicObject $o)
+    {
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->renderer->colorTitle($this->renderer->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderer->renderHeader($o).' '.$this->renderer->colorValue('DEPTH LIMIT').PHP_EOL;
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php b/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php
new file mode 100644
index 0000000..9128032
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Object\BasicObject;
+use Kint\Object\Representation\MicrotimeRepresentation;
+use Kint\Renderer\PlainRenderer;
+use Kint\Renderer\Rich\MicrotimePlugin as RichPlugin;
+use Kint\Renderer\TextRenderer;
+use Kint\Utils;
+
+class MicrotimePlugin extends Plugin
+{
+    protected $useJs = false;
+
+    public function __construct(TextRenderer $r)
+    {
+        parent::__construct($r);
+
+        if ($this->renderer instanceof PlainRenderer) {
+            $this->useJs = true;
+        }
+    }
+
+    public function render(BasicObject $o)
+    {
+        $r = $o->getRepresentation('microtime');
+
+        if (!$r instanceof MicrotimeRepresentation) {
+            return false;
+        }
+
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->renderer->colorTitle($this->renderer->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderer->renderHeader($o);
+        $out .= $this->renderer->renderChildren($o).PHP_EOL;
+
+        $indent = \str_repeat(' ', ($o->depth + 1) * $this->renderer->indent_width);
+
+        if ($this->useJs) {
+            $out .= '<span data-kint-microtime-group="'.$r->group.'">';
+        }
+
+        $out .= $indent.$this->renderer->colorType('TIME:').' ';
+        $out .= $this->renderer->colorValue($r->getDateTime()->format('Y-m-d H:i:s.u')).PHP_EOL;
+
+        if (null !== $r->lap) {
+            $out .= $indent.$this->renderer->colorType('SINCE LAST CALL:').' ';
+
+            $lap = \round($r->lap, 4);
+
+            if ($this->useJs) {
+                $lap = '<span class="kint-microtime-lap">'.$lap.'</span>';
+            }
+
+            $out .= $this->renderer->colorValue($lap.'s').'.'.PHP_EOL;
+        }
+        if (null !== $r->total) {
+            $out .= $indent.$this->renderer->colorType('SINCE START:').' ';
+            $out .= $this->renderer->colorValue(\round($r->total, 4).'s').'.'.PHP_EOL;
+        }
+        if (null !== $r->avg) {
+            $out .= $indent.$this->renderer->colorType('AVERAGE DURATION:').' ';
+
+            $avg = \round($r->avg, 4);
+
+            if ($this->useJs) {
+                $avg = '<span class="kint-microtime-avg">'.$avg.'</span>';
+            }
+
+            $out .= $this->renderer->colorValue($avg.'s').'.'.PHP_EOL;
+        }
+
+        $bytes = Utils::getHumanReadableBytes($r->mem);
+        $mem = $r->mem.' bytes ('.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+        $bytes = Utils::getHumanReadableBytes($r->mem_real);
+        $mem .= ' (real '.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+
+        $out .= $indent.$this->renderer->colorType('MEMORY USAGE:').' ';
+        $out .= $this->renderer->colorValue($mem).'.'.PHP_EOL;
+
+        $bytes = Utils::getHumanReadableBytes($r->mem_peak);
+        $mem = $r->mem_peak.' bytes ('.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+        $bytes = Utils::getHumanReadableBytes($r->mem_peak_real);
+        $mem .= ' (real '.\round($bytes['value'], 3).' '.$bytes['unit'].')';
+
+        $out .= $indent.$this->renderer->colorType('PEAK MEMORY USAGE:').' ';
+        $out .= $this->renderer->colorValue($mem).'.'.PHP_EOL;
+
+        if ($this->useJs) {
+            $out .= '</span>';
+        }
+
+        return $out;
+    }
+
+    public static function renderJs()
+    {
+        return RichPlugin::renderJs();
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/Plugin.php b/system/ThirdParty/Kint/Renderer/Text/Plugin.php
new file mode 100644
index 0000000..9de25c1
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/Plugin.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Object\BasicObject;
+use Kint\Renderer\TextRenderer;
+
+abstract class Plugin
+{
+    protected $renderer;
+
+    public function __construct(TextRenderer $r)
+    {
+        $this->renderer = $r;
+    }
+
+    abstract public function render(BasicObject $o);
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php b/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php
new file mode 100644
index 0000000..72c2257
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Object\BasicObject;
+
+class RecursionPlugin extends Plugin
+{
+    public function render(BasicObject $o)
+    {
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->renderer->colorTitle($this->renderer->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderer->renderHeader($o).' '.$this->renderer->colorValue('RECURSION').PHP_EOL;
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php b/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php
new file mode 100644
index 0000000..5833840
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Object\BasicObject;
+use Kint\Object\MethodObject;
+
+class TracePlugin extends Plugin
+{
+    public function render(BasicObject $o)
+    {
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->renderer->colorTitle($this->renderer->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderer->renderHeader($o).':'.PHP_EOL;
+
+        $indent = \str_repeat(' ', ($o->depth + 1) * $this->renderer->indent_width);
+
+        $i = 1;
+        foreach ($o->value->contents as $frame) {
+            $framedesc = $indent.\str_pad($i.': ', 4, ' ');
+
+            if ($frame->trace['file']) {
+                $framedesc .= $this->renderer->ideLink($frame->trace['file'], $frame->trace['line']).PHP_EOL;
+            } else {
+                $framedesc .= 'PHP internal call'.PHP_EOL;
+            }
+
+            $framedesc .= $indent.'    ';
+
+            if ($frame->trace['class']) {
+                $framedesc .= $this->renderer->escape($frame->trace['class']);
+
+                if ($frame->trace['object']) {
+                    $framedesc .= $this->renderer->escape('->');
+                } else {
+                    $framedesc .= '::';
+                }
+            }
+
+            if (\is_string($frame->trace['function'])) {
+                $framedesc .= $this->renderer->escape($frame->trace['function']).'(...)';
+            } elseif ($frame->trace['function'] instanceof MethodObject) {
+                $framedesc .= $this->renderer->escape($frame->trace['function']->getName());
+                $framedesc .= '('.$this->renderer->escape($frame->trace['function']->getParams()).')';
+            }
+
+            $out .= $this->renderer->colorType($framedesc).PHP_EOL.PHP_EOL;
+
+            if ($source = $frame->getRepresentation('source')) {
+                $line_wanted = $source->line;
+                $source = $source->source;
+
+                // Trim empty lines from the start and end of the source
+                foreach ($source as $linenum => $line) {
+                    if (\trim($line) || $linenum === $line_wanted) {
+                        break;
+                    }
+
+                    unset($source[$linenum]);
+                }
+
+                foreach (\array_reverse($source, true) as $linenum => $line) {
+                    if (\trim($line) || $linenum === $line_wanted) {
+                        break;
+                    }
+
+                    unset($source[$linenum]);
+                }
+
+                foreach ($source as $lineno => $line) {
+                    if ($lineno == $line_wanted) {
+                        $out .= $indent.$this->renderer->colorValue($this->renderer->escape($line)).PHP_EOL;
+                    } else {
+                        $out .= $indent.$this->renderer->escape($line).PHP_EOL;
+                    }
+                }
+            }
+
+            ++$i;
+        }
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/TextRenderer.php b/system/ThirdParty/Kint/Renderer/TextRenderer.php
new file mode 100644
index 0000000..43b6c40
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/TextRenderer.php
@@ -0,0 +1,346 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint\Renderer;
+
+use Kint\Kint;
+use Kint\Object\BasicObject;
+use Kint\Object\InstanceObject;
+use Kint\Utils;
+
+class TextRenderer extends Renderer
+{
+    /**
+     * TextRenderer plugins should be instances of Kint\Renderer\Text\Plugin.
+     */
+    public static $plugins = array(
+        'blacklist' => 'Kint\\Renderer\\Text\\BlacklistPlugin',
+        'depth_limit' => 'Kint\\Renderer\\Text\\DepthLimitPlugin',
+        'microtime' => 'Kint\\Renderer\\Text\\MicrotimePlugin',
+        'recursion' => 'Kint\\Renderer\\Text\\RecursionPlugin',
+        'trace' => 'Kint\\Renderer\\Text\\TracePlugin',
+    );
+
+    /**
+     * Parser plugins must be instanceof one of these or
+     * it will be removed for performance reasons.
+     */
+    public static $parser_plugin_whitelist = array(
+        'Kint\\Parser\\BlacklistPlugin',
+        'Kint\\Parser\\MicrotimePlugin',
+        'Kint\\Parser\\StreamPlugin',
+        'Kint\\Parser\\TracePlugin',
+    );
+
+    /**
+     * The maximum length of a string before it is truncated.
+     *
+     * Falsey to disable
+     *
+     * @var int
+     */
+    public static $strlen_max = 0;
+
+    /**
+     * The default width of the terminal for headers.
+     *
+     * @var int
+     */
+    public static $default_width = 80;
+
+    /**
+     * Indentation width.
+     *
+     * @var int
+     */
+    public static $default_indent = 4;
+
+    /**
+     * Decorate the header and footer.
+     *
+     * @var bool
+     */
+    public static $decorations = true;
+
+    /**
+     * Sort mode for object properties.
+     *
+     * @var int
+     */
+    public static $sort = self::SORT_NONE;
+
+    public $header_width = 80;
+    public $indent_width = 4;
+
+    protected $plugin_objs = array();
+
+    public function __construct()
+    {
+        $this->header_width = self::$default_width;
+        $this->indent_width = self::$default_indent;
+    }
+
+    public function render(BasicObject $o)
+    {
+        if ($plugin = $this->getPlugin(self::$plugins, $o->hints)) {
+            if (\strlen($output = $plugin->render($o))) {
+                return $output;
+            }
+        }
+
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->colorTitle($this->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderHeader($o);
+        $out .= $this->renderChildren($o).PHP_EOL;
+
+        return $out;
+    }
+
+    public function renderNothing()
+    {
+        if (self::$decorations) {
+            return $this->colorTitle(
+                $this->boxText('No argument', $this->header_width)
+            ).PHP_EOL;
+        }
+
+        return $this->colorTitle('No argument').PHP_EOL;
+    }
+
+    public function boxText($text, $width)
+    {
+        $out = 'ā”Œ'.\str_repeat('ā”€', $width - 2).'ā”'.PHP_EOL;
+
+        if (\strlen($text)) {
+            $text = Utils::truncateString($text, $width - 4);
+            $text = \str_pad($text, $width - 4);
+
+            $out .= 'ā”‚ '.$this->escape($text).' ā”‚'.PHP_EOL;
+        }
+
+        $out .= 'ā””'.\str_repeat('ā”€', $width - 2).'ā”˜';
+
+        return $out;
+    }
+
+    public function renderTitle(BasicObject $o)
+    {
+        $name = (string) $o->getName();
+
+        if (self::$decorations) {
+            return $this->boxText($name, $this->header_width);
+        }
+
+        return Utils::truncateString($name, $this->header_width);
+    }
+
+    public function renderHeader(BasicObject $o)
+    {
+        $output = array();
+
+        if ($o->depth) {
+            if (null !== ($s = $o->getModifiers())) {
+                $output[] = $s;
+            }
+
+            if (null !== $o->name) {
+                $output[] = $this->escape(\var_export($o->name, true));
+
+                if (null !== ($s = $o->getOperator())) {
+                    $output[] = $this->escape($s);
+                }
+            }
+        }
+
+        if (null !== ($s = $o->getType())) {
+            if ($o->reference) {
+                $s = '&'.$s;
+            }
+
+            $output[] = $this->colorType($this->escape($s));
+        }
+
+        if (null !== ($s = $o->getSize())) {
+            $output[] = '('.$this->escape($s).')';
+        }
+
+        if (null !== ($s = $o->getValueShort())) {
+            if (self::$strlen_max) {
+                $s = Utils::truncateString($s, self::$strlen_max);
+            }
+            $output[] = $this->colorValue($this->escape($s));
+        }
+
+        return \str_repeat(' ', $o->depth * $this->indent_width).\implode(' ', $output);
+    }
+
+    public function renderChildren(BasicObject $o)
+    {
+        if ('array' === $o->type) {
+            $output = ' [';
+        } elseif ('object' === $o->type) {
+            $output = ' (';
+        } else {
+            return '';
+        }
+
+        $children = '';
+
+        if ($o->value && \is_array($o->value->contents)) {
+            if ($o instanceof InstanceObject && 'properties' === $o->value->getName()) {
+                foreach (self::sortProperties($o->value->contents, self::$sort) as $obj) {
+                    $children .= $this->render($obj);
+                }
+            } else {
+                foreach ($o->value->contents as $child) {
+                    $children .= $this->render($child);
+                }
+            }
+        }
+
+        if ($children) {
+            $output .= PHP_EOL.$children;
+            $output .= \str_repeat(' ', $o->depth * $this->indent_width);
+        }
+
+        if ('array' === $o->type) {
+            $output .= ']';
+        } else {
+            $output .= ')';
+        }
+
+        return $output;
+    }
+
+    public function colorValue($string)
+    {
+        return $string;
+    }
+
+    public function colorType($string)
+    {
+        return $string;
+    }
+
+    public function colorTitle($string)
+    {
+        return $string;
+    }
+
+    public function postRender()
+    {
+        if (self::$decorations) {
+            $output = \str_repeat('ā•', $this->header_width);
+        } else {
+            $output = '';
+        }
+
+        if (!$this->show_trace) {
+            return $this->colorTitle($output);
+        }
+
+        if ($output) {
+            $output .= PHP_EOL;
+        }
+
+        return $this->colorTitle($output.$this->calledFrom().PHP_EOL);
+    }
+
+    public function filterParserPlugins(array $plugins)
+    {
+        $return = array();
+
+        foreach ($plugins as $index => $plugin) {
+            foreach (self::$parser_plugin_whitelist as $whitelist) {
+                if ($plugin instanceof $whitelist) {
+                    $return[] = $plugin;
+                    continue 2;
+                }
+            }
+        }
+
+        return $return;
+    }
+
+    public function ideLink($file, $line)
+    {
+        return $this->escape(Kint::shortenPath($file)).':'.$line;
+    }
+
+    public function escape($string, $encoding = false)
+    {
+        return $string;
+    }
+
+    protected function calledFrom()
+    {
+        $output = '';
+
+        if (isset($this->call_info['callee']['file'])) {
+            $output .= 'Called from '.$this->ideLink(
+                $this->call_info['callee']['file'],
+                $this->call_info['callee']['line']
+            );
+        }
+
+        if (isset($this->call_info['callee']['function']) && (
+                !empty($this->call_info['callee']['class']) ||
+                !\in_array(
+                    $this->call_info['callee']['function'],
+                    array('include', 'include_once', 'require', 'require_once'),
+                    true
+                )
+            )
+        ) {
+            $output .= ' [';
+            if (isset($this->call_info['callee']['class'])) {
+                $output .= $this->call_info['callee']['class'];
+            }
+            if (isset($this->call_info['callee']['type'])) {
+                $output .= $this->call_info['callee']['type'];
+            }
+            $output .= $this->call_info['callee']['function'].'()]';
+        }
+
+        return $output;
+    }
+
+    protected function getPlugin(array $plugins, array $hints)
+    {
+        if ($plugins = $this->matchPlugins($plugins, $hints)) {
+            $plugin = \end($plugins);
+
+            if (!isset($this->plugin_objs[$plugin])) {
+                $this->plugin_objs[$plugin] = new $plugin($this);
+            }
+
+            return $this->plugin_objs[$plugin];
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Utils.php b/system/ThirdParty/Kint/Utils.php
new file mode 100644
index 0000000..27a2491
--- /dev/null
+++ b/system/ThirdParty/Kint/Utils.php
@@ -0,0 +1,240 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+namespace Kint;
+
+use InvalidArgumentException;
+use Kint\Object\BlobObject;
+use ReflectionNamedType;
+use ReflectionType;
+
+/**
+ * A collection of utility methods. Should all be static methods with no dependencies.
+ */
+final class Utils
+{
+    /**
+     * @codeCoverageIgnore
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Turns a byte value into a human-readable representation.
+     *
+     * @param int $value Amount of bytes
+     *
+     * @return array Human readable value and unit
+     */
+    public static function getHumanReadableBytes($value)
+    {
+        static $unit = array('B', 'KB', 'MB', 'GB', 'TB');
+
+        $i = \floor(\log($value, 1024));
+        $i = \min($i, 4); // Only go up to TB
+
+        return array(
+            'value' => (float) ($value / \pow(1024, $i)),
+            'unit' => $unit[$i],
+        );
+    }
+
+    public static function isSequential(array $array)
+    {
+        return \array_keys($array) === \range(0, \count($array) - 1);
+    }
+
+    public static function composerGetExtras($key = 'kint')
+    {
+        $extras = array();
+
+        if (0 === \strpos(KINT_DIR, 'phar://')) {
+            // Only run inside phar file, so skip for code coverage
+            return $extras; // @codeCoverageIgnore
+        }
+
+        $folder = KINT_DIR.'/vendor';
+
+        for ($i = 0; $i < 4; ++$i) {
+            $installed = $folder.'/composer/installed.json';
+
+            if (\file_exists($installed) && \is_readable($installed)) {
+                $packages = \json_decode(\file_get_contents($installed), true);
+
+                foreach ($packages as $package) {
+                    if (isset($package['extra'][$key]) && \is_array($package['extra'][$key])) {
+                        $extras = \array_replace($extras, $package['extra'][$key]);
+                    }
+                }
+
+                $folder = \dirname($folder);
+
+                if (\file_exists($folder.'/composer.json') && \is_readable($folder.'/composer.json')) {
+                    $composer = \json_decode(\file_get_contents($folder.'/composer.json'), true);
+
+                    if (isset($composer['extra'][$key]) && \is_array($composer['extra'][$key])) {
+                        $extras = \array_replace($extras, $composer['extra'][$key]);
+                    }
+                }
+
+                break;
+            }
+
+            $folder = \dirname($folder);
+        }
+
+        return $extras;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public static function composerSkipFlags()
+    {
+        $extras = self::composerGetExtras();
+
+        if (!empty($extras['disable-facade']) && !\defined('KINT_SKIP_FACADE')) {
+            \define('KINT_SKIP_FACADE', true);
+        }
+
+        if (!empty($extras['disable-helpers']) && !\defined('KINT_SKIP_HELPERS')) {
+            \define('KINT_SKIP_HELPERS', true);
+        }
+    }
+
+    public static function isTrace(array $trace)
+    {
+        if (!self::isSequential($trace)) {
+            return false;
+        }
+
+        static $bt_structure = array(
+            'function' => 'string',
+            'line' => 'integer',
+            'file' => 'string',
+            'class' => 'string',
+            'object' => 'object',
+            'type' => 'string',
+            'args' => 'array',
+        );
+
+        $file_found = false;
+
+        foreach ($trace as $frame) {
+            if (!\is_array($frame) || !isset($frame['function'])) {
+                return false;
+            }
+
+            foreach ($frame as $key => $val) {
+                if (!isset($bt_structure[$key])) {
+                    return false;
+                }
+
+                if (\gettype($val) !== $bt_structure[$key]) {
+                    return false;
+                }
+
+                if ('file' === $key) {
+                    $file_found = true;
+                }
+            }
+        }
+
+        return $file_found;
+    }
+
+    public static function traceFrameIsListed(array $frame, array $matches)
+    {
+        if (isset($frame['class'])) {
+            $called = array(\strtolower($frame['class']), \strtolower($frame['function']));
+        } else {
+            $called = \strtolower($frame['function']);
+        }
+
+        return \in_array($called, $matches, true);
+    }
+
+    public static function normalizeAliases(array &$aliases)
+    {
+        static $name_regex = '[a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*';
+
+        foreach ($aliases as $index => &$alias) {
+            if (\is_array($alias) && 2 === \count($alias)) {
+                $alias = \array_values(\array_filter($alias, 'is_string'));
+
+                if (2 === \count($alias) &&
+                    \preg_match('/^'.$name_regex.'$/', $alias[1]) &&
+                    \preg_match('/^\\\\?('.$name_regex.'\\\\)*'.$name_regex.'$/', $alias[0])
+                ) {
+                    $alias = array(
+                        \strtolower(\ltrim($alias[0], '\\')),
+                        \strtolower($alias[1]),
+                    );
+                } else {
+                    unset($aliases[$index]);
+                    continue;
+                }
+            } elseif (\is_string($alias)) {
+                if (\preg_match('/^\\\\?('.$name_regex.'\\\\)*'.$name_regex.'$/', $alias)) {
+                    $alias = \explode('\\', \strtolower($alias));
+                    $alias = \end($alias);
+                } else {
+                    unset($aliases[$index]);
+                    continue;
+                }
+            } else {
+                unset($aliases[$index]);
+            }
+        }
+
+        $aliases = \array_values($aliases);
+    }
+
+    public static function truncateString($input, $length = PHP_INT_MAX, $end = '...', $encoding = false)
+    {
+        $length = (int) $length;
+        $endlength = BlobObject::strlen($end);
+
+        if ($endlength >= $length) {
+            throw new InvalidArgumentException('Can\'t truncate a string to '.$length.' characters if ending with string '.$endlength.' characters long');
+        }
+
+        if (BlobObject::strlen($input, $encoding) > $length) {
+            return BlobObject::substr($input, 0, $length - $endlength, $encoding).$end;
+        }
+
+        return $input;
+    }
+
+    public static function getTypeString(ReflectionType $type)
+    {
+        if ($type instanceof ReflectionNamedType) {
+            return $type->getName();
+        }
+
+        return (string) $type; // @codeCoverageIgnore
+    }
+}
diff --git a/system/ThirdParty/Kint/init.php b/system/ThirdParty/Kint/init.php
new file mode 100644
index 0000000..952e041
--- /dev/null
+++ b/system/ThirdParty/Kint/init.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+use Kint\Kint;
+use Kint\Utils;
+
+if (\defined('KINT_DIR')) {
+    return;
+}
+
+if (\version_compare(PHP_VERSION, '5.3') < 0) {
+    throw new Exception('Kint 3.0 requires PHP 5.3 or higher');
+}
+
+\define('KINT_DIR', __DIR__);
+\define('KINT_WIN', DIRECTORY_SEPARATOR !== '/');
+\define('KINT_PHP56', (\version_compare(PHP_VERSION, '5.6') >= 0));
+\define('KINT_PHP70', (\version_compare(PHP_VERSION, '7.0') >= 0));
+\define('KINT_PHP72', (\version_compare(PHP_VERSION, '7.2') >= 0));
+\define('KINT_PHP73', (\version_compare(PHP_VERSION, '7.3') >= 0));
+\define('KINT_PHP74', (\version_compare(PHP_VERSION, '7.4') >= 0));
+
+// Dynamic default settings
+Kint::$file_link_format = \ini_get('xdebug.file_link_format');
+if (isset($_SERVER['DOCUMENT_ROOT'])) {
+    Kint::$app_root_dirs = array(
+        $_SERVER['DOCUMENT_ROOT'] => '<ROOT>',
+        \realpath($_SERVER['DOCUMENT_ROOT']) => '<ROOT>',
+    );
+}
+
+Utils::composerSkipFlags();
+
+if ((!\defined('KINT_SKIP_FACADE') || !KINT_SKIP_FACADE) && !\class_exists('Kint')) {
+    \class_alias('Kint\\Kint', 'Kint');
+}
+
+if (!\defined('KINT_SKIP_HELPERS') || !KINT_SKIP_HELPERS) {
+    require_once __DIR__.'/init_helpers.php';
+}
diff --git a/system/ThirdParty/Kint/init_helpers.php b/system/ThirdParty/Kint/init_helpers.php
new file mode 100644
index 0000000..b961d67
--- /dev/null
+++ b/system/ThirdParty/Kint/init_helpers.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Å leinius (raveren@gmail.com)
+ *
+ * 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.
+ */
+
+use Kint\Kint;
+
+if (!\function_exists('d')) {
+    /**
+     * Alias of Kint::dump().
+     *
+     * @return int|string
+     */
+    function d()
+    {
+        $args = \func_get_args();
+
+        return \call_user_func_array(array('Kint', 'dump'), $args);
+    }
+
+    Kint::$aliases[] = 'd';
+}
+
+if (!\function_exists('s')) {
+    /**
+     * Alias of Kint::dump(), however the output is in plain text.
+     *
+     * Alias of Kint::dump(), however the output is in plain htmlescaped text
+     * with some minor visibility enhancements added.
+     *
+     * If run in CLI mode, output is not escaped.
+     *
+     * To force rendering mode without autodetecting anything:
+     *
+     * Kint::$enabled_mode = Kint::MODE_PLAIN;
+     * Kint::dump( $variable );
+     *
+     * @return int|string
+     */
+    function s()
+    {
+        if (!Kint::$enabled_mode) {
+            return 0;
+        }
+
+        $stash = Kint::$enabled_mode;
+
+        if (Kint::MODE_TEXT !== Kint::$enabled_mode) {
+            Kint::$enabled_mode = Kint::MODE_PLAIN;
+            if (PHP_SAPI === 'cli' && true === Kint::$cli_detection) {
+                Kint::$enabled_mode = Kint::$mode_default_cli;
+            }
+        }
+
+        $args = \func_get_args();
+        $out = \call_user_func_array(array('Kint', 'dump'), $args);
+
+        Kint::$enabled_mode = $stash;
+
+        return $out;
+    }
+
+    Kint::$aliases[] = 's';
+}
diff --git a/system/ThirdParty/Kint/resources/compiled/aante-light.css b/system/ThirdParty/Kint/resources/compiled/aante-light.css
new file mode 100644
index 0000000..2de17ac
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/aante-light.css
@@ -0,0 +1 @@
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
diff --git a/system/ThirdParty/Kint/resources/compiled/microtime.js b/system/ThirdParty/Kint/resources/compiled/microtime.js
new file mode 100644
index 0000000..20e3445
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/microtime.js
@@ -0,0 +1 @@
+void 0===window.kintMicrotimeInitialized&&(window.kintMicrotimeInitialized=1,window.addEventListener("load",function(){"use strict";var c={},i=Array.prototype.slice.call(document.querySelectorAll("[data-kint-microtime-group]"),0);i.forEach(function(i){if(i.querySelector(".kint-microtime-lap")){var t=i.getAttribute("data-kint-microtime-group"),e=parseFloat(i.querySelector(".kint-microtime-lap").innerHTML),r=parseFloat(i.querySelector(".kint-microtime-avg").innerHTML);void 0===c[t]&&(c[t]={}),(void 0===c[t].min||c[t].min>e)&&(c[t].min=e),(void 0===c[t].max||c[t].max<e)&&(c[t].max=e),c[t].avg=r}}),i.forEach(function(i){var t=i.querySelector(".kint-microtime-lap");if(null!==t){var e=parseFloat(t.textContent),r=i.dataset.kintMicrotimeGroup,o=c[r].avg,n=c[r].max,a=c[r].min;e===(i.querySelector(".kint-microtime-avg").textContent=o)&&e===a&&e===n||(t.style.background=o<e?"hsl("+(40-40*((e-o)/(n-o)))+", 100%, 65%)":"hsl("+(40+80*(o===a?0:(o-e)/(o-a)))+", 100%, 65%)")}})}));
diff --git a/system/ThirdParty/Kint/resources/compiled/original.css b/system/ThirdParty/Kint/resources/compiled/original.css
new file mode 100644
index 0000000..7366299
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/original.css
@@ -0,0 +1 @@
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
diff --git a/system/ThirdParty/Kint/resources/compiled/plain.css b/system/ThirdParty/Kint/resources/compiled/plain.css
new file mode 100644
index 0000000..ba1eba0
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/plain.css
@@ -0,0 +1 @@
+.kint-plain{background:rgba(255,255,255,0.9);white-space:pre;display:block;font-family:monospace;color:#222}.kint-plain i{color:#d00;font-style:normal}.kint-plain u{color:#030;text-decoration:none;font-weight:bold}.kint-plain .kint-microtime-lap{font-weight:bold;text-shadow:1px 0 #fff, 0 1px #fff, -1px 0 #fff, 0 -1px #fff}
diff --git a/system/ThirdParty/Kint/resources/compiled/plain.js b/system/ThirdParty/Kint/resources/compiled/plain.js
new file mode 100644
index 0000000..9791fc9
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/plain.js
@@ -0,0 +1 @@
+void 0===window.kintPlain&&(window.kintPlain=function(){"use strict";var i={initLoad:function(){i.style=window.kintShared.dedupe("style.kint-plain-style",i.style),i.script=window.kintShared.dedupe("script.kint-plain-script",i.script)},style:null,script:null};return i}()),window.kintShared.runOnce(window.kintPlain.initLoad);
diff --git a/system/ThirdParty/Kint/resources/compiled/rich.js b/system/ThirdParty/Kint/resources/compiled/rich.js
new file mode 100644
index 0000000..18fb072
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/rich.js
@@ -0,0 +1 @@
+void 0===window.kintRich&&(window.kintRich=function(){"use strict";var n={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},each:function(e,t){Array.prototype.slice.call(document.querySelectorAll(e),0).forEach(t)},hasClass:function(e,t){return!!e.classList&&(void 0===t&&(t="kint-show"),e.classList.contains(t))},addClass:function(e,t){void 0===t&&(t="kint-show"),e.classList.add(t)},removeClass:function(e,t){return void 0===t&&(t="kint-show"),e.classList.remove(t),e},toggle:function(e,t){var a=n.getChildren(e);a&&(void 0===t&&(t=n.hasClass(e)),t?n.removeClass(e):n.addClass(e),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&n.hasClass(a,"kint-parent")&&n.toggle(a,t))},toggleChildren:function(e,t){var a=n.getChildren(e);if(a){var r=a.getElementsByClassName("kint-parent"),o=r.length;for(void 0===t&&(t=!n.hasClass(e));o--;)n.toggle(r[o],t)}},toggleAll:function(e){for(var t=document.getElementsByClassName("kint-parent"),a=t.length,r=!n.hasClass(e.parentNode);a--;)n.toggle(t[a],r)},switchTab:function(e){var t,a=e.previousSibling,r=0;for(n.removeClass(e.parentNode.getElementsByClassName("kint-active-tab")[0],"kint-active-tab"),n.addClass(e,"kint-active-tab");a;)1===a.nodeType&&r++,a=a.previousSibling;t=e.parentNode.nextSibling.childNodes;for(var o=0;o<t.length;o++)o===r?(t[o].style.display="block",1===t[o].childNodes.length&&(a=t[o].childNodes[0].childNodes[0])&&n.hasClass(a,"kint-parent")&&n.toggle(a,!1)):t[o].style.display="none"},mktag:function(e){return"<"+e+">"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(n.mktag("html")+n.mktag("head")+n.mktag("title")+"Kint ("+(new Date).toISOString()+")"+n.mktag("/title")+n.mktag('meta charset="utf-8"')+document.getElementsByClassName("kint-rich-script")[0].outerHTML+document.getElementsByClassName("kint-rich-style")[0].outerHTML+n.mktag("/head")+n.mktag("body")+'<input style="width: 100%" placeholder="Take some notes!"><div class="kint-rich">'+e.parentNode.outerHTML+"</div>"+n.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return e<t?-1:t<e?1:0}).forEach(function(e){t.appendChild(e)})},showAccessPath:function(e){for(var t=e.childNodes,a=0;a<t.length;a++)if(n.hasClass(t[a],"access-path"))return void(n.hasClass(t[a],"kint-show")?n.removeClass(t[a]):(n.addClass(t[a]),n.selectText(t[a])))},showSearchBox:function(e){var t=e.querySelector(".kint-search");t&&(n.hasClass(t)?(n.removeClass(t),n.removeClass(e.parentNode,"kint-search-root")):(n.addClass(e),n.addClass(t),t.focus(),t.select(),n.search(t)))},search:function(e){var t=e.parentNode.parentNode;if(e.value.length){var a=n.findMatches(t,e.value);n.highlightMatches(t,a)}else n.removeClass(t,"kint-search-root")},findMatches:function(e,t){for(var a=null,r=0;r<e.children.length;r++)if("DD"===e.children[r].tagName){a=e.children[r];break}if(!a)return[];var o=a.querySelectorAll("dfn"),s=[];return t=t.toLowerCase(),[].forEach.call(o,function(e){-1!=e.innerText.toLowerCase().indexOf(t)&&s.push(e)}),s},highlightMatches:function(e,t){var a=e.querySelectorAll(".kint-search-match");[].forEach.call(a,function(e){n.removeClass(e,"kint-search-match")}),n.addClass(e,"kint-search-root");for(var r=0;r<t.length;r++){for(var o=t[r];o!=e;){if("DL"===o.tagName)n.addClass(o,"kint-search-match");else if("LI"===o.tagName){if(o.parentNode.previousElementSibling.classList.contains("kint-tabs")){var s=[].slice.call(o.parentNode.children).indexOf(o);n.addClass([].slice.call(o.parentNode.previousElementSibling.children)[s],"kint-search-match")}o=o.parentNode}o=o.parentNode}n.addClass(t[r],"kint-search-match")}},getParentByClass:function(e,t){for(void 0===t&&(t="kint-rich");(e=e.parentNode)&&!n.hasClass(e,t););return e},getParentHeader:function(e,t){for(var a=e.nodeName.toLowerCase();"dd"!==a&&"dt"!==a&&n.getParentByClass(e);)a=(e=e.parentNode).nodeName.toLowerCase();return n.getParentByClass(e)?("dd"===a&&t&&(e=e.previousElementSibling),e&&"dt"===e.nodeName.toLowerCase()&&n.hasClass(e,"kint-parent")?e:void 0):null},getChildren:function(e){for(;(e=e.nextElementSibling)&&"dd"!==e.nodeName.toLowerCase(););return e},initLoad:function(){n.style=window.kintShared.dedupe("style.kint-rich-style",n.style),n.script=window.kintShared.dedupe("script.kint-rich-script",n.script),n.folder=window.kintShared.dedupe(".kint-rich.kint-folder",n.folder);var e=document.querySelectorAll("input.kint-search");if([].forEach.call(e,function(a){function e(e){if(window.clearTimeout(r),a.value!==t){var t=a.value;r=window.setTimeout(function(){n.search(a)},500)}}var r=null;a.removeEventListener("keyup",e),a.addEventListener("keyup",e)}),n.folder){var t=n.folder.querySelector("dd");[].forEach.call(document.querySelectorAll(".kint-rich.kint-file"),function(e){e.parentNode!==n.folder&&t.appendChild(e)}),document.body.appendChild(n.folder),n.addClass(n.folder)}},keyboardNav:{targets:[],target:0,active:!1,fetchTargets:function(){n.keyboardNav.targets=[],n.each(".kint-rich nav, .kint-tabs>li:not(.kint-active-tab)",function(e){0===e.offsetWidth&&0===e.offsetHeight||n.keyboardNav.targets.push(e)})},sync:function(e){var t=document.querySelector(".kint-focused");if(t&&n.removeClass(t,"kint-focused"),n.keyboardNav.active){var a=n.keyboardNav.targets[n.keyboardNav.target];n.addClass(a,"kint-focused"),e||n.keyboardNav.scroll(a)}},scroll:function(e){var t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)},a=t(e);if(n.folder){var r=n.folder.querySelector("dd.kint-folder");r.scrollTo(0,a-r.clientHeight/2)}else window.scrollTo(0,a-window.innerHeight/2)},moveCursor:function(e){for(n.keyboardNav.target+=e;n.keyboardNav.target<0;)n.keyboardNav.target+=n.keyboardNav.targets.length;for(;n.keyboardNav.target>=n.keyboardNav.targets.length;)n.keyboardNav.target-=n.keyboardNav.targets.length;n.keyboardNav.sync()},setCursor:function(e){n.keyboardNav.fetchTargets();for(var t=0;t<n.keyboardNav.targets.length;t++)if(e===n.keyboardNav.targets[t])return n.keyboardNav.target=t,!0;return!1}},mouseNav:{lastClickTarget:null,lastClickTimer:null,lastClickCount:0,renewLastClick:function(){window.clearTimeout(n.mouseNav.lastClickTimer),n.mouseNav.lastClickTimer=window.setTimeout(function(){n.mouseNav.lastClickTarget=null,n.mouseNav.lastClickTimer=null,n.mouseNav.lastClickCount=0},250)}},style:null,script:null,folder:null};return window.addEventListener("click",function(e){var t=e.target,a=t.nodeName.toLowerCase();if(n.mouseNav.lastClickTarget&&n.mouseNav.lastClickTimer&&n.mouseNav.lastClickCount)return t=n.mouseNav.lastClickTarget,void(1===n.mouseNav.lastClickCount?(n.toggleChildren(t.parentNode),n.keyboardNav.setCursor(t),n.keyboardNav.sync(!0),n.mouseNav.lastClickCount++,n.mouseNav.renewLastClick()):(n.toggleAll(t),n.keyboardNav.setCursor(t),n.keyboardNav.sync(!0),n.keyboardNav.scroll(t),window.clearTimeout(n.mouseNav.lastClickTimer),n.mouseNav.lastClickTarget=null,n.mouseNav.lastClickTarget=null,n.mouseNav.lastClickCount=0));if(n.getParentByClass(t)){if("dfn"===a)n.selectText(t);else if("th"===a)return void(e.ctrlKey||n.sortTable(t.parentNode.parentNode.parentNode,t.cellIndex));if((t=n.getParentHeader(t))&&(n.keyboardNav.setCursor(t.querySelector("nav")),n.keyboardNav.sync(!0)),t=e.target,"li"===a&&"kint-tabs"===t.parentNode.className)"kint-active-tab"!==t.className&&n.switchTab(t),(t=n.getParentHeader(t,!0))&&(n.keyboardNav.setCursor(t.querySelector("nav")),n.keyboardNav.sync(!0));else if("nav"===a)"footer"===t.parentNode.nodeName.toLowerCase()?(n.keyboardNav.setCursor(t),n.keyboardNav.sync(!0),t=t.parentNode,n.hasClass(t)?n.removeClass(t):n.addClass(t)):(n.toggle(t.parentNode),n.keyboardNav.fetchTargets(),n.mouseNav.lastClickCount=1,n.mouseNav.lastClickTarget=t,n.mouseNav.renewLastClick());else if(n.hasClass(t,"kint-popup-trigger")){var r=t.parentNode;if("footer"===r.nodeName.toLowerCase())r=r.previousSibling;else for(;r&&!n.hasClass(r,"kint-parent");)r=r.parentNode;n.openInNewWindow(r)}else n.hasClass(t,"kint-access-path-trigger")?n.showAccessPath(t.parentNode):n.hasClass(t,"kint-search-trigger")?n.showSearchBox(t.parentNode):n.hasClass(t,"kint-search")||("pre"===a&&3===e.detail?n.selectText(t):n.getParentByClass(t,"kint-source")&&3===e.detail?n.selectText(n.getParentByClass(t,"kint-source")):n.hasClass(t,"access-path")?n.selectText(t):"a"!==a&&(t=n.getParentHeader(t))&&(n.toggle(t),n.keyboardNav.fetchTargets()))}},!0),window.addEventListener("keydown",function(e){if(e.target===document.body&&!e.altKey&&!e.ctrlKey){if(68===e.keyCode){if(n.keyboardNav.active)n.keyboardNav.active=!1;else if(n.keyboardNav.active=!0,n.keyboardNav.fetchTargets(),0===n.keyboardNav.targets.length)return void(n.keyboardNav.active=!1);return n.keyboardNav.sync(),void e.preventDefault()}if(n.keyboardNav.active){if(9===e.keyCode)return n.keyboardNav.moveCursor(e.shiftKey?-1:1),void e.preventDefault();if(38===e.keyCode||75===e.keyCode)return n.keyboardNav.moveCursor(-1),void e.preventDefault();if(40===e.keyCode||74===e.keyCode)return n.keyboardNav.moveCursor(1),void e.preventDefault();var t=n.keyboardNav.targets[n.keyboardNav.target];if("li"===t.nodeName.toLowerCase()){if(32===e.keyCode||13===e.keyCode)return n.switchTab(t),n.keyboardNav.fetchTargets(),n.keyboardNav.sync(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode)return n.keyboardNav.moveCursor(1),void e.preventDefault();if(37===e.keyCode||72===e.keyCode)return n.keyboardNav.moveCursor(-1),void e.preventDefault()}if(t=t.parentNode,65===e.keyCode)return n.showAccessPath(t),void e.preventDefault();if("footer"===t.nodeName.toLowerCase()&&n.hasClass(t.parentNode,"kint-rich"))32===e.keyCode||13===e.keyCode?(n.hasClass(t)?n.removeClass(t):n.addClass(t),e.preventDefault()):37===e.keyCode||72===e.keyCode?(n.removeClass(t),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode||(n.addClass(t),e.preventDefault());else{if(32===e.keyCode||13===e.keyCode)return n.toggle(t),n.keyboardNav.fetchTargets(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode||37===e.keyCode||72===e.keyCode){var a=37===e.keyCode||72===e.keyCode;if(n.hasClass(t))n.toggleChildren(t,a),n.toggle(t,a);else{if(a){var r=n.getParentHeader(t.parentNode.parentNode,!0);r&&(t=r,n.keyboardNav.setCursor(t.querySelector("nav")),n.keyboardNav.sync())}n.toggle(t,a)}return n.keyboardNav.fetchTargets(),void e.preventDefault()}}}}},!0),n}()),window.kintShared.runOnce(window.kintRich.initLoad);
diff --git a/system/ThirdParty/Kint/resources/compiled/shared.js b/system/ThirdParty/Kint/resources/compiled/shared.js
new file mode 100644
index 0000000..5869c5b
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/shared.js
@@ -0,0 +1 @@
+void 0===window.kintShared&&(window.kintShared=function(){"use strict";var e={dedupe:function(e,n){return[].forEach.call(document.querySelectorAll(e),function(e){n&&n.ownerDocument.contains(n)||(n=e),e!==n&&e.parentNode.removeChild(e)}),n},runOnce:function(e){"complete"===document.readyState?e():window.addEventListener("load",e)}};return window.addEventListener("click",function(e){if(e.target.classList.contains("kint-ide-link")){var n=new XMLHttpRequest;n.open("GET",e.target.href),n.send(null),e.preventDefault()}}),e}());
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
new file mode 100644
index 0000000..32ff776
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
@@ -0,0 +1 @@
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}body{background:#073642;color:#fff}.kint-rich{box-shadow:0 0 5px 3px #073642}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized.css b/system/ThirdParty/Kint/resources/compiled/solarized.css
new file mode 100644
index 0000000..db5da0d
--- /dev/null
+++ b/system/ThirdParty/Kint/resources/compiled/solarized.css
@@ -0,0 +1 @@
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}
diff --git a/system/ThirdParty/PSR/Log/AbstractLogger.php b/system/ThirdParty/PSR/Log/AbstractLogger.php
new file mode 100644
index 0000000..e02f9da
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/AbstractLogger.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+}
diff --git a/system/ThirdParty/PSR/Log/InvalidArgumentException.php b/system/ThirdParty/PSR/Log/InvalidArgumentException.php
new file mode 100644
index 0000000..67f852d
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psr\Log;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/system/ThirdParty/PSR/Log/LogLevel.php b/system/ThirdParty/PSR/Log/LogLevel.php
new file mode 100644
index 0000000..9cebcac
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/LogLevel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes log levels.
+ */
+class LogLevel
+{
+    const EMERGENCY = 'emergency';
+    const ALERT     = 'alert';
+    const CRITICAL  = 'critical';
+    const ERROR     = 'error';
+    const WARNING   = 'warning';
+    const NOTICE    = 'notice';
+    const INFO      = 'info';
+    const DEBUG     = 'debug';
+}
diff --git a/system/ThirdParty/PSR/Log/LoggerAwareInterface.php b/system/ThirdParty/PSR/Log/LoggerAwareInterface.php
new file mode 100644
index 0000000..4d64f47
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/LoggerAwareInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger-aware instance.
+ */
+interface LoggerAwareInterface
+{
+    /**
+     * Sets a logger instance on the object.
+     *
+     * @param LoggerInterface $logger
+     *
+     * @return void
+     */
+    public function setLogger(LoggerInterface $logger);
+}
diff --git a/system/ThirdParty/PSR/Log/LoggerAwareTrait.php b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php
new file mode 100644
index 0000000..82bf45c
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/LoggerAwareTrait.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Basic Implementation of LoggerAwareInterface.
+ */
+trait LoggerAwareTrait
+{
+    /**
+     * The logger instance.
+     *
+     * @var LoggerInterface|null
+     */
+    protected $logger;
+
+    /**
+     * Sets a logger.
+     *
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/system/ThirdParty/PSR/Log/LoggerInterface.php b/system/ThirdParty/PSR/Log/LoggerInterface.php
new file mode 100644
index 0000000..2206cfd
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/LoggerInterface.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger instance.
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data. The only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ */
+interface LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = array());
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = array());
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = array());
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = array());
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = array());
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = array());
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = array());
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = array());
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed   $level
+     * @param string  $message
+     * @param mixed[] $context
+     *
+     * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
+     */
+    public function log($level, $message, array $context = array());
+}
diff --git a/system/ThirdParty/PSR/Log/LoggerTrait.php b/system/ThirdParty/PSR/Log/LoggerTrait.php
new file mode 100644
index 0000000..e392fef
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/LoggerTrait.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger trait that classes unable to extend AbstractLogger
+ * (because they extend another class, etc) can include.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+trait LoggerTrait
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
+     */
+    abstract public function log($level, $message, array $context = array());
+}
diff --git a/system/ThirdParty/PSR/Log/NullLogger.php b/system/ThirdParty/PSR/Log/NullLogger.php
new file mode 100644
index 0000000..c8f7293
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/NullLogger.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This Logger can be used to avoid conditional log calls.
+ *
+ * Logging should always be optional, and if no logger is provided to your
+ * library creating a NullLogger instance to have something to throw logs at
+ * is a good way to avoid littering your code with `if ($this->logger) { }`
+ * blocks.
+ */
+class NullLogger extends AbstractLogger
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
+     */
+    public function log($level, $message, array $context = array())
+    {
+        // noop
+    }
+}
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
new file mode 100644
index 0000000..0b69db4
--- /dev/null
+++ b/system/Throttle/Throttler.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Throttle;
+
+use CodeIgniter\Cache\CacheInterface;
+
+/**
+ * Class Throttler
+ *
+ * Uses an implementation of the Token Bucket algorithm to implement a
+ * "rolling window" type of throttling that can be used for rate limiting
+ * an API or any other request.
+ *
+ * Each "token" in the "bucket" is equivalent to a single request
+ * for the purposes of this implementation.
+ *
+ * @see https://en.wikipedia.org/wiki/Token_bucket
+ */
+class Throttler implements ThrottlerInterface
+{
+	/**
+	 * Container for throttle counters.
+	 *
+	 * @var CacheInterface
+	 */
+	protected $cache;
+
+	/**
+	 * The number of seconds until the next token is available.
+	 *
+	 * @var integer
+	 */
+	protected $tokenTime = 0;
+
+	/**
+	 * The prefix applied to all keys to
+	 * minimize potential conflicts.
+	 *
+	 * @var string
+	 */
+	protected $prefix = 'throttler_';
+
+	/**
+	 * Timestamp to use (during testing)
+	 *
+	 * @var integer
+	 */
+	protected $testTime;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param CacheInterface $cache
+	 */
+	public function __construct(CacheInterface $cache)
+	{
+		$this->cache = $cache;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of seconds until the next available token will
+	 * be released for usage.
+	 *
+	 * @return integer
+	 */
+	public function getTokenTime(): int
+	{
+		return $this->tokenTime;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Restricts the number of requests made by a single IP address within
+	 * a set number of seconds.
+	 *
+	 * Example:
+	 *
+	 *  if (! $throttler->check($request->ipAddress(), 60, MINUTE))
+	 * {
+	 *      die('You submitted over 60 requests within a minute.');
+	 * }
+	 *
+	 * @param string  $key      The name to use as the "bucket" name.
+	 * @param integer $capacity The number of requests the "bucket" can hold
+	 * @param integer $seconds  The time it takes the "bucket" to completely refill
+	 * @param integer $cost     The number of tokens this action uses.
+	 *
+	 * @return   boolean
+	 * @internal param int $maxRequests
+	 */
+	public function check(string $key, int $capacity, int $seconds, int $cost = 1): bool
+	{
+		$tokenName = $this->prefix . $key;
+
+		// Check to see if the bucket has even been created yet.
+		if (($tokens = $this->cache->get($tokenName)) === null)
+		{
+			// If it hasn't been created, then we'll set it to the maximum
+			// capacity - 1, and save it to the cache.
+			$this->cache->save($tokenName, $capacity - $cost, $seconds);
+			$this->cache->save($tokenName . 'Time', time(), $seconds);
+
+			return true;
+		}
+
+		// If $tokens > 0, then we need to replenish the bucket
+		// based on how long it's been since the last update.
+		$throttleTime = $this->cache->get($tokenName . 'Time');
+		$elapsed      = $this->time() - $throttleTime;
+
+		// Number of tokens to add back per second
+		$rate = $capacity / $seconds;
+
+		// How many seconds till a new token is available.
+		// We must have a minimum wait of 1 second for a new token.
+		// Primarily stored to allow devs to report back to users.
+		$newTokenAvailable = (1 / $rate) - $elapsed;
+		$this->tokenTime   = max(1, $newTokenAvailable);
+
+		// Add tokens based up on number per second that
+		// should be refilled, then checked against capacity
+		// to be sure the bucket didn't overflow.
+		$tokens += $rate * $elapsed;
+		$tokens  = $tokens > $capacity ? $capacity : $tokens;
+
+		// If $tokens >= 1, then we are safe to perform the action, but
+		// we need to decrement the number of available tokens.
+		if ($tokens >= 1)
+		{
+			$this->cache->save($tokenName, $tokens - $cost, $seconds);
+			$this->cache->save($tokenName . 'Time', time(), $seconds);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $key The name of the bucket
+	 *
+	 * @return $this
+	 */
+	public function remove(string $key): self
+	{
+		$tokenName = $this->prefix . $key;
+
+		$this->cache->delete($tokenName);
+		$this->cache->delete($tokenName . 'Time');
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used during testing to set the current timestamp to use.
+	 *
+	 * @param integer $time
+	 *
+	 * @return $this
+	 */
+	public function setTestTime(int $time)
+	{
+		$this->testTime = $time;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Return the test time, defaulting to current.
+	 *
+	 * @return integer
+	 */
+	public function time(): int
+	{
+		return $this->testTime ?? time();
+	}
+}
diff --git a/system/Throttle/ThrottlerInterface.php b/system/Throttle/ThrottlerInterface.php
new file mode 100644
index 0000000..ac57dc3
--- /dev/null
+++ b/system/Throttle/ThrottlerInterface.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Throttle;
+
+/**
+ * Expected behavior of a Throttler
+ */
+interface ThrottlerInterface
+{
+	/**
+	 * Restricts the number of requests made by a single key within
+	 * a set number of seconds.
+	 *
+	 * Example:
+	 *
+	 *  if (! $throttler->checkIPAddress($request->ipAddress(), 60, MINUTE))
+	 * {
+	 *      die('You submitted over 60 requests within a minute.');
+	 * }
+	 *
+	 * @param string  $key      The name to use as the "bucket" name.
+	 * @param integer $capacity The number of requests the "bucket" can hold
+	 * @param integer $seconds  The time it takes the "bucket" to completely refill
+	 * @param integer $cost     The number of tokens this action uses.
+	 *
+	 * @return boolean
+	 */
+	public function check(string $key, int $capacity, int $seconds, int $cost);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the number of seconds until the next available token will
+	 * be released for usage.
+	 *
+	 * @return integer
+	 */
+	public function getTokenTime(): int;
+}
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
new file mode 100644
index 0000000..038c295
--- /dev/null
+++ b/system/Typography/Typography.php
@@ -0,0 +1,377 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Typography;
+
+/**
+ * Typography Class
+ */
+class Typography
+{
+	/**
+	 * Block level elements that should not be wrapped inside <p> tags
+	 *
+	 * @var string
+	 */
+	public $blockElements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
+
+	/**
+	 * Elements that should not have <p> and <br /> tags within them.
+	 *
+	 * @var string
+	 */
+	public $skipElements = 'p|pre|ol|ul|dl|object|table|h\d';
+
+	/**
+	 * Tags we want the parser to completely ignore when splitting the string.
+	 *
+	 * @var string
+	 */
+	public $inlineElements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
+
+	/**
+	 * array of block level elements that require inner content to be within another block level element
+	 *
+	 * @var array
+	 */
+	public $innerBlockRequired = ['blockquote'];
+
+	/**
+	 * the last block element parsed
+	 *
+	 * @var string
+	 */
+	public $lastBlockElement = '';
+
+	/**
+	 * whether or not to protect quotes within { curly braces }
+	 *
+	 * @var boolean
+	 */
+	public $protectBracedQuotes = false;
+
+	/**
+	 * Auto Typography
+	 *
+	 * This function converts text, making it typographically correct:
+	 *     - Converts double spaces into paragraphs.
+	 *     - Converts single line breaks into <br /> tags
+	 *     - Converts single and double quotes into correctly facing curly quote entities.
+	 *     - Converts three dots into ellipsis.
+	 *     - Converts double dashes into em-dashes.
+	 *  - Converts two spaces into entities
+	 *
+	 * @param string  $str
+	 * @param boolean $reduceLinebreaks whether to reduce more then two consecutive newlines to two
+	 *
+	 * @return string
+	 */
+	public function autoTypography(string $str, bool $reduceLinebreaks = false): string
+	{
+		if ($str === '')
+		{
+			return '';
+		}
+
+		// Standardize Newlines to make matching easier
+		if (strpos($str, "\r") !== false)
+		{
+			$str = str_replace(["\r\n", "\r"], "\n", $str);
+		}
+
+		// Reduce line breaks.  If there are more than two consecutive linebreaks
+		// we'll compress them down to a maximum of two since there's no benefit to more.
+		if ($reduceLinebreaks === false)
+		{
+			$str = preg_replace("/\n\n+/", "\n\n", $str);
+		}
+
+		// HTML comment tags don't conform to patterns of normal tags, so pull them out separately, only if needed
+		$htmlComments = [];
+		if (strpos($str, '<!--') !== false && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches))
+		{
+			for ($i = 0, $total = count($matches[0]); $i < $total; $i ++)
+			{
+				$htmlComments[] = $matches[0][$i];
+				$str            = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
+			}
+		}
+
+		// match and yank <pre> tags if they exist.  It's cheaper to do this separately since most content will
+		// not contain <pre> tags, and it keeps the PCRE patterns below simpler and faster
+		if (strpos($str, '<pre') !== false)
+		{
+			$str = preg_replace_callback('#<pre.*?>.*?</pre>#si', [$this, 'protectCharacters'], $str);
+		}
+
+		// Convert quotes within tags to temporary markers.
+		$str = preg_replace_callback('#<.+?>#si', [$this, 'protectCharacters'], $str);
+
+		// Do the same with braces if necessary
+		if ($this->protectBracedQuotes === false)
+		{
+			$str = preg_replace_callback('#\{.+?\}#si', [$this, 'protectCharacters'], $str);
+		}
+
+		// Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag
+		// it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be
+		// adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}
+		$str = preg_replace('#<(/*)(' . $this->inlineElements . ')([ >])#i', '{@TAG}\\1\\2\\3', $str);
+
+		/* Split the string at every tag. This expression creates an array with this prototype:
+		 *
+		 * 	[array]
+		 * 	{
+		 * 		[0] = <opening tag>
+		 * 		[1] = Content...
+		 * 		[2] = <closing tag>
+		 * 		Etc...
+		 * 	}
+		 */
+		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text
+		$str     = '';
+		$process = true;
+
+		for ($i = 0, $c = count($chunks) - 1; $i <= $c; $i ++)
+		{
+			// Are we dealing with a tag? If so, we'll skip the processing for this cycle.
+			// Well also set the "process" flag which allows us to skip <pre> tags and a few other things.
+			if (preg_match('#<(/*)(' . $this->blockElements . ').*?>#', $chunks[$i], $match))
+			{
+				if (preg_match('#' . $this->skipElements . '#', $match[2]))
+				{
+					$process = ($match[1] === '/');
+				}
+
+				if ($match[1] === '')
+				{
+					$this->lastBlockElement = $match[2];
+				}
+
+				$str .= $chunks[$i];
+				continue;
+			}
+
+			if ($process === false)
+			{
+				$str .= $chunks[$i];
+				continue;
+			}
+
+			//  Force a newline to make sure end tags get processed by _format_newlines()
+			if ($i === $c)
+			{
+				$chunks[$i] .= "\n";
+			}
+
+			//  Convert Newlines into <p> and <br /> tags
+			$str .= $this->formatNewLines($chunks[$i]);
+		}
+
+		// No opening block level tag? Add it if needed.
+		if (! preg_match('/^\s*<(?:' . $this->blockElements . ')/i', $str))
+		{
+			$str = preg_replace('/^(.*?)<(' . $this->blockElements . ')/i', '<p>$1</p><$2', $str);
+		}
+
+		// Convert quotes, elipsis, em-dashes, non-breaking spaces, and ampersands
+		$str = $this->formatCharacters($str);
+
+		foreach ($htmlComments as $i => $htmlComment)
+		{
+			// remove surrounding paragraph tags, but only if there's an opening paragraph tag
+			// otherwise HTML comments at the ends of paragraphs will have the closing tag removed
+			// if '<p>{@HC1}' then replace <p>{@HC1}</p> with the comment, else replace only {@HC1} with the comment
+			$str = preg_replace('#(?(?=<p>\{@HC' . $i . '\})<p>\{@HC' . $i . '\}(\s*</p>)|\{@HC' . $i . '\})#s', $htmlComment, $str);
+		}
+
+		// Final clean up
+		$table = [
+			// If the user submitted their own paragraph tags within the text
+			// we will retain them instead of using our tags.
+			'/(<p[^>*?]>)<p>/'                              => '$1', // <?php BBEdit syntax coloring bug fix
+			// Reduce multiple instances of opening/closing paragraph tags to a single one
+			'#(</p>)+#'                                     => '</p>',
+			'/(<p>\W*<p>)+/'                                => '<p>',
+			// Clean up stray paragraph tags that appear before block level elements
+			'#<p></p><(' . $this->blockElements . ')#'      => '<$1',
+			// Clean up stray non-breaking spaces preceeding block elements
+			'#(&nbsp;\s*)+<(' . $this->blockElements . ')#' => '  <$2',
+			// Replace the temporary markers we added earlier
+			'/\{@TAG\}/'                                    => '<',
+			'/\{@DQ\}/'                                     => '"',
+			'/\{@SQ\}/'                                     => "'",
+			'/\{@DD\}/'                                     => '--',
+			'/\{@NBS\}/'                                    => '  ',
+			// An unintended consequence of the _format_newlines function is that
+			// some of the newlines get truncated, resulting in <p> tags
+			// starting immediately after <block> tags on the same line.
+			// This forces a newline after such occurrences, which looks much nicer.
+			"/><p>\n/"                                      => ">\n<p>",
+			// Similarly, there might be cases where a closing </block> will follow
+			// a closing </p> tag, so we'll correct it by adding a newline in between
+			'#</p></#'                                      => "</p>\n</",
+		];
+
+		// Do we need to reduce empty lines?
+		if ($reduceLinebreaks === true)
+		{
+			$table['#<p>\n*</p>#'] = '';
+		}
+		else
+		{
+			// If we have empty paragraph tags we add a non-breaking space
+			// otherwise most browsers won't treat them as true paragraphs
+			$table['#<p></p>#'] = '<p>&nbsp;</p>';
+		}
+
+		return preg_replace(array_keys($table), $table, $str);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Characters
+	 *
+	 * This function mainly converts double and single quotes
+	 * to curly entities, but it also converts em-dashes,
+	 * double spaces, and ampersands
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	public function formatCharacters(string $str): string
+	{
+		static $table;
+
+		if (! isset($table))
+		{
+			$table = [
+				// nested smart quotes, opening and closing
+				// note that rules for grammar (English) allow only for two levels deep
+				// and that single quotes are _supposed_ to always be on the outside
+				// but we'll accommodate both
+				// Note that in all cases, whitespace is the primary determining factor
+				// on which direction to curl, with non-word characters like punctuation
+				// being a secondary factor only after whitespace is addressed.
+				'/\'"(\s|$)/'               => '&#8217;&#8221;$1',
+				'/(^|\s|<p>)\'"/'           => '$1&#8216;&#8220;',
+				'/\'"(\W)/'                 => '&#8217;&#8221;$1',
+				'/(\W)\'"/'                 => '$1&#8216;&#8220;',
+				'/"\'(\s|$)/'               => '&#8221;&#8217;$1',
+				'/(^|\s|<p>)"\'/'           => '$1&#8220;&#8216;',
+				'/"\'(\W)/'                 => '&#8221;&#8217;$1',
+				'/(\W)"\'/'                 => '$1&#8220;&#8216;',
+				// single quote smart quotes
+				'/\'(\s|$)/'                => '&#8217;$1',
+				'/(^|\s|<p>)\'/'            => '$1&#8216;',
+				'/\'(\W)/'                  => '&#8217;$1',
+				'/(\W)\'/'                  => '$1&#8216;',
+				// double quote smart quotes
+				'/"(\s|$)/'                 => '&#8221;$1',
+				'/(^|\s|<p>)"/'             => '$1&#8220;',
+				'/"(\W)/'                   => '&#8221;$1',
+				'/(\W)"/'                   => '$1&#8220;',
+				// apostrophes
+				"/(\w)'(\w)/"               => '$1&#8217;$2',
+				// Em dash and ellipses dots
+				'/\s?\-\-\s?/'              => '&#8212;',
+				'/(\w)\.{3}/'               => '$1&#8230;',
+				// double space after sentences
+				'/(\W)  /'                  => '$1&nbsp; ',
+				// ampersands, if not a character entity
+				'/&(?!#?[a-zA-Z0-9]{2,};)/' => '&amp;',
+			];
+		}
+
+		return preg_replace(array_keys($table), $table, $str);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Newlines
+	 *
+	 * Converts newline characters into either <p> tags or <br />
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	protected function formatNewLines(string $str): string
+	{
+		if ($str === '' || (strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true)))
+		{
+			return $str;
+		}
+
+		// Convert two consecutive newlines to paragraphs
+		$str = str_replace("\n\n", "</p>\n\n<p>", $str);
+
+		// Convert single spaces to <br /> tags
+		$str = preg_replace("/([^\n])(\n)([^\n])/", '\\1<br />\\2\\3', $str);
+
+		// Wrap the whole enchilada in enclosing paragraphs
+		if ($str !== "\n")
+		{
+			// We trim off the right-side new line so that the closing </p> tag
+			// will be positioned immediately following the string, matching
+			// the behavior of the opening <p> tag
+			$str = '<p>' . rtrim($str) . '</p>';
+		}
+
+		// Remove empty paragraphs if they are on the first line, as this
+		// is a potential unintended consequence of the previous code
+		return preg_replace('/<p><\/p>(.*)/', '\\1', $str, 1);
+	}
+
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Protect Characters
+	 *
+	 * Protects special characters from being formatted later
+	 * We don't want quotes converted within tags so we'll temporarily convert them to {@DQ} and {@SQ}
+	 * and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
+	 * likewise double spaces are converted to {@NBS} to prevent entity conversion
+	 *
+	 * @param  array $match
+	 * @return string
+	 */
+	protected function protectCharacters(array $match): string
+	{
+		return str_replace(["'", '"', '--', '  '], ['{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'], $match[0]);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Convert newlines to HTML line breaks except within PRE tags
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	public function nl2brExceptPre(string $str): string
+	{
+		$newstr = '';
+		for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i ++)
+		{
+			$newstr .= (($i % 2) === 0) ? nl2br($ex[$i]) : $ex[$i];
+			if ($ct - 1 !== $i)
+			{
+				$newstr .= 'pre>';
+			}
+		}
+
+		return $newstr;
+	}
+}
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
new file mode 100644
index 0000000..d7d3bfb
--- /dev/null
+++ b/system/Validation/CreditCardRules.php
@@ -0,0 +1,306 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+/**
+ * Class CreditCardRules
+ *
+ * Provides validation methods for common credit-card inputs.
+ *
+ * @see http://en.wikipedia.org/wiki/Credit_card_number
+ */
+class CreditCardRules
+{
+	/**
+	 * The cards that we support, with the defining details:
+	 *
+	 *  name        - The type of card as found in the form. Must match the user's value
+	 *  length      - List of possible lengths for the card number
+	 *  prefixes    - List of possible prefixes for the card
+	 *  checkdigit  - Boolean on whether we should do a modulus10 check on the numbers.
+	 *
+	 * @var array
+	 */
+	protected $cards = [
+		'American Express'                 => [
+			'name'       => 'amex',
+			'length'     => '15',
+			'prefixes'   => '34,37',
+			'checkdigit' => true,
+		],
+		'China UnionPay'                   => [
+			'name'       => 'unionpay',
+			'length'     => '16,17,18,19',
+			'prefixes'   => '62',
+			'checkdigit' => true,
+		],
+		'Dankort'                          => [
+			'name'       => 'dankort',
+			'length'     => '16',
+			'prefixes'   => '5019,4175,4571,4',
+			'checkdigit' => true,
+		],
+		'DinersClub'                       => [
+			'name'       => 'dinersclub',
+			'length'     => '14,16',
+			'prefixes'   => '300,301,302,303,304,305,309,36,38,39,54,55',
+			'checkdigit' => true,
+		],
+		'DinersClub CarteBlanche'          => [
+			'name'       => 'carteblanche',
+			'length'     => '14',
+			'prefixes'   => '300,301,302,303,304,305',
+			'checkdigit' => true,
+		],
+		'Discover Card'                    => [
+			'name'       => 'discover',
+			'length'     => '16,19',
+			'prefixes'   => '6011,622,644,645,656,647,648,649,65',
+			'checkdigit' => true,
+		],
+		'InterPayment'                     => [
+			'name'       => 'interpayment',
+			'length'     => '16,17,18,19',
+			'prefixes'   => '4',
+			'checkdigit' => true,
+		],
+		'JCB'                              => [
+			'name'       => 'jcb',
+			'length'     => '16,17,18,19',
+			'prefixes'   => '352,353,354,355,356,357,358',
+			'checkdigit' => true,
+		],
+		'Maestro'                          => [
+			'name'       => 'maestro',
+			'length'     => '12,13,14,15,16,18,19',
+			'prefixes'   => '50,56,57,58,59,60,61,62,63,64,65,66,67,68,69',
+			'checkdigit' => true,
+		],
+		'MasterCard'                       => [
+			'name'       => 'mastercard',
+			'length'     => '16',
+			'prefixes'   => '51,52,53,54,55,22,23,24,25,26,27',
+			'checkdigit' => true,
+		],
+		'NSPK MIR'                         => [
+			'name'       => 'mir',
+			'length'     => '16',
+			'prefixes'   => '2200,2201,2202,2203,2204',
+			'checkdigit' => true,
+		],
+		'Troy'                             => [
+			'name'       => 'troy',
+			'length'     => '16',
+			'prefixes'   => '979200,979289',
+			'checkdigit' => true,
+		],
+		'UATP'                             => [
+			'name'       => 'uatp',
+			'length'     => '15',
+			'prefixes'   => '1',
+			'checkdigit' => true,
+		],
+		'Verve'                            => [
+			'name'       => 'verve',
+			'length'     => '16,19',
+			'prefixes'   => '506,650',
+			'checkdigit' => true,
+		],
+		'Visa'                             => [
+			'name'       => 'visa',
+			'length'     => '13,16,19',
+			'prefixes'   => '4',
+			'checkdigit' => true,
+		],
+		// Canadian Cards
+		'BMO ABM Card'                     => [
+			'name'       => 'bmoabm',
+			'length'     => '16',
+			'prefixes'   => '500',
+			'checkdigit' => false,
+		],
+		'CIBC Convenience Card'            => [
+			'name'       => 'cibc',
+			'length'     => '16',
+			'prefixes'   => '4506',
+			'checkdigit' => false,
+		],
+		'HSBC Canada Card'                 => [
+			'name'       => 'hsbc',
+			'length'     => '16',
+			'prefixes'   => '56',
+			'checkdigit' => false,
+		],
+		'Royal Bank of Canada Client Card' => [
+			'name'       => 'rbc',
+			'length'     => '16',
+			'prefixes'   => '45',
+			'checkdigit' => false,
+		],
+		'Scotiabank Scotia Card'           => [
+			'name'       => 'scotia',
+			'length'     => '16',
+			'prefixes'   => '4536',
+			'checkdigit' => false,
+		],
+		'TD Canada Trust Access Card'      => [
+			'name'       => 'tdtrust',
+			'length'     => '16',
+			'prefixes'   => '589297',
+			'checkdigit' => false,
+		],
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies that a credit card number is valid and matches the known
+	 * formats for a wide number of credit card types. This does not verify
+	 * that the card is a valid card, only that the number is formatted correctly.
+	 *
+	 * Example:
+	 *  $rules = [
+	 *      'cc_num' => 'valid_cc_number[visa]'
+	 *  ];
+	 *
+	 * @param string|null $ccNumber
+	 * @param string      $type
+	 *
+	 * @return boolean
+	 */
+	public function valid_cc_number(?string $ccNumber, string $type): bool
+	{
+		$type = strtolower($type);
+		$info = null;
+
+		// Get our card info based on provided name.
+		foreach ($this->cards as $card)
+		{
+			if ($card['name'] === $type)
+			{
+				$info = $card;
+				break;
+			}
+		}
+
+		// If empty, it's not a card type we recognize, or invalid type.
+		if (empty($info))
+		{
+			return false;
+		}
+
+		// Make sure we have a valid length
+		if (strlen($ccNumber) === 0)
+		{
+			return false;
+		}
+
+		// Remove any spaces and dashes
+		$ccNumber = str_replace([' ', '-'], '', $ccNumber);
+
+		// Non-numeric values cannot be a number...duh
+		if (! is_numeric($ccNumber))
+		{
+			return false;
+		}
+
+		// Make sure it's a valid length for this card
+		$lengths = explode(',', $info['length']);
+
+		if (! in_array((string) strlen($ccNumber), $lengths, true))
+		{
+			return false;
+		}
+
+		// Make sure it has a valid prefix
+		$prefixes = explode(',', $info['prefixes']);
+
+		$validPrefix = false;
+
+		foreach ($prefixes as $prefix)
+		{
+			if (strpos($ccNumber, $prefix) === 0)
+			{
+							  $validPrefix = true;
+							  break;
+			}
+		}
+
+		if ($validPrefix === false)
+		{
+			return false;
+		}
+
+		// Still here? Then check the number against the Luhn algorithm, if required
+		// @see https://en.wikipedia.org/wiki/Luhn_algorithm
+		// @see https://gist.github.com/troelskn/1287893
+		if ($info['checkdigit'] === true)
+		{
+			return $this->isValidLuhn($ccNumber);
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the given number to see if the number passing a Luhn check.
+	 *
+	 * @param string $number
+	 *
+	 * @return boolean
+	 */
+	protected function isValidLuhn(string $number = null): bool
+	{
+		$number = (string) $number;
+
+		$sumTable = [
+			[
+				0,
+				1,
+				2,
+				3,
+				4,
+				5,
+				6,
+				7,
+				8,
+				9,
+			],
+			[
+				0,
+				2,
+				4,
+				6,
+				8,
+				1,
+				3,
+				5,
+				7,
+				9,
+			],
+		];
+
+		$sum  = 0;
+		$flip = 0;
+
+		for ($i = strlen($number) - 1; $i >= 0; $i --)
+		{
+			$sum += $sumTable[$flip ++ & 0x1][$number[$i]];
+		}
+
+		return $sum % 10 === 0;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Validation/Exceptions/ValidationException.php b/system/Validation/Exceptions/ValidationException.php
new file mode 100644
index 0000000..077aa1f
--- /dev/null
+++ b/system/Validation/Exceptions/ValidationException.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class ValidationException extends FrameworkException
+{
+	public static function forRuleNotFound(string $rule = null)
+	{
+		return new static(lang('Validation.ruleNotFound', [$rule]));
+	}
+
+	public static function forGroupNotFound(string $group = null)
+	{
+		return new static(lang('Validation.groupNotFound', [$group]));
+	}
+
+	public static function forGroupNotArray(string $group = null)
+	{
+		return new static(lang('Validation.groupNotArray', [$group]));
+	}
+
+	public static function forInvalidTemplate(string $template = null)
+	{
+		return new static(lang('Validation.invalidTemplate', [$template]));
+	}
+
+	public static function forNoRuleSets()
+	{
+		return new static(lang('Validation.noRuleSets'));
+	}
+}
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
new file mode 100644
index 0000000..0ab18b2
--- /dev/null
+++ b/system/Validation/FileRules.php
@@ -0,0 +1,329 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+use CodeIgniter\HTTP\RequestInterface;
+use Config\Mimes;
+use Config\Services;
+
+/**
+ * File validation rules
+ */
+class FileRules
+{
+	/**
+	 * Request instance. So we can get access to the files.
+	 *
+	 * @var RequestInterface
+	 */
+	protected $request;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request = null)
+	{
+		if (is_null($request))
+		{
+			$request = Services::request();
+		}
+
+		$this->request = $request;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies that $name is the name of a valid uploaded file.
+	 *
+	 * @param string|null $blank
+	 * @param string      $name
+	 *
+	 * @return boolean
+	 */
+	public function uploaded(?string $blank, string $name): bool
+	{
+		if (! ($files = $this->request->getFileMultiple($name)))
+		{
+			$files = [$this->request->getFile($name)];
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_null($file))
+			{
+				return false;
+			}
+
+			if (ENVIRONMENT === 'testing')
+			{
+				if ($file->getError() !== 0)
+				{
+					return false;
+				}
+			}
+			else
+			{
+				// Note: cannot unit test this; no way to over-ride ENVIRONMENT?
+				// @codeCoverageIgnoreStart
+				if (! $file->isValid())
+				{
+					return false;
+				}
+				// @codeCoverageIgnoreEnd
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies if the file's size in Kilobytes is no larger than the parameter.
+	 *
+	 * @param string|null $blank
+	 * @param string      $params
+	 *
+	 * @return boolean
+	 */
+	public function max_size(?string $blank, string $params): bool
+	{
+		// Grab the file name off the top of the $params
+		// after we split it.
+		$params = explode(',', $params);
+		$name   = array_shift($params);
+
+		if (! ($files = $this->request->getFileMultiple($name)))
+		{
+			$files = [$this->request->getFile($name)];
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_null($file))
+			{
+				return false;
+			}
+
+			if ($file->getError() === UPLOAD_ERR_NO_FILE)
+			{
+				return true;
+			}
+
+			if ($file->getError() === UPLOAD_ERR_INI_SIZE)
+			{
+				return false;
+			}
+
+			if ($file->getSize() / 1024 > $params[0])
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Uses the mime config file to determine if a file is considered an "image",
+	 * which for our purposes basically means that it's a raster image or svg.
+	 *
+	 * @param string|null $blank
+	 * @param string      $params
+	 *
+	 * @return boolean
+	 */
+	public function is_image(?string $blank, string $params): bool
+	{
+		// Grab the file name off the top of the $params
+		// after we split it.
+		$params = explode(',', $params);
+		$name   = array_shift($params);
+
+		if (! ($files = $this->request->getFileMultiple($name)))
+		{
+			$files = [$this->request->getFile($name)];
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_null($file))
+			{
+				return false;
+			}
+
+			if ($file->getError() === UPLOAD_ERR_NO_FILE)
+			{
+				return true;
+			}
+
+			// We know that our mimes list always has the first mime
+			// start with `image` even when then are multiple accepted types.
+			$type = Mimes::guessTypeFromExtension($file->getExtension());
+
+			if (mb_strpos($type, 'image') !== 0)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if an uploaded file's mime type matches one in the parameter.
+	 *
+	 * @param string|null $blank
+	 * @param string      $params
+	 *
+	 * @return boolean
+	 */
+	public function mime_in(?string $blank, string $params): bool
+	{
+		// Grab the file name off the top of the $params
+		// after we split it.
+		$params = explode(',', $params);
+		$name   = array_shift($params);
+
+		if (! ($files = $this->request->getFileMultiple($name)))
+		{
+			$files = [$this->request->getFile($name)];
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_null($file))
+			{
+				return false;
+			}
+
+			if ($file->getError() === UPLOAD_ERR_NO_FILE)
+			{
+				return true;
+			}
+
+			if (! in_array($file->getMimeType(), $params, true))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if an uploaded file's extension matches one in the parameter.
+	 *
+	 * @param string|null $blank
+	 * @param string      $params
+	 *
+	 * @return boolean
+	 */
+	public function ext_in(?string $blank, string $params): bool
+	{
+		// Grab the file name off the top of the $params
+		// after we split it.
+		$params = explode(',', $params);
+		$name   = array_shift($params);
+
+		if (! ($files = $this->request->getFileMultiple($name)))
+		{
+			$files = [$this->request->getFile($name)];
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_null($file))
+			{
+				return false;
+			}
+
+			if ($file->getError() === UPLOAD_ERR_NO_FILE)
+			{
+				return true;
+			}
+
+			if (! in_array($file->guessExtension(), $params, true))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks an uploaded file to verify that the dimensions are within
+	 * a specified allowable dimension.
+	 *
+	 * @param string|null $blank
+	 * @param string      $params
+	 *
+	 * @return boolean
+	 */
+	public function max_dims(?string $blank, string $params): bool
+	{
+		// Grab the file name off the top of the $params
+		// after we split it.
+		$params = explode(',', $params);
+		$name   = array_shift($params);
+
+		if (! ($files = $this->request->getFileMultiple($name)))
+		{
+			$files = [$this->request->getFile($name)];
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_null($file))
+			{
+				return false;
+			}
+
+			if ($file->getError() === UPLOAD_ERR_NO_FILE)
+			{
+				return true;
+			}
+
+			// Get Parameter sizes
+			$allowedWidth  = $params[0] ?? 0;
+			$allowedHeight = $params[1] ?? 0;
+
+			// Get uploaded image size
+			$info       = getimagesize($file->getTempName());
+			$fileWidth  = $info[0];
+			$fileHeight = $info[1];
+
+			if ($fileWidth > $allowedWidth || $fileHeight > $allowedHeight)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
new file mode 100644
index 0000000..cefe164
--- /dev/null
+++ b/system/Validation/FormatRules.php
@@ -0,0 +1,378 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+use DateTime;
+
+/**
+ * Format validation Rules.
+ */
+class FormatRules
+{
+	/**
+	 * Alpha
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function alpha(?string $str = null): bool
+	{
+		return ctype_alpha($str);
+	}
+
+	/**
+	 * Alpha with spaces.
+	 *
+	 * @param string|null $value Value.
+	 *
+	 * @return boolean True if alpha with spaces, else false.
+	 */
+	public function alpha_space(?string $value = null): bool
+	{
+		if ($value === null)
+		{
+			return true;
+		}
+
+		// @see https://regex101.com/r/LhqHPO/1
+		return (bool) preg_match('/\A[A-Z ]+\z/i', $value);
+	}
+
+	/**
+	 * Alphanumeric with underscores and dashes
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function alpha_dash(?string $str = null): bool
+	{
+		// @see https://regex101.com/r/XfVY3d/1
+		return (bool) preg_match('/\A[a-z0-9_-]+\z/i', $str);
+	}
+
+	/**
+	 * Alphanumeric, spaces, and a limited set of punctuation characters.
+	 * Accepted punctuation characters are: ~ tilde, ! exclamation,
+	 * # number, $ dollar, % percent, & ampersand, * asterisk, - dash,
+	 * _ underscore, + plus, = equals, | vertical bar, : colon, . period
+	 * ~ ! # $ % & * - _ + = | : .
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	public function alpha_numeric_punct($str)
+	{
+		// @see https://regex101.com/r/6N8dDY/1
+		return (bool) preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str);
+	}
+
+	/**
+	 * Alphanumeric
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function alpha_numeric(?string $str = null): bool
+	{
+		return ctype_alnum($str);
+	}
+
+	/**
+	 * Alphanumeric w/ spaces
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function alpha_numeric_space(?string $str = null): bool
+	{
+		// @see https://regex101.com/r/0AZDME/1
+		return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
+	}
+
+	/**
+	 * Any type of string
+	 *
+	 * Note: we specifically do NOT type hint $str here so that
+	 * it doesn't convert numbers into strings.
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function string($str = null): bool
+	{
+		return is_string($str);
+	}
+
+	/**
+	 * Decimal number
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function decimal(?string $str = null): bool
+	{
+		// @see https://regex101.com/r/HULifl/1/
+		return (bool) preg_match('/\A[-+]?[0-9]{0,}\.?[0-9]+\z/', $str);
+	}
+
+	/**
+	 * String of hexidecimal characters
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function hex(?string $str = null): bool
+	{
+		return ctype_xdigit($str);
+	}
+
+	/**
+	 * Integer
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function integer(?string $str = null): bool
+	{
+		return (bool) preg_match('/\A[\-+]?[0-9]+\z/', $str);
+	}
+
+	/**
+	 * Is a Natural number  (0,1,2,3, etc.)
+	 *
+	 * @param  string|null $str
+	 * @return boolean
+	 */
+	public function is_natural(?string $str = null): bool
+	{
+		return ctype_digit($str);
+	}
+
+	/**
+	 * Is a Natural number, but not a zero  (1,2,3, etc.)
+	 *
+	 * @param  string|null $str
+	 * @return boolean
+	 */
+	public function is_natural_no_zero(?string $str = null): bool
+	{
+		return ($str !== '0' && ctype_digit($str));
+	}
+
+	/**
+	 * Numeric
+	 *
+	 * @param string|null $str
+	 *
+	 * @return boolean
+	 */
+	public function numeric(?string $str = null): bool
+	{
+		// @see https://regex101.com/r/bb9wtr/1
+		return (bool) preg_match('/\A[\-+]?[0-9]*\.?[0-9]+\z/', $str);
+	}
+
+	/**
+	 * Compares value against a regular expression pattern.
+	 *
+	 * @param string|null $str
+	 * @param string      $pattern
+	 *
+	 * @return boolean
+	 */
+	public function regex_match(?string $str, string $pattern): bool
+	{
+		if (strpos($pattern, '/') !== 0)
+		{
+			$pattern = "/{$pattern}/";
+		}
+
+		return (bool) preg_match($pattern, $str);
+	}
+
+	/**
+	 * Validates that the string is a valid timezone as per the
+	 * timezone_identifiers_list function.
+	 *
+	 * @see http://php.net/manual/en/datetimezone.listidentifiers.php
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	public function timezone(string $str = null): bool
+	{
+		return in_array($str, timezone_identifiers_list(), true);
+	}
+
+	/**
+	 * Valid Base64
+	 *
+	 * Tests a string for characters outside of the Base64 alphabet
+	 * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045
+	 *
+	 * @param  string $str
+	 * @return boolean
+	 */
+	public function valid_base64(string $str = null): bool
+	{
+		return (base64_encode(base64_decode($str, true)) === $str);
+	}
+
+	/**
+	 * Valid JSON
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	public function valid_json(string $str = null): bool
+	{
+		json_decode($str);
+		return json_last_error() === JSON_ERROR_NONE;
+	}
+
+	/**
+	 * Checks for a correctly formatted email address
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	public function valid_email(string $str = null): bool
+	{
+		// @see https://regex101.com/r/wlJG1t/1/
+		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
+		{
+			$str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
+		}
+
+		return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
+	}
+
+	/**
+	 * Validate a comma-separated list of email addresses.
+	 *
+	 * Example:
+	 *     valid_emails[one@example.com,two@example.com]
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	public function valid_emails(string $str = null): bool
+	{
+		foreach (explode(',', $str) as $email)
+		{
+			$email = trim($email);
+			if ($email === '')
+			{
+				return false;
+			}
+
+			if ($this->valid_email($email) === false)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validate an IP address (human readable format or binary string - inet_pton)
+	 *
+	 * @param string $ip    IP Address
+	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
+	 *
+	 * @return boolean
+	 */
+	public function valid_ip(string $ip = null, string $which = null): bool
+	{
+		if (empty($ip))
+		{
+			return false;
+		}
+		switch (strtolower($which))
+		{
+			case 'ipv4':
+				$which = FILTER_FLAG_IPV4;
+				break;
+			case 'ipv6':
+				$which = FILTER_FLAG_IPV6;
+				break;
+			default:
+				$which = null;
+				break;
+		}
+
+		return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
+	}
+
+	/**
+	 * Checks a URL to ensure it's formed correctly.
+	 *
+	 * @param string $str
+	 *
+	 * @return boolean
+	 */
+	public function valid_url(string $str = null): bool
+	{
+		if (empty($str))
+		{
+			return false;
+		}
+
+		if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
+		{
+			if (! in_array($matches[1], ['http', 'https'], true))
+			{
+				return false;
+			}
+
+			$str = $matches[2];
+		}
+
+		$str = 'http://' . $str;
+
+		return (filter_var($str, FILTER_VALIDATE_URL) !== false);
+	}
+
+	/**
+	 * Checks for a valid date and matches a given date format
+	 *
+	 * @param string $str
+	 * @param string $format
+	 *
+	 * @return boolean
+	 */
+	public function valid_date(string $str = null, string $format = null): bool
+	{
+		if (empty($format))
+		{
+			return (bool) strtotime($str);
+		}
+
+		$date = DateTime::createFromFormat($format, $str);
+
+		return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
+	}
+}
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
new file mode 100644
index 0000000..9f9e23d
--- /dev/null
+++ b/system/Validation/Rules.php
@@ -0,0 +1,442 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+use Config\Database;
+use InvalidArgumentException;
+
+/**
+ * Validation Rules.
+ */
+class Rules
+{
+	//--------------------------------------------------------------------
+
+	/**
+	 * The value does not match another field in $data.
+	 *
+	 * @param string $str
+	 * @param string $field
+	 * @param array  $data  Other field/value pairs
+	 *
+	 * @return boolean
+	 */
+	public function differs(string $str = null, string $field, array $data): bool
+	{
+		if (strpos($field, '.') !== false)
+		{
+			return $str !== dot_array_search($field, $data);
+		}
+
+		return array_key_exists($field, $data) && $str !== $data[$field];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Equals the static value provided.
+	 *
+	 * @param string $str
+	 * @param string $val
+	 *
+	 * @return boolean
+	 */
+	public function equals(string $str = null, string $val): bool
+	{
+		return $str === $val;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns true if $str is $val characters long.
+	 * $val = "5" (one) | "5,8,12" (multiple values)
+	 *
+	 * @param string $str
+	 * @param string $val
+	 *
+	 * @return boolean
+	 */
+	public function exact_length(string $str = null, string $val): bool
+	{
+		$val = explode(',', $val);
+		foreach ($val as $tmp)
+		{
+			if (is_numeric($tmp) && (int) $tmp === mb_strlen($str))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Greater than
+	 *
+	 * @param string $str
+	 * @param string $min
+	 *
+	 * @return boolean
+	 */
+	public function greater_than(string $str = null, string $min): bool
+	{
+		return is_numeric($str) && $str > $min;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Equal to or Greater than
+	 *
+	 * @param string $str
+	 * @param string $min
+	 *
+	 * @return boolean
+	 */
+	public function greater_than_equal_to(string $str = null, string $min): bool
+	{
+		return is_numeric($str) && $str >= $min;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the database to see if the given value exist.
+	 * Can ignore records by field/value to filter (currently
+	 * accept only one filter).
+	 *
+	 * Example:
+	 *    is_not_unique[table.field,where_field,where_value]
+	 *    is_not_unique[menu.id,active,1]
+	 *
+	 * @param string $str
+	 * @param string $field
+	 * @param array  $data
+	 *
+	 * @return boolean
+	 */
+	public function is_not_unique(string $str = null, string $field, array $data): bool
+	{
+		// Grab any data for exclusion of a single row.
+		[$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
+
+		// Break the table and field apart
+		sscanf($field, '%[^.].%[^.]', $table, $field);
+
+		$db = Database::connect($data['DBGroup'] ?? null);
+
+		$row = $db->table($table)
+				  ->select('1')
+				  ->where($field, $str)
+				  ->limit(1);
+
+		if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue))
+		{
+			$row = $row->where($whereField, $whereValue);
+		}
+
+		return (bool) ($row->get()->getRow() !== null);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Value should be within an array of values
+	 *
+	 * @param string $value
+	 * @param string $list
+	 *
+	 * @return boolean
+	 */
+	public function in_list(string $value = null, string $list): bool
+	{
+		$list = array_map('trim', explode(',', $list));
+		return in_array($value, $list, true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the database to see if the given value is unique. Can
+	 * ignore a single record by field/value to make it useful during
+	 * record updates.
+	 *
+	 * Example:
+	 *    is_unique[table.field,ignore_field,ignore_value]
+	 *    is_unique[users.email,id,5]
+	 *
+	 * @param string $str
+	 * @param string $field
+	 * @param array  $data
+	 *
+	 * @return boolean
+	 */
+	public function is_unique(string $str = null, string $field, array $data): bool
+	{
+		// Grab any data for exclusion of a single row.
+		[$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
+
+		// Break the table and field apart
+		sscanf($field, '%[^.].%[^.]', $table, $field);
+
+		$db = Database::connect($data['DBGroup'] ?? null);
+
+		$row = $db->table($table)
+				  ->select('1')
+				  ->where($field, $str)
+				  ->limit(1);
+
+		if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue))
+		{
+			$row = $row->where("{$ignoreField} !=", $ignoreValue);
+		}
+
+		return (bool) ($row->get()->getRow() === null);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Less than
+	 *
+	 * @param string $str
+	 * @param string $max
+	 *
+	 * @return boolean
+	 */
+	public function less_than(string $str = null, string $max): bool
+	{
+		return is_numeric($str) && $str < $max;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Equal to or Less than
+	 *
+	 * @param string $str
+	 * @param string $max
+	 *
+	 * @return boolean
+	 */
+	public function less_than_equal_to(string $str = null, string $max): bool
+	{
+		return is_numeric($str) && $str <= $max;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Matches the value of another field in $data.
+	 *
+	 * @param string $str
+	 * @param string $field
+	 * @param array  $data  Other field/value pairs
+	 *
+	 * @return boolean
+	 */
+	public function matches(string $str = null, string $field, array $data): bool
+	{
+		if (strpos($field, '.') !== false)
+		{
+			return $str === dot_array_search($field, $data);
+		}
+
+		return array_key_exists($field, $data) && $str === $data[$field];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns true if $str is $val or fewer characters in length.
+	 *
+	 * @param string $str
+	 * @param string $val
+	 *
+	 * @return boolean
+	 */
+	public function max_length(string $str = null, string $val): bool
+	{
+		return (is_numeric($val) && $val >= mb_strlen($str));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns true if $str is at least $val length.
+	 *
+	 * @param string $str
+	 * @param string $val
+	 *
+	 * @return boolean
+	 */
+	public function min_length(string $str = null, string $val): bool
+	{
+		return (is_numeric($val) && $val <= mb_strlen($str));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Does not equal the static value provided.
+	 *
+	 * @param string $str
+	 * @param string $val
+	 *
+	 * @return boolean
+	 */
+	public function not_equals(string $str = null, string $val): bool
+	{
+		return $str !== $val;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Value should not be within an array of values.
+	 *
+	 * @param string $value
+	 * @param string $list
+	 *
+	 * @return boolean
+	 */
+	public function not_in_list(string $value = null, string $list): bool
+	{
+		return ! $this->in_list($value, $list);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Required
+	 *
+	 * @param mixed $str Value
+	 *
+	 * @return boolean          True if valid, false if not
+	 */
+	public function required($str = null): bool
+	{
+		if (is_object($str))
+		{
+			return true;
+		}
+
+		return is_array($str) ? ! empty($str) : (trim($str) !== '');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The field is required when any of the other required fields are present
+	 * in the data.
+	 *
+	 * Example (field is required when the password field is present):
+	 *
+	 *     required_with[password]
+	 *
+	 * @param string|null $str
+	 * @param string|null $fields List of fields that we should check if present
+	 * @param array       $data   Complete list of fields from the form
+	 *
+	 * @return boolean
+	 */
+	public function required_with($str = null, string $fields = null, array $data = []): bool
+	{
+		if (is_null($fields) || empty($data))
+		{
+			throw new InvalidArgumentException('You must supply the parameters: fields, data.');
+		}
+
+		$fields = explode(',', $fields);
+
+		// If the field is present we can safely assume that
+		// the field is here, no matter whether the corresponding
+		// search field is present or not.
+		$present = $this->required($str ?? '');
+
+		if ($present)
+		{
+			return true;
+		}
+
+		// Still here? Then we fail this test if
+		// any of the fields are present in $data
+		// as $fields is the lis
+		$requiredFields = [];
+
+		foreach ($fields as $field)
+		{
+			if ((array_key_exists($field, $data) && ! empty($data[$field])) ||
+				(strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))                )
+			{
+				$requiredFields[] = $field;
+			}
+		}
+
+		return empty($requiredFields);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The field is required when all of the other fields are present
+	 * in the data but not required.
+	 *
+	 * Example (field is required when the id or email field is missing):
+	 *
+	 *     required_without[id,email]
+	 *
+	 * @param string|null $str
+	 * @param string|null $fields
+	 * @param array       $data
+	 *
+	 * @return boolean
+	 */
+	public function required_without($str = null, string $fields = null, array $data = []): bool
+	{
+		if (is_null($fields) || empty($data))
+		{
+			throw new InvalidArgumentException('You must supply the parameters: fields, data.');
+		}
+
+		$fields = explode(',', $fields);
+
+		// If the field is present we can safely assume that
+		// the field is here, no matter whether the corresponding
+		// search field is present or not.
+		$present = $this->required($str ?? '');
+
+		if ($present)
+		{
+			return true;
+		}
+
+		// Still here? Then we fail this test if
+		// any of the fields are not present in $data
+		foreach ($fields as $field)
+		{
+			if ((strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) ||
+				(strpos($field, '.') !== false && empty(dot_array_search($field, $data)))
+			)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
new file mode 100644
index 0000000..29a2322
--- /dev/null
+++ b/system/Validation/Validation.php
@@ -0,0 +1,822 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Validation\Exceptions\ValidationException;
+use CodeIgniter\View\RendererInterface;
+use Config\Validation as ValidationConfig;
+use InvalidArgumentException;
+
+/**
+ * Validator
+ */
+class Validation implements ValidationInterface
+{
+	/**
+	 * Files to load with validation functions.
+	 *
+	 * @var array
+	 */
+	protected $ruleSetFiles;
+
+	/**
+	 * The loaded instances of our validation files.
+	 *
+	 * @var array
+	 */
+	protected $ruleSetInstances = [];
+
+	/**
+	 * Stores the actual rules that should
+	 * be ran against $data.
+	 *
+	 * @var array
+	 */
+	protected $rules = [];
+
+	/**
+	 * The data that should be validated,
+	 * where 'key' is the alias, with value.
+	 *
+	 * @var array
+	 */
+	protected $data = [];
+
+	/**
+	 * Any generated errors during validation.
+	 * 'key' is the alias, 'value' is the message.
+	 *
+	 * @var array
+	 */
+	protected $errors = [];
+
+	/**
+	 * Stores custom error message to use
+	 * during validation. Where 'key' is the alias.
+	 *
+	 * @var array
+	 */
+	protected $customErrors = [];
+
+	/**
+	 * Our configuration.
+	 *
+	 * @var ValidationConfig
+	 */
+	protected $config;
+
+	/**
+	 * The view renderer used to render validation messages.
+	 *
+	 * @var RendererInterface
+	 */
+	protected $view;
+
+	/**
+	 * Validation constructor.
+	 *
+	 * @param ValidationConfig  $config
+	 * @param RendererInterface $view
+	 */
+	public function __construct($config, RendererInterface $view)
+	{
+		$this->ruleSetFiles = $config->ruleSets;
+
+		$this->config = $config;
+
+		$this->view = $view;
+	}
+
+	/**
+	 * Runs the validation process, returning true/false determining whether
+	 * validation was successful or not.
+	 *
+	 * @param array|null  $data    The array of data to validate.
+	 * @param string|null $group   The predefined group of rules to apply.
+	 * @param string|null $dbGroup The database group to use.
+	 *
+	 * @return boolean
+	 */
+	public function run(array $data = null, string $group = null, string $dbGroup = null): bool
+	{
+		$data = $data ?? $this->data;
+
+		// i.e. is_unique
+		$data['DBGroup'] = $dbGroup;
+
+		$this->loadRuleSets();
+		$this->loadRuleGroup($group);
+
+		// If no rules exist, we return false to ensure
+		// the developer didn't forget to set the rules.
+		if (empty($this->rules))
+		{
+			return false;
+		}
+
+		// Replace any placeholders (e.g. {id}) in the rules with
+		// the value found in $data, if any.
+		$this->rules = $this->fillPlaceholders($this->rules, $data);
+
+		// Need this for searching arrays in validation.
+		helper('array');
+
+		// Run through each rule. If we have any field set for
+		// this rule, then we need to run them through!
+		foreach ($this->rules as $field => $setup)
+		{
+			// Blast $rSetup apart, unless it's already an array.
+			$rules = $setup['rules'] ?? $setup;
+
+			if (is_string($rules))
+			{
+				$rules = $this->splitRules($rules);
+			}
+
+			$values = dot_array_search($field, $data);
+			$values = is_array($values) ? $values : [$values];
+
+			if ($values === [])
+			{
+				// We'll process the values right away if an empty array
+				$this->processRules($field, $setup['label'] ?? $field, $values, $rules, $data);
+			}
+
+			foreach ($values as $value)
+			{
+				// Otherwise, we'll let the loop do the job
+				$this->processRules($field, $setup['label'] ?? $field, $value, $rules, $data);
+			}
+		}
+
+		return $this->getErrors() === [];
+	}
+
+	/**
+	 * Runs the validation process, returning true or false
+	 * determining whether validation was successful or not.
+	 *
+	 * @param mixed    $value
+	 * @param string   $rule
+	 * @param string[] $errors
+	 *
+	 * @return boolean
+	 */
+	public function check($value, string $rule, array $errors = []): bool
+	{
+		$this->reset();
+
+		return $this->setRule('check', null, $rule, $errors)->run(['check' => $value]);
+	}
+
+	/**
+	 * Runs all of $rules against $field, until one fails, or
+	 * all of them have been processed. If one fails, it adds
+	 * the error to $this->errors and moves on to the next,
+	 * so that we can collect all of the first errors.
+	 *
+	 * @param string       $field
+	 * @param string|null  $label
+	 * @param string|array $value
+	 * @param array|null   $rules
+	 * @param array        $data
+	 *
+	 * @return boolean
+	 */
+	protected function processRules(string $field, string $label = null, $value, $rules = null, array $data = null): bool
+	{
+		if (is_null($data))
+		{
+			throw new InvalidArgumentException('You must supply the parameter: data.');
+		}
+
+		if (in_array('if_exist', $rules, true))
+		{
+			$flattenedData = array_flatten_with_dots($data);
+			$ifExistField  = $field;
+
+			if (strpos($field, '.*') !== false)
+			{
+				// We'll change the dot notation into a PCRE pattern
+				// that can be used later
+				$ifExistField = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
+
+				$dataIsExisting = array_reduce(array_keys($flattenedData), static function ($carry, $item) use ($ifExistField) {
+					$pattern = sprintf('/%s/u', $ifExistField);
+					return $carry || preg_match($pattern, $item) === 1;
+				}, false);
+			}
+			else
+			{
+				$dataIsExisting = array_key_exists($ifExistField, $flattenedData);
+			}
+
+			unset($ifExistField, $flattenedData);
+
+			if (! $dataIsExisting)
+			{
+				// we return early if `if_exist` is not satisfied. we have nothing to do here.
+				return true;
+			}
+
+			// Otherwise remove the if_exist rule and continue the process
+			$rules = array_diff($rules, ['if_exist']);
+		}
+
+		if (in_array('permit_empty', $rules, true))
+		{
+			if (! in_array('required', $rules, true) && (is_array($value) ? empty($value) : (trim($value) === '')))
+			{
+				$passed = true;
+
+				foreach ($rules as $rule)
+				{
+					if (preg_match('/(.*?)\[(.*)\]/', $rule, $match))
+					{
+						$rule  = $match[1];
+						$param = $match[2];
+
+						if (! in_array($rule, ['required_with', 'required_without'], true))
+						{
+							continue;
+						}
+
+						// Check in our rulesets
+						foreach ($this->ruleSetInstances as $set)
+						{
+							if (! method_exists($set, $rule))
+							{
+								continue;
+							}
+
+							$passed = $passed && $set->$rule($value, $param, $data);
+							break;
+						}
+					}
+				}
+
+				if ($passed === true)
+				{
+					return true;
+				}
+			}
+
+			$rules = array_diff($rules, ['permit_empty']);
+		}
+
+		foreach ($rules as $rule)
+		{
+			$isCallable = is_callable($rule);
+
+			$passed = false;
+			$param  = false;
+
+			if (! $isCallable && preg_match('/(.*?)\[(.*)\]/', $rule, $match))
+			{
+				$rule  = $match[1];
+				$param = $match[2];
+			}
+
+			// Placeholder for custom errors from the rules.
+			$error = null;
+
+			// If it's a callable, call and and get out of here.
+			if ($isCallable)
+			{
+				$passed = $param === false ? $rule($value) : $rule($value, $param, $data);
+			}
+			else
+			{
+				$found = false;
+
+				// Check in our rulesets
+				foreach ($this->ruleSetInstances as $set)
+				{
+					if (! method_exists($set, $rule))
+					{
+						continue;
+					}
+
+					$found  = true;
+					$passed = $param === false ? $set->$rule($value, $error) : $set->$rule($value, $param, $data, $error);
+
+					break;
+				}
+
+				// If the rule wasn't found anywhere, we
+				// should throw an exception so the developer can find it.
+				if (! $found)
+				{
+					throw ValidationException::forRuleNotFound($rule);
+				}
+			}
+
+			// Set the error message if we didn't survive.
+			if ($passed === false)
+			{
+				// if the $value is an array, convert it to as string representation
+				if (is_array($value))
+				{
+					$value = '[' . implode(', ', $value) . ']';
+				}
+
+				$this->errors[$field] = is_null($error)
+					? $this->getErrorMessage($rule, $field, $label, $param, $value)
+					: $error; // @phpstan-ignore-line
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Takes a Request object and grabs the input data to use from its
+	 * array values.
+	 *
+	 * @param RequestInterface|IncomingRequest $request
+	 *
+	 * @return ValidationInterface
+	 */
+	public function withRequest(RequestInterface $request): ValidationInterface
+	{
+		/** @var IncomingRequest $request */
+		if (strpos($request->getHeaderLine('Content-Type'), 'application/json') !== false)
+		{
+			$this->data = $request->getJSON(true);
+			return $this;
+		}
+
+		if (in_array($request->getMethod(), ['put', 'patch', 'delete'], true)
+			&& strpos($request->getHeaderLine('Content-Type'), 'multipart/form-data') === false
+		)
+		{
+			$this->data = $request->getRawInput();
+		}
+		else
+		{
+			$this->data = $request->getVar() ?? [];
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets an individual rule and custom error messages for a single field.
+	 *
+	 * The custom error message should be just the messages that apply to
+	 * this field, like so:
+	 *
+	 *    [
+	 *        'rule' => 'message',
+	 *        'rule' => 'message'
+	 *    ]
+	 *
+	 * @param string      $field
+	 * @param string|null $label
+	 * @param string      $rules
+	 * @param array       $errors
+	 *
+	 * @return $this
+	 */
+	public function setRule(string $field, string $label = null, string $rules, array $errors = [])
+	{
+		$this->rules[$field] = [
+			'label' => $label,
+			'rules' => $rules,
+		];
+
+		$this->customErrors = array_merge($this->customErrors, [
+			$field => $errors,
+		]);
+
+		return $this;
+	}
+
+	/**
+	 * Stores the rules that should be used to validate the items.
+	 * Rules should be an array formatted like:
+	 *
+	 *    [
+	 *        'field' => 'rule1|rule2'
+	 *    ]
+	 *
+	 * The $errors array should be formatted like:
+	 *    [
+	 *        'field' => [
+	 *            'rule' => 'message',
+	 *            'rule' => 'message
+	 *        ],
+	 *    ]
+	 *
+	 * @param array $rules
+	 * @param array $errors // An array of custom error messages
+	 *
+	 * @return ValidationInterface
+	 */
+	public function setRules(array $rules, array $errors = []): ValidationInterface
+	{
+		$this->customErrors = $errors;
+
+		foreach ($rules as $field => &$rule)
+		{
+			if (! is_array($rule))
+			{
+				continue;
+			}
+
+			if (! array_key_exists('errors', $rule))
+			{
+				continue;
+			}
+
+			$this->customErrors[$field] = $rule['errors'];
+			unset($rule['errors']);
+		}
+
+		$this->rules = $rules;
+
+		return $this;
+	}
+
+	/**
+	 * Returns all of the rules currently defined.
+	 *
+	 * @return array
+	 */
+	public function getRules(): array
+	{
+		return $this->rules;
+	}
+
+	/**
+	 * Checks to see if the rule for key $field has been set or not.
+	 *
+	 * @param string $field
+	 *
+	 * @return boolean
+	 */
+	public function hasRule(string $field): bool
+	{
+		return array_key_exists($field, $this->rules);
+	}
+
+	/**
+	 * Get rule group.
+	 *
+	 * @param string $group Group.
+	 *
+	 * @return string[] Rule group.
+	 *
+	 * @throws InvalidArgumentException If group not found.
+	 */
+	public function getRuleGroup(string $group): array
+	{
+		if (! isset($this->config->$group))
+		{
+			throw ValidationException::forGroupNotFound($group);
+		}
+
+		if (! is_array($this->config->$group))
+		{
+			throw ValidationException::forGroupNotArray($group);
+		}
+
+		return $this->config->$group;
+	}
+
+	/**
+	 * Set rule group.
+	 *
+	 * @param string $group Group.
+	 *
+	 * @throws InvalidArgumentException If group not found.
+	 */
+	public function setRuleGroup(string $group)
+	{
+		$rules = $this->getRuleGroup($group);
+		$this->setRules($rules);
+
+		$errorName = $group . '_errors';
+		if (isset($this->config->$errorName))
+		{
+			$this->customErrors = $this->config->$errorName;
+		}
+	}
+
+	/**
+	 * Returns the rendered HTML of the errors as defined in $template.
+	 *
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	public function listErrors(string $template = 'list'): string
+	{
+		if (! array_key_exists($template, $this->config->templates))
+		{
+			throw ValidationException::forInvalidTemplate($template);
+		}
+
+		return $this->view
+			->setVar('errors', $this->getErrors())
+			->render($this->config->templates[$template]);
+	}
+
+	/**
+	 * Displays a single error in formatted HTML as defined in the $template view.
+	 *
+	 * @param string $field
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	public function showError(string $field, string $template = 'single'): string
+	{
+		if (! array_key_exists($field, $this->getErrors()))
+		{
+			return '';
+		}
+
+		if (! array_key_exists($template, $this->config->templates))
+		{
+			throw ValidationException::forInvalidTemplate($template);
+		}
+
+		return $this->view
+			->setVar('error', $this->getError($field))
+			->render($this->config->templates[$template]);
+	}
+
+	/**
+	 * Loads all of the rulesets classes that have been defined in the
+	 * Config\Validation and stores them locally so we can use them.
+	 */
+	protected function loadRuleSets()
+	{
+		if (empty($this->ruleSetFiles))
+		{
+			throw ValidationException::forNoRuleSets();
+		}
+
+		foreach ($this->ruleSetFiles as $file)
+		{
+			$this->ruleSetInstances[] = new $file();
+		}
+	}
+
+	/**
+	 * Loads custom rule groups (if set) into the current rules.
+	 *
+	 * Rules can be pre-defined in Config\Validation and can
+	 * be any name, but must all still be an array of the
+	 * same format used with setRules(). Additionally, check
+	 * for {group}_errors for an array of custom error messages.
+	 *
+	 * @param string|null $group
+	 *
+	 * @return array|ValidationException|null
+	 */
+	public function loadRuleGroup(string $group = null)
+	{
+		if (empty($group))
+		{
+			return null;
+		}
+
+		if (! isset($this->config->$group))
+		{
+			throw ValidationException::forGroupNotFound($group);
+		}
+
+		if (! is_array($this->config->$group))
+		{
+			throw ValidationException::forGroupNotArray($group);
+		}
+
+		$this->setRules($this->config->$group);
+
+		// If {group}_errors exists in the config file,
+		// then override our custom errors with them.
+		$errorName = $group . '_errors';
+
+		if (isset($this->config->$errorName))
+		{
+			$this->customErrors = $this->config->$errorName;
+		}
+
+		return $this->rules;
+	}
+
+	/**
+	 * Replace any placeholders within the rules with the values that
+	 * match the 'key' of any properties being set. For example, if
+	 * we had the following $data array:
+	 *
+	 * [ 'id' => 13 ]
+	 *
+	 * and the following rule:
+	 *
+	 *  'required|is_unique[users,email,id,{id}]'
+	 *
+	 * The value of {id} would be replaced with the actual id in the form data:
+	 *
+	 *  'required|is_unique[users,email,id,13]'
+	 *
+	 * @param array $rules
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	protected function fillPlaceholders(array $rules, array $data): array
+	{
+		$replacements = [];
+
+		foreach ($data as $key => $value)
+		{
+			$replacements["{{$key}}"] = $value;
+		}
+
+		if (! empty($replacements))
+		{
+			foreach ($rules as &$rule)
+			{
+				if (is_array($rule))
+				{
+					foreach ($rule as &$row)
+					{
+						// Should only be an `errors` array
+						// which doesn't take placeholders.
+						if (is_array($row))
+						{
+							continue;
+						}
+
+						$row = strtr($row, $replacements);
+					}
+					continue;
+				}
+
+				$rule = strtr($rule, $replacements);
+			}
+		}
+
+		return $rules;
+	}
+
+	/**
+	 * Checks to see if an error exists for the given field.
+	 *
+	 * @param string $field
+	 *
+	 * @return boolean
+	 */
+	public function hasError(string $field): bool
+	{
+		return array_key_exists($field, $this->getErrors());
+	}
+
+	/**
+	 * Returns the error(s) for a specified $field (or empty string if not
+	 * set).
+	 *
+	 * @param string $field Field.
+	 *
+	 * @return string Error(s).
+	 */
+	public function getError(string $field = null): string
+	{
+		if ($field === null && count($this->rules) === 1)
+		{
+			$field = array_key_first($this->rules);
+		}
+
+		return array_key_exists($field, $this->getErrors()) ? $this->errors[$field] : '';
+	}
+
+	/**
+	 * Returns the array of errors that were encountered during
+	 * a run() call. The array should be in the following format:
+	 *
+	 *    [
+	 *        'field1' => 'error message',
+	 *        'field2' => 'error message',
+	 *    ]
+	 *
+	 * @return array<string,string>
+	 *
+	 * Excluded from code coverage because that it always run as cli
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getErrors(): array
+	{
+		// If we already have errors, we'll use those.
+		// If we don't, check the session to see if any were
+		// passed along from a redirect_with_input request.
+		if (empty($this->errors) && ! is_cli() && isset($_SESSION, $_SESSION['_ci_validation_errors']))
+		{
+			$this->errors = unserialize($_SESSION['_ci_validation_errors']);
+		}
+
+		return $this->errors ?? [];
+	}
+
+	/**
+	 * Sets the error for a specific field. Used by custom validation methods.
+	 *
+	 * @param string $field
+	 * @param string $error
+	 *
+	 * @return ValidationInterface
+	 */
+	public function setError(string $field, string $error): ValidationInterface
+	{
+		$this->errors[$field] = $error;
+
+		return $this;
+	}
+
+	/**
+	 * Attempts to find the appropriate error message
+	 *
+	 * @param string      $rule
+	 * @param string      $field
+	 * @param string|null $label
+	 * @param string      $param
+	 * @param string      $value The value that caused the validation to fail.
+	 *
+	 * @return string
+	 */
+	protected function getErrorMessage(string $rule, string $field, string $label = null, string $param = null, string $value = null): string
+	{
+		// Check if custom message has been defined by user
+		if (isset($this->customErrors[$field][$rule]))
+		{
+			$message = lang($this->customErrors[$field][$rule]);
+		}
+		else
+		{
+			// Try to grab a localized version of the message...
+			// lang() will return the rule name back if not found,
+			// so there will always be a string being returned.
+			$message = lang('Validation.' . $rule);
+		}
+
+		$message = str_replace('{field}', empty($label) ? $field : lang($label), $message);
+		$message = str_replace('{param}', empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']), $message);
+
+		return str_replace('{value}', $value, $message);
+	}
+
+	/**
+	 * Split rules string by pipe operator.
+	 *
+	 * @param string $rules
+	 *
+	 * @return array
+	 */
+	protected function splitRules(string $rules): array
+	{
+		$nonEscapeBracket = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
+		$pipeNotInBracket = sprintf(
+			'/\|(?=(?:[^\[\]]*%s[^\[\]]*%s)*(?![^\[\]]*%s))/',
+			$nonEscapeBracket,
+			$nonEscapeBracket,
+			$nonEscapeBracket
+		);
+
+		$_rules = preg_split($pipeNotInBracket, $rules);
+
+		return array_unique($_rules);
+	}
+
+	// Misc
+	/**
+	 * Resets the class to a blank slate. Should be called whenever
+	 * you need to process more than one array.
+	 *
+	 * @return ValidationInterface
+	 */
+	public function reset(): ValidationInterface
+	{
+		$this->data         = [];
+		$this->rules        = [];
+		$this->errors       = [];
+		$this->customErrors = [];
+
+		return $this;
+	}
+}
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
new file mode 100644
index 0000000..f4bd820
--- /dev/null
+++ b/system/Validation/ValidationInterface.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+use CodeIgniter\HTTP\RequestInterface;
+
+/**
+ * Expected behavior of a validator
+ */
+interface ValidationInterface
+{
+	/**
+	 * Runs the validation process, returning true/false determining whether
+	 * or not validation was successful.
+	 *
+	 * @param array  $data  The array of data to validate.
+	 * @param string $group The pre-defined group of rules to apply.
+	 *
+	 * @return boolean
+	 */
+	public function run(array $data = null, string $group = null): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Check; runs the validation process, returning true or false
+	 * determining whether or not validation was successful.
+	 *
+	 * @param mixed    $value  Value to validation.
+	 * @param string   $rule   Rule.
+	 * @param string[] $errors Errors.
+	 *
+	 * @return boolean True if valid, else false.
+	 */
+	public function check($value, string $rule, array $errors = []): bool;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes a Request object and grabs the input data to use from its
+	 * array values.
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return ValidationInterface
+	 */
+	public function withRequest(RequestInterface $request): ValidationInterface;
+
+	//--------------------------------------------------------------------
+	// Rules
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores the rules that should be used to validate the items.
+	 *
+	 * @param array $rules
+	 * @param array $messages
+	 *
+	 * @return ValidationInterface
+	 */
+	public function setRules(array $rules, array $messages = []): ValidationInterface;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks to see if the rule for key $field has been set or not.
+	 *
+	 * @param string $field
+	 *
+	 * @return boolean
+	 */
+	public function hasRule(string $field): bool;
+
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Errors
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the error for a specified $field (or empty string if not set).
+	 *
+	 * @param string $field
+	 *
+	 * @return string
+	 */
+	public function getError(string $field): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the array of errors that were encountered during
+	 * a run() call. The array should be in the following format:
+	 *
+	 *    [
+	 *        'field1' => 'error message',
+	 *        'field2' => 'error message',
+	 *    ]
+	 *
+	 * @return array<string,string>
+	 */
+	public function getErrors(): array;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the error for a specific field. Used by custom validation methods.
+	 *
+	 * @param string $alias
+	 * @param string $error
+	 *
+	 * @return ValidationInterface
+	 */
+	public function setError(string $alias, string $error): ValidationInterface;
+
+	//--------------------------------------------------------------------
+	// Misc
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resets the class to a blank slate. Should be called whenever
+	 * you need to process more than one array.
+	 *
+	 * @return ValidationInterface
+	 */
+	public function reset(): ValidationInterface;
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Validation/Views/list.php b/system/Validation/Views/list.php
new file mode 100644
index 0000000..cc95156
--- /dev/null
+++ b/system/Validation/Views/list.php
@@ -0,0 +1,9 @@
+<?php if (! empty($errors)) : ?>
+	<div class="errors" role="alert">
+		<ul>
+		<?php foreach ($errors as $error) : ?>
+			<li><?= esc($error) ?></li>
+		<?php endforeach ?>
+		</ul>
+	</div>
+<?php endif ?>
diff --git a/system/Validation/Views/single.php b/system/Validation/Views/single.php
new file mode 100644
index 0000000..3967917
--- /dev/null
+++ b/system/Validation/Views/single.php
@@ -0,0 +1 @@
+<span class="help-block"><?= esc($error) ?></span>
diff --git a/system/View/Cell.php b/system/View/Cell.php
new file mode 100644
index 0000000..8f753e6
--- /dev/null
+++ b/system/View/Cell.php
@@ -0,0 +1,255 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\View\Exceptions\ViewException;
+use Config\Services;
+use ReflectionException;
+use ReflectionMethod;
+
+/**
+ * Class Cell
+ *
+ * A simple class that can call any other class that can be loaded,
+ * and echo out it's result. Intended for displaying small blocks of
+ * content within views that can be managed by other libraries and
+ * not require they are loaded within controller.
+ *
+ * Used with the helper function, it's use will look like:
+ *
+ *         viewCell('\Some\Class::method', 'limit=5 sort=asc', 60, 'cache-name');
+ *
+ * Parameters are matched up with the callback method's arguments of the same name:
+ *
+ *         class Class {
+ *             function method($limit, $sort)
+ *         }
+ *
+ * Alternatively, the params will be passed into the callback method as a simple array
+ * if matching params are not found.
+ *
+ *         class Class {
+ *             function method(array $params=null)
+ *         }
+ */
+class Cell
+{
+	/**
+	 * Instance of the current Cache Instance
+	 *
+	 * @var CacheInterface
+	 */
+	protected $cache;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Cell constructor.
+	 *
+	 * @param CacheInterface $cache
+	 */
+	public function __construct(CacheInterface $cache)
+	{
+		$this->cache = $cache;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Render a cell, returning its body as a string.
+	 *
+	 * @param string      $library
+	 * @param null        $params
+	 * @param integer     $ttl
+	 * @param string|null $cacheName
+	 *
+	 * @return string
+	 * @throws ReflectionException
+	 */
+	public function render(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
+	{
+		[$class, $method] = $this->determineClass($library);
+
+		// Is it cached?
+		$cacheName = ! empty($cacheName)
+			? $cacheName
+			: str_replace(['\\', '/'], '', $class) . $method . md5(serialize($params));
+
+		if (! empty($this->cache) && $output = $this->cache->get($cacheName))
+		{
+			return $output;
+		}
+
+		// Not cached - so grab it...
+		$instance = new $class();
+
+		if (method_exists($instance, 'initController'))
+		{
+			$instance->initController(Services::request(), Services::response(), Services::logger());
+		}
+
+		if (! method_exists($instance, $method))
+		{
+			throw ViewException::forInvalidCellMethod($class, $method);
+		}
+
+		// Try to match up the parameter list we were provided
+		// with the parameter name in the callback method.
+		$paramArray = $this->prepareParams($params);
+		$refMethod  = new ReflectionMethod($instance, $method);
+		$paramCount = $refMethod->getNumberOfParameters();
+		$refParams  = $refMethod->getParameters();
+
+		if ($paramCount === 0)
+		{
+			if (! empty($paramArray))
+			{
+				throw ViewException::forMissingCellParameters($class, $method);
+			}
+
+			$output = $instance->{$method}();
+		}
+		elseif (($paramCount === 1)
+			&& ((! array_key_exists($refParams[0]->name, $paramArray))
+			|| (array_key_exists($refParams[0]->name, $paramArray)
+			&& count($paramArray) !== 1))
+		)
+		{
+			$output = $instance->{$method}($paramArray);
+		}
+		else
+		{
+			$fireArgs     = [];
+			$methodParams = [];
+
+			foreach ($refParams as $arg)
+			{
+				$methodParams[$arg->name] = true;
+				if (array_key_exists($arg->name, $paramArray))
+				{
+					$fireArgs[$arg->name] = $paramArray[$arg->name];
+				}
+			}
+
+			foreach (array_keys($paramArray) as $key)
+			{
+				if (! isset($methodParams[$key]))
+				{
+					throw ViewException::forInvalidCellParameter($key);
+				}
+			}
+
+			$output = $instance->$method(...array_values($fireArgs));
+		}
+		// Can we cache it?
+		if (! empty($this->cache) && $ttl !== 0)
+		{
+			$this->cache->save($cacheName, $output, $ttl);
+		}
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses the params attribute. If an array, returns untouched.
+	 * If a string, it should be in the format "key1=value key2=value".
+	 * It will be split and returned as an array.
+	 *
+	 * @param mixed $params
+	 *
+	 * @return array|null
+	 */
+	public function prepareParams($params)
+	{
+		if (empty($params) || (! is_string($params) && ! is_array($params)))
+		{
+			return [];
+		}
+
+		if (is_string($params))
+		{
+			$newParams = [];
+			$separator = ' ';
+
+			if (strpos($params, ',') !== false)
+			{
+				$separator = ',';
+			}
+
+			$params = explode($separator, $params);
+			unset($separator);
+
+			foreach ($params as $p)
+			{
+				if (! empty($p))
+				{
+					[$key, $val]       = explode('=', $p);
+					$newParams[trim($key)] = trim($val, ', ');
+				}
+			}
+
+			$params = $newParams;
+
+			unset($newParams);
+		}
+
+		if (is_array($params) && empty($params))
+		{
+			return [];
+		}
+
+		return $params;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given the library string, attempts to determine the class and method
+	 * to call.
+	 *
+	 * @param string $library
+	 *
+	 * @return array
+	 */
+	protected function determineClass(string $library): array
+	{
+		// We don't want to actually call static methods
+		// by default, so convert any double colons.
+		$library = str_replace('::', ':', $library);
+
+		[$class, $method] = explode(':', $library);
+
+		if (empty($class))
+		{
+			throw ViewException::forNoCellClass();
+		}
+
+		if (! class_exists($class, true))
+		{
+			throw ViewException::forInvalidCellClass($class);
+		}
+
+		if (empty($method))
+		{
+			$method = 'index';
+		}
+
+		return [
+			$class,
+			$method,
+		];
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/View/Exceptions/ViewException.php b/system/View/Exceptions/ViewException.php
new file mode 100644
index 0000000..fc8d3be
--- /dev/null
+++ b/system/View/Exceptions/ViewException.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class ViewException extends FrameworkException
+{
+	public static function forInvalidCellMethod(string $class, string $method)
+	{
+		return new static(lang('View.invalidCellMethod', ['class' => $class, 'method' => $method]));
+	}
+
+	public static function forMissingCellParameters(string $class, string $method)
+	{
+		return new static(lang('View.missingCellParameters', ['class' => $class, 'method' => $method]));
+	}
+
+	public static function forInvalidCellParameter(string $key)
+	{
+		return new static(lang('View.invalidCellParameter', [$key]));
+	}
+
+	public static function forNoCellClass()
+	{
+		return new static(lang('View.noCellClass'));
+	}
+
+	public static function forInvalidCellClass(string $class = null)
+	{
+		return new static(lang('View.invalidCellClass', [$class]));
+	}
+
+	public static function forTagSyntaxError(string $output)
+	{
+		return new static(lang('View.tagSyntaxError', [$output]));
+	}
+}
diff --git a/system/View/Filters.php b/system/View/Filters.php
new file mode 100644
index 0000000..cae51b9
--- /dev/null
+++ b/system/View/Filters.php
@@ -0,0 +1,333 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use Config\Services;
+use NumberFormatter;
+
+/**
+ * View filters
+ */
+class Filters
+{
+	/**
+	 * Returns $value as all lowercase with the first letter capitalized.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function capitalize(string $value): string
+	{
+		return ucfirst(strtolower($value));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Formats a date into the given $format.
+	 *
+	 * @param mixed  $value
+	 * @param string $format
+	 *
+	 * @return string
+	 */
+	public static function date($value, string $format): string
+	{
+		if (is_string($value) && ! is_numeric($value))
+		{
+			$value = strtotime($value);
+		}
+
+		return date($format, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given a string or DateTime object, will return the date modified
+	 * by the given value. Returns the value as a unix timestamp
+	 *
+	 * Example:
+	 *      my_date|date_modify(+1 day)
+	 *
+	 * @param string $value
+	 * @param string $adjustment
+	 *
+	 * @return   integer|false
+	 * @internal param string $format
+	 */
+	public static function date_modify($value, string $adjustment)
+	{
+		$value = static::date($value, 'Y-m-d H:i:s');
+
+		return strtotime($adjustment, strtotime($value));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the given default value if $value is empty or undefined.
+	 *
+	 * @param mixed  $value
+	 * @param string $default
+	 *
+	 * @return string
+	 */
+	public static function default($value, string $default): string
+	{
+		return empty($value)
+			? $default
+			: $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Escapes the given value with our `esc()` helper function.
+	 *
+	 * @param string $value
+	 * @param string $context
+	 *
+	 * @return string
+	 */
+	public static function esc($value, string $context = 'html'): string
+	{
+		return esc($value, $context);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an excerpt of the given string.
+	 *
+	 * @param string  $value
+	 * @param string  $phrase
+	 * @param integer $radius
+	 *
+	 * @return string
+	 */
+	public static function excerpt(string $value, string $phrase, int $radius = 100): string
+	{
+		helper('text');
+
+		return excerpt($value, $phrase, $radius);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Highlights a given phrase within the text using '<mark></mark>' tags.
+	 *
+	 * @param string $value
+	 * @param string $phrase
+	 *
+	 * @return string
+	 */
+	public static function highlight(string $value, string $phrase): string
+	{
+		helper('text');
+
+		return highlight_phrase($value, $phrase);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Highlights code samples with HTML/CSS.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function highlight_code($value): string
+	{
+		helper('text');
+
+		return highlight_code($value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Limits the number of characters to $limit, and trails of with an ellipsis.
+	 * Will break at word break so may be more or less than $limit.
+	 *
+	 * @param string  $value
+	 * @param integer $limit
+	 *
+	 * @return string
+	 */
+	public static function limit_chars($value, int $limit = 500): string
+	{
+		helper('text');
+
+		return character_limiter($value, $limit);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Limits the number of words to $limit, and trails of with an ellipsis.
+	 *
+	 * @param string  $value
+	 * @param integer $limit
+	 *
+	 * @return string
+	 */
+	public static function limit_words($value, int $limit = 100): string
+	{
+		helper('text');
+
+		return word_limiter($value, $limit);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the $value displayed in a localized manner.
+	 *
+	 * @param integer|float $value
+	 * @param integer       $precision
+	 * @param string        $type
+	 * @param string|null   $locale
+	 *
+	 * @return string
+	 */
+	public static function local_number($value, string $type = 'decimal', int $precision = 4, string $locale = null): string
+	{
+		helper('number');
+
+		$types = [
+			'decimal'    => NumberFormatter::DECIMAL,
+			'currency'   => NumberFormatter::CURRENCY,
+			'percent'    => NumberFormatter::PERCENT,
+			'scientific' => NumberFormatter::SCIENTIFIC,
+			'spellout'   => NumberFormatter::SPELLOUT,
+			'ordinal'    => NumberFormatter::ORDINAL,
+			'duration'   => NumberFormatter::DURATION,
+		];
+
+		return format_number($value, $precision, $locale, ['type' => $types[$type]]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the $value displayed as a currency string.
+	 *
+	 * @param integer|float $value
+	 * @param string        $currency
+	 * @param string|null   $locale
+	 * @param integer       $fraction
+	 *
+	 * @return string
+	 */
+	public static function local_currency($value, string $currency, string $locale = null, $fraction = null): string
+	{
+		helper('number');
+
+		$options = [
+			'type'     => NumberFormatter::CURRENCY,
+			'currency' => $currency,
+			'fraction' => $fraction,
+		];
+
+		return format_number($value, 2, $locale, $options);
+	}
+
+	/**
+	 * Returns a string with all instances of newline character (\n)
+	 * converted to an HTML <br/> tag.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function nl2br(string $value): string
+	{
+		$typography = Services::typography();
+
+		return $typography->nl2brExceptPre($value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes a body of text and uses the auto_typography() method to
+	 * turn it into prettier, easier-to-read, prose.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function prose(string $value): string
+	{
+		$typography = Services::typography();
+
+		return $typography->autoTypography($value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rounds a given $value in one of 3 ways;
+	 *
+	 *  - common    Normal rounding
+	 *  - ceil      always rounds up
+	 *  - floor     always rounds down
+	 *
+	 * @param string $value
+	 * @param mixed  $precision
+	 * @param string $type
+	 *
+	 * @return string|float
+	 */
+	public static function round(string $value, $precision = 2, string $type = 'common')
+	{
+		if (! is_numeric($precision))
+		{
+			$type      = $precision;
+			$precision = 2;
+		}
+
+		switch ($type)
+		{
+			case 'common':
+				return round((float) $value, $precision);
+			case 'ceil':
+				return ceil((float) $value);
+			case 'floor':
+				return floor((float) $value);
+		}
+
+		// Still here, just return the value.
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a "title case" version of the string.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function title(string $value): string
+	{
+		return ucwords(strtolower($value));
+	}
+
+	//--------------------------------------------------------------------
+
+}
diff --git a/system/View/Parser.php b/system/View/Parser.php
new file mode 100644
index 0000000..b3cef4b
--- /dev/null
+++ b/system/View/Parser.php
@@ -0,0 +1,840 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\View\Exceptions\ViewException;
+use Config\View as ViewConfig;
+use ParseError;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class for parsing pseudo-vars
+ */
+class Parser extends View
+{
+	/**
+	 * Left delimiter character for pseudo vars
+	 *
+	 * @var string
+	 */
+	public $leftDelimiter = '{';
+
+	/**
+	 * Right delimiter character for pseudo vars
+	 *
+	 * @var string
+	 */
+	public $rightDelimiter = '}';
+
+	/**
+	 * Stores extracted noparse blocks.
+	 *
+	 * @var array
+	 */
+	protected $noparseBlocks = [];
+
+	/**
+	 * Stores any plugins registered at run-time.
+	 *
+	 * @var array
+	 */
+	protected $plugins = [];
+
+	/**
+	 * Stores the context for each data element
+	 * when set by `setData` so the context is respected.
+	 *
+	 * @var array
+	 */
+	protected $dataContexts = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * @param ViewConfig      $config
+	 * @param string          $viewPath
+	 * @param mixed           $loader
+	 * @param boolean         $debug
+	 * @param LoggerInterface $logger
+	 */
+	public function __construct(ViewConfig $config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
+	{
+		// Ensure user plugins override core plugins.
+		$this->plugins = $config->plugins ?? [];
+
+		parent::__construct($config, $viewPath, $loader, $debug, $logger);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse a template
+	 *
+	 * Parses pseudo-variables contained in the specified template view,
+	 * replacing them with any data that has already been set.
+	 *
+	 * @param string  $view
+	 * @param array   $options
+	 * @param boolean $saveData
+	 *
+	 * @return string
+	 */
+	public function render(string $view, array $options = null, bool $saveData = null): string
+	{
+		$start = microtime(true);
+		if (is_null($saveData))
+		{
+			$saveData = $this->config->saveData;
+		}
+
+		$fileExt = pathinfo($view, PATHINFO_EXTENSION);
+		$view    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
+
+		$cacheName = $options['cache_name'] ?? str_replace('.php', '', $view);
+
+		// Was it cached?
+		if (isset($options['cache']) && ($output = cache($cacheName)))
+		{
+			$this->logPerformance($start, microtime(true), $view);
+			return $output;
+		}
+
+		$file = $this->viewPath . $view;
+
+		if (! is_file($file))
+		{
+			$fileOrig = $file;
+			$file     = $this->loader->locateFile($view, 'Views');
+
+			// locateFile will return an empty string if the file cannot be found.
+			if (empty($file))
+			{
+				throw ViewException::forInvalidFile($fileOrig);
+			}
+		}
+
+		if (is_null($this->tempData))
+		{
+			$this->tempData = $this->data;
+		}
+
+		$template = file_get_contents($file);
+		$output   = $this->parse($template, $this->tempData, $options);
+		$this->logPerformance($start, microtime(true), $view);
+
+		if ($saveData)
+		{
+			$this->data = $this->tempData;
+		}
+		// Should we cache?
+		if (isset($options['cache']))
+		{
+			cache()->save($cacheName, $output, (int) $options['cache']);
+		}
+		$this->tempData = null;
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse a String
+	 *
+	 * Parses pseudo-variables contained in the specified string,
+	 * replacing them with any data that has already been set.
+	 *
+	 * @param string  $template
+	 * @param array   $options
+	 * @param boolean $saveData
+	 *
+	 * @return string
+	 */
+	public function renderString(string $template, array $options = null, bool $saveData = null): string
+	{
+		$start = microtime(true);
+		if (is_null($saveData))
+		{
+			$saveData = $this->config->saveData;
+		}
+
+		if (is_null($this->tempData))
+		{
+			$this->tempData = $this->data;
+		}
+
+		$output = $this->parse($template, $this->tempData, $options);
+
+		$this->logPerformance($start, microtime(true), $this->excerpt($template));
+
+		if ($saveData)
+		{
+			$this->data = $this->tempData;
+		}
+
+		$this->tempData = null;
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Sets several pieces of view data at once.
+	 * In the Parser, we need to store the context here
+	 * so that the variable is correctly handled within the
+	 * parsing itself, and contexts (including raw) are respected.
+	 *
+	 * @param array  $data
+	 * @param string $context The context to escape it for: html, css, js, url, raw
+	 *                        If 'raw', no escaping will happen
+	 *
+	 * @return RendererInterface
+	 */
+	public function setData(array $data = [], string $context = null): RendererInterface
+	{
+		if (! empty($context))
+		{
+			foreach ($data as $key => &$value)
+			{
+				if (is_array($value))
+				{
+					foreach ($value as &$obj)
+					{
+						$obj = $this->objectToArray($obj);
+					}
+				}
+				else
+				{
+					$value = $this->objectToArray($value);
+				}
+
+				$this->dataContexts[$key] = $context;
+			}
+		}
+
+		$this->tempData = $this->tempData ?? $this->data;
+		$this->tempData = array_merge($this->tempData, $data);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse a template
+	 *
+	 * Parses pseudo-variables contained in the specified template,
+	 * replacing them with the data in the second param
+	 *
+	 * @param string $template
+	 * @param array  $data
+	 * @param array  $options  Future options
+	 *
+	 * @return string
+	 */
+	protected function parse(string $template, array $data = [], array $options = null): string
+	{
+		if ($template === '')
+		{
+			return '';
+		}
+
+		// Remove any possible PHP tags since we don't support it
+		// and parseConditionals needs it clean anyway...
+		$template = str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $template);
+
+		$template = $this->parseComments($template);
+		$template = $this->extractNoparse($template);
+
+		// Replace any conditional code here so we don't have to parse as much
+		$template = $this->parseConditionals($template);
+
+		// Handle any plugins before normal data, so that
+		// it can potentially modify any template between its tags.
+		$template = $this->parsePlugins($template);
+
+		// loop over the data variables, replacing
+		// the content as we go.
+		foreach ($data as $key => $val)
+		{
+			$escape = true;
+
+			if (is_array($val))
+			{
+				$escape  = false;
+				$replace = $this->parsePair($key, $val, $template);
+			}
+			else
+			{
+				$replace = $this->parseSingle($key, (string) $val);
+			}
+
+			foreach ($replace as $pattern => $content)
+			{
+				$template = $this->replaceSingle($pattern, $content, $template, $escape);
+			}
+		}
+
+		return $this->insertNoparse($template);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse a single key/value, extracting it
+	 *
+	 * @param  string $key
+	 * @param  string $val
+	 * @return array
+	 */
+	protected function parseSingle(string $key, string $val): array
+	{
+		$pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#ms';
+
+		return [$pattern => $val];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parse a tag pair
+	 *
+	 * Parses tag pairs: {some_tag} string... {/some_tag}
+	 *
+	 * @param  string $variable
+	 * @param  array  $data
+	 * @param  string $template
+	 * @return array
+	 */
+	protected function parsePair(string $variable, array $data, string $template): array
+	{
+		// Holds the replacement patterns and contents
+		// that will be used within a preg_replace in parse()
+		$replace = [];
+
+		// Find all matches of space-flexible versions of {tag}{/tag} so we
+		// have something to loop over.
+		preg_match_all(
+			'#' . $this->leftDelimiter . '\s*' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '(.+?)' .
+			$this->leftDelimiter . '\s*' . '/' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '#s', $template, $matches, PREG_SET_ORDER
+		);
+
+		/*
+		 * Each match looks like:
+		 *
+		 * $match[0] {tag}...{/tag}
+		 * $match[1] Contents inside the tag
+		 */
+		foreach ($matches as $match)
+		{
+			// Loop over each piece of $data, replacing
+			// it's contents so that we know what to replace in parse()
+			$str = '';  // holds the new contents for this tag pair.
+			foreach ($data as $row)
+			{
+				// Objects that have a `toArray()` method should be
+				// converted with that method (i.e. Entities)
+				if (is_object($row) && method_exists($row, 'toArray'))
+				{
+					$row = $row->toArray();
+				}
+				// Otherwise, cast as an array and it will grab public properties.
+				elseif (is_object($row))
+				{
+					$row = (array) $row;
+				}
+
+				$temp  = [];
+				$pairs = [];
+				$out   = $match[1];
+				foreach ($row as $key => $val)
+				{
+					// For nested data, send us back through this method...
+					if (is_array($val))
+					{
+						$pair = $this->parsePair($key, $val, $match[1]);
+
+						if (! empty($pair))
+						{
+							$pairs[array_keys($pair)[0]] = true;
+
+							$temp = array_merge($temp, $pair);
+						}
+
+						continue;
+					}
+
+					if (is_object($val))
+					{
+						$val = 'Class: ' . get_class($val);
+					}
+					elseif (is_resource($val))
+					{
+						$val = 'Resource';
+					}
+
+					$temp['#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#s'] = $val;
+				}
+
+				// Now replace our placeholders with the new content.
+				foreach ($temp as $pattern => $content)
+				{
+					$out = $this->replaceSingle($pattern, $content, $out, ! isset($pairs[$pattern]));
+				}
+
+				$str .= $out;
+			}
+
+			//Escape | character from filters as it's handled as OR in regex
+			$escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
+
+			$replace['#' . $escapedMatch . '#s'] = $str;
+		}
+
+		return $replace;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes any comments from the file. Comments are wrapped in {# #} symbols:
+	 *
+	 *      {# This is a comment #}
+	 *
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function parseComments(string $template): string
+	{
+		return preg_replace('/\{#.*?#\}/s', '', $template);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts noparse blocks, inserting a hash in its place so that
+	 * those blocks of the page are not touched by parsing.
+	 *
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function extractNoparse(string $template): string
+	{
+		$pattern = '/\{\s*noparse\s*\}(.*?)\{\s*\/noparse\s*\}/ms';
+
+		/*
+		 * $matches[][0] is the raw match
+		 * $matches[][1] is the contents
+		 */
+		if (preg_match_all($pattern, $template, $matches, PREG_SET_ORDER))
+		{
+			foreach ($matches as $match)
+			{
+				// Create a hash of the contents to insert in its place.
+				$hash                       = md5($match[1]);
+				$this->noparseBlocks[$hash] = $match[1];
+				$template                   = str_replace($match[0], "noparse_{$hash}", $template);
+			}
+		}
+
+		return $template;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Re-inserts the noparsed contents back into the template.
+	 *
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	public function insertNoparse(string $template): string
+	{
+		foreach ($this->noparseBlocks as $hash => $replace)
+		{
+			$template = str_replace("noparse_{$hash}", $replace, $template);
+			unset($this->noparseBlocks[$hash]);
+		}
+
+		return $template;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses any conditionals in the code, removing blocks that don't
+	 * pass so we don't try to parse it later.
+	 *
+	 * Valid conditionals:
+	 *  - if
+	 *  - elseif
+	 *  - else
+	 *
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function parseConditionals(string $template): string
+	{
+		$pattern = '/\{\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*\}/ms';
+
+		/**
+		 * For each match:
+		 * [0] = raw match `{if var}`
+		 * [1] = conditional `if`
+		 * [2] = condition `do === true`
+		 * [3] = same as [2]
+		 */
+		preg_match_all($pattern, $template, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $match)
+		{
+			// Build the string to replace the `if` statement with.
+			$condition = $match[2];
+
+			$statement = $match[1] === 'elseif' ? '<?php elseif (' . $condition . '): ?>' : '<?php if (' . $condition . '): ?>';
+			$template  = str_replace($match[0], $statement, $template);
+		}
+
+		$template = preg_replace('/\{\s*else\s*\}/ms', '<?php else: ?>', $template);
+		$template = preg_replace('/\{\s*endif\s*\}/ms', '<?php endif; ?>', $template);
+
+		// Parse the PHP itself, or insert an error so they can debug
+		ob_start();
+
+		if (is_null($this->tempData))
+		{
+			$this->tempData = $this->data;
+		}
+
+		extract($this->tempData);
+
+		try
+		{
+			eval('?>' . $template . '<?php ');
+		}
+		catch (ParseError $e)
+		{
+			ob_end_clean();
+			throw ViewException::forTagSyntaxError(str_replace(['?>', '<?php '], '', $template));
+		}
+
+		return ob_get_clean();
+	}
+
+	//--------------------------------------------------------------------
+	/**
+	 * Over-ride the substitution field delimiters.
+	 *
+	 * @param  string $leftDelimiter
+	 * @param  string $rightDelimiter
+	 * @return RendererInterface
+	 */
+	public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): RendererInterface
+	{
+		$this->leftDelimiter  = $leftDelimiter;
+		$this->rightDelimiter = $rightDelimiter;
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles replacing a pseudo-variable with the actual content. Will double-check
+	 * for escaping brackets.
+	 *
+	 * @param mixed   $pattern
+	 * @param string  $content
+	 * @param string  $template
+	 * @param boolean $escape
+	 *
+	 * @return string
+	 */
+	protected function replaceSingle($pattern, $content, $template, bool $escape = false): string
+	{
+		// Any dollar signs in the pattern will be misinterpreted, so slash them
+		$pattern = addcslashes($pattern, '$');
+		$content = (string) $content;
+
+		// Flesh out the main pattern from the delimiters and escape the hash
+		// See https://regex101.com/r/IKdUlk/1
+		if (preg_match('/^(#)(.+)(#(m?s)?)$/s', $pattern, $parts))
+		{
+			$pattern = $parts[1] . addcslashes($parts[2], '#') . $parts[3];
+		}
+
+		// Replace the content in the template
+		return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
+			// Check for {! !} syntax to not escape this one.
+			if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) === '!}')
+			{
+				$escape = false;
+			}
+
+			return $this->prepareReplacement($matches, $content, $escape);
+		}, (string) $template);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Callback used during parse() to apply any filters to the value.
+	 *
+	 * @param array   $matches
+	 * @param string  $replace
+	 * @param boolean $escape
+	 *
+	 * @return string
+	 */
+	protected function prepareReplacement(array $matches, string $replace, bool $escape = true): string
+	{
+		$orig = array_shift($matches);
+
+		// Our regex earlier will leave all chained values on a single line
+		// so we need to break them apart so we can apply them all.
+		$filters = ! empty($matches[1]) ? explode('|', $matches[1]) : [];
+
+		if ($escape && empty($filters) && ($context = $this->shouldAddEscaping($orig)))
+		{
+			$filters[] = "esc({$context})";
+		}
+
+		return $this->applyFilters($replace, $filters);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the placeholder the view provided to see if we need to provide any autoescaping.
+	 *
+	 * @param string $key
+	 *
+	 * @return false|string
+	 */
+	public function shouldAddEscaping(string $key)
+	{
+		$escape = false;
+
+		$key = trim(str_replace(['{', '}'], '', $key));
+
+		// If the key has a context stored (from setData)
+		// we need to respect that.
+		if (array_key_exists($key, $this->dataContexts))
+		{
+			if ($this->dataContexts[$key] !== 'raw')
+			{
+				return $this->dataContexts[$key];
+			}
+		}
+		// No pipes, then we know we need to escape
+		elseif (strpos($key, '|') === false)
+		{
+			$escape = 'html';
+		}
+		// If there's a `noescape` then we're definitely false.
+		elseif (strpos($key, 'noescape') !== false)
+		{
+			$escape = false;
+		}
+		// If no `esc` filter is found, then we'll need to add one.
+		elseif (! preg_match('/\s+esc/', $key))
+		{
+			$escape = 'html';
+		}
+
+		return $escape;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Given a set of filters, will apply each of the filters in turn
+	 * to $replace, and return the modified string.
+	 *
+	 * @param string $replace
+	 * @param array  $filters
+	 *
+	 * @return string
+	 */
+	protected function applyFilters(string $replace, array $filters): string
+	{
+		// Determine the requested filters
+		foreach ($filters as $filter)
+		{
+			// Grab any parameter we might need to send
+			preg_match('/\([\w<>=\/\\\,:.\-\s\+]+\)/', $filter, $param);
+
+			// Remove the () and spaces to we have just the parameter left
+			$param = ! empty($param) ? trim($param[0], '() ') : null;
+
+			// Params can be separated by commas to allow multiple parameters for the filter
+			if (! empty($param))
+			{
+				$param = explode(',', $param);
+
+				// Clean it up
+				foreach ($param as &$p)
+				{
+					$p = trim($p, ' "');
+				}
+			}
+			else
+			{
+				$param = [];
+			}
+
+			// Get our filter name
+			$filter = ! empty($param) ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
+
+			if (! array_key_exists($filter, $this->config->filters))
+			{
+				continue;
+			}
+
+			// Filter it....
+			$replace = $this->config->filters[$filter]($replace, ...$param);
+		}
+
+		return $replace;
+	}
+
+	//--------------------------------------------------------------------
+	// Plugins
+	//--------------------------------------------------------------------
+
+	/**
+	 * Scans the template for any parser plugins, and attempts to execute them.
+	 * Plugins are delimited by {+ ... +}
+	 *
+	 * @param string $template
+	 *
+	 * @return string
+	 */
+	protected function parsePlugins(string $template)
+	{
+		foreach ($this->plugins as $plugin => $callable)
+		{
+			// Paired tags are enclosed in an array in the config array.
+			$isPair   = is_array($callable);
+			$callable = $isPair ? array_shift($callable) : $callable;
+
+			// See https://regex101.com/r/BCBBKB/1
+			$pattern = $isPair
+				? '#\{\+\s*' . $plugin . '([\w=\-_:\+\s\(\)/"@.]*)?\s*\+\}(.+?)\{\+\s*/' . $plugin . '\s*\+\}#ims'
+				: '#\{\+\s*' . $plugin . '([\w=\-_:\+\s\(\)/"@.]*)?\s*\+\}#ims';
+
+			/**
+			 * Match tag pairs
+			 *
+			 * Each match is an array:
+			 *   $matches[0] = entire matched string
+			 *   $matches[1] = all parameters string in opening tag
+			 *   $matches[2] = content between the tags to send to the plugin.
+			 */
+			if (! preg_match_all($pattern, $template, $matches, PREG_SET_ORDER))
+			{
+				continue;
+			}
+
+			foreach ($matches as $match)
+			{
+				$params = [];
+
+				preg_match_all('/([\w-]+=\"[^"]+\")|([\w-]+=[^\"\s=]+)|(\"[^"]+\")|(\S+)/', trim($match[1]), $matchesParams);
+
+				foreach ($matchesParams[0] as $item)
+				{
+					$keyVal = explode('=', $item);
+
+					if (count($keyVal) === 2)
+					{
+						$params[$keyVal[0]] = str_replace('"', '', $keyVal[1]);
+					}
+					else
+					{
+						$params[] = str_replace('"', '', $item);
+					}
+				}
+
+				$template = $isPair
+					? str_replace($match[0], $callable($match[2], $params), $template)
+					: str_replace($match[0], $callable($params), $template);
+			}
+		}
+
+		return $template;
+	}
+
+	/**
+	 * Makes a new plugin available during the parsing of the template.
+	 *
+	 * @param string   $alias
+	 * @param callable $callback
+	 *
+	 * @param boolean  $isPair
+	 *
+	 * @return $this
+	 */
+	public function addPlugin(string $alias, callable $callback, bool $isPair = false)
+	{
+		$this->plugins[$alias] = $isPair ? [$callback] : $callback;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a plugin from the available plugins.
+	 *
+	 * @param string $alias
+	 *
+	 * @return $this
+	 */
+	public function removePlugin(string $alias)
+	{
+		unset($this->plugins[$alias]);
+
+		return $this;
+	}
+
+	/**
+	 * Converts an object to an array, respecting any
+	 * toArray() methods on an object.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return mixed
+	 */
+	protected function objectToArray($value)
+	{
+		// Objects that have a `toArray()` method should be
+		// converted with that method (i.e. Entities)
+		if (is_object($value) && method_exists($value, 'toArray'))
+		{
+			$value = $value->toArray();
+		}
+		// Otherwise, cast as an array and it will grab public properties.
+		elseif (is_object($value))
+		{
+			$value = (array) $value;
+		}
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
new file mode 100644
index 0000000..05bb2af
--- /dev/null
+++ b/system/View/Plugins.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\HTTP\URI;
+use Config\Services;
+
+/**
+ * View plugins
+ */
+class Plugins
+{
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @return string|URI
+	 */
+	public static function currentURL()
+	{
+		return current_url();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @return URI|mixed|string
+	 */
+	public static function previousURL()
+	{
+		return previous_url();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public static function mailto(array $params = []): string
+	{
+		$email = $params['email'] ?? '';
+		$title = $params['title'] ?? '';
+		$attrs = $params['attributes'] ?? '';
+
+		return mailto($email, $title, $attrs);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public static function safeMailto(array $params = []): string
+	{
+		$email = $params['email'] ?? '';
+		$title = $params['title'] ?? '';
+		$attrs = $params['attributes'] ?? '';
+
+		return safe_mailto($email, $title, $attrs);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public static function lang(array $params = []): string
+	{
+		$line = array_shift($params);
+
+		return lang($line, $params);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public static function ValidationErrors(array $params = []): string
+	{
+		$validator = Services::validation();
+		if (empty($params))
+		{
+			return $validator->listErrors();
+		}
+
+		return $validator->showError($params['field']);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @param array $params
+	 *
+	 * @return string|false
+	 */
+	public static function route(array $params = [])
+	{
+		return route_to(...$params);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Wrap helper function to use as view plugin.
+	 *
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public static function siteURL(array $params = []): string
+	{
+		return site_url(...$params);
+	}
+}
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
new file mode 100644
index 0000000..c8a3b7a
--- /dev/null
+++ b/system/View/RendererInterface.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+/**
+ * Interface RendererInterface
+ *
+ * The interface used for displaying Views and/or theme files.
+ */
+interface RendererInterface
+{
+	/**
+	 * Builds the output based upon a file name and any
+	 * data that has already been set.
+	 *
+	 * @param string  $view
+	 * @param array   $options  Reserved for 3rd-party uses since
+	 *                          it might be needed to pass additional info
+	 *                          to other template engines.
+	 * @param boolean $saveData Whether to save data for subsequent calls
+	 *
+	 * @return string
+	 */
+	public function render(string $view, array $options = null, bool $saveData = false): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the output based upon a string and any
+	 * data that has already been set.
+	 *
+	 * @param string  $view     The view contents
+	 * @param array   $options  Reserved for 3rd-party uses since
+	 *                          it might be needed to pass additional info
+	 *                          to other template engines.
+	 * @param boolean $saveData Whether to save data for subsequent calls
+	 *
+	 * @return string
+	 */
+	public function renderString(string $view, array $options = null, bool $saveData = false): string;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets several pieces of view data at once.
+	 *
+	 * @param array  $data
+	 * @param string $context The context to escape it for: html, css, js, url
+	 *                        If 'raw', no escaping will happen
+	 *
+	 * @return RendererInterface
+	 */
+	public function setData(array $data = [], string $context = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a single piece of view data.
+	 *
+	 * @param string $name
+	 * @param mixed  $value
+	 * @param string $context The context to escape it for: html, css, js, url
+	 *                        If 'raw' no escaping will happen
+	 *
+	 * @return RendererInterface
+	 */
+	public function setVar(string $name, $value = null, string $context = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes all of the view data from the system.
+	 *
+	 * @return RendererInterface
+	 */
+	public function resetData();
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/View/Table.php b/system/View/Table.php
new file mode 100644
index 0000000..ec10e75
--- /dev/null
+++ b/system/View/Table.php
@@ -0,0 +1,523 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\Database\BaseResult;
+
+/**
+ * HTML Table Generating Class
+ *
+ * Lets you create tables manually or from database result objects, or arrays.
+ */
+class Table
+{
+	/**
+	 * Data for table rows
+	 *
+	 * @var array
+	 */
+	public $rows = [];
+
+	/**
+	 * Data for table heading
+	 *
+	 * @var array
+	 */
+	public $heading = [];
+
+	/**
+	 * Data for table footing
+	 *
+	 * @var array
+	 */
+	public $footing = [];
+
+	/**
+	 * Whether or not to automatically create the table header
+	 *
+	 * @var boolean
+	 */
+	public $autoHeading = true;
+
+	/**
+	 * Table caption
+	 *
+	 * @var string|null
+	 */
+	public $caption;
+
+	/**
+	 * Table layout template
+	 *
+	 * @var array
+	 */
+	public $template;
+
+	/**
+	 * Newline setting
+	 *
+	 * @var string
+	 */
+	public $newline = "\n";
+
+	/**
+	 * Contents of empty cells
+	 *
+	 * @var string
+	 */
+	public $emptyCells = '';
+
+	/**
+	 * Callback for custom table layout
+	 *
+	 * @var callable|null
+	 */
+	public $function;
+
+	/**
+	 * Set the template from the table config file if it exists
+	 *
+	 * @param  array $config (default: array())
+	 * @return void
+	 */
+	public function __construct($config = [])
+	{
+		// initialize config
+		foreach ($config as $key => $val)
+		{
+			$this->template[$key] = $val;
+		}
+	}
+
+	/**
+	 * Set the template
+	 *
+	 * @param  array $template
+	 * @return boolean
+	 */
+	public function setTemplate($template)
+	{
+		if (! is_array($template))
+		{
+			return false;
+		}
+
+		$this->template = $template;
+		return true;
+	}
+
+	/**
+	 * Set the table heading
+	 *
+	 * Can be passed as an array or discreet params
+	 *
+	 * @return Table
+	 */
+	public function setHeading()
+	{
+		$this->heading = $this->_prepArgs(func_get_args());
+		return $this;
+	}
+
+	/**
+	 * Set the table footing
+	 *
+	 * Can be passed as an array or discreet params
+	 *
+	 * @return Table
+	 */
+	public function setFooting()
+	{
+		$this->footing = $this->_prepArgs(func_get_args());
+		return $this;
+	}
+
+	/**
+	 * Set columns. Takes a one-dimensional array as input and creates
+	 * a multi-dimensional array with a depth equal to the number of
+	 * columns. This allows a single array with many elements to be
+	 * displayed in a table that has a fixed column count.
+	 *
+	 * @param  array   $array
+	 * @param  integer $columnLimit
+	 * @return array|false
+	 */
+	public function makeColumns($array = [], $columnLimit = 0)
+	{
+		if (! is_array($array) || $array === [] || ! is_int($columnLimit))
+		{
+			return false;
+		}
+
+		// Turn off the auto-heading feature since it's doubtful we
+		// will want headings from a one-dimensional array
+		$this->autoHeading = false;
+
+		if ($columnLimit === 0)
+		{
+			return $array;
+		}
+
+		$new = [];
+		do
+		{
+			$temp = array_splice($array, 0, $columnLimit);
+
+			if (count($temp) < $columnLimit)
+			{
+				for ($i = count($temp); $i < $columnLimit; $i++)
+				{
+					$temp[] = '&nbsp;';
+				}
+			}
+
+			$new[] = $temp;
+		}
+		while (count($array) > 0);
+
+		// @phpstan-ignore-next-line
+		return $new;
+	}
+
+	/**
+	 * Set "empty" cells
+	 *
+	 * Can be passed as an array or discreet params
+	 *
+	 * @param  mixed $value
+	 * @return Table
+	 */
+	public function setEmpty($value)
+	{
+		$this->emptyCells = $value;
+		return $this;
+	}
+
+	/**
+	 * Add a table row
+	 *
+	 * Can be passed as an array or discreet params
+	 *
+	 * @return Table
+	 */
+	public function addRow()
+	{
+		$this->rows[] = $this->_prepArgs(func_get_args());
+		return $this;
+	}
+
+	/**
+	 * Prep Args
+	 *
+	 * Ensures a standard associative array format for all cell data
+	 *
+	 * @param  array $args
+	 * @return array
+	 */
+	protected function _prepArgs(array $args)
+	{
+		// If there is no $args[0], skip this and treat as an associative array
+		// This can happen if there is only a single key, for example this is passed to table->generate
+		// array(array('foo'=>'bar'))
+		if (isset($args[0]) && count($args) === 1 && is_array($args[0]) && ! isset($args[0]['data']))
+		{
+			$args = $args[0];
+		}
+
+		foreach ($args as $key => $val)
+		{
+			if (! is_array($val))
+			{
+				$args[$key] = ['data' => $val];
+			}
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Add a table caption
+	 *
+	 * @param  string $caption
+	 * @return Table
+	 */
+	public function setCaption($caption)
+	{
+		$this->caption = $caption;
+		return $this;
+	}
+
+	/**
+	 * Generate the table
+	 *
+	 * @param mixed $tableData
+	 *
+	 * @return string
+	 */
+	public function generate($tableData = null)
+	{
+		// The table data can optionally be passed to this function
+		// either as a database result object or an array
+		if (! empty($tableData))
+		{
+			if ($tableData instanceof BaseResult)
+			{
+				$this->_setFromDBResult($tableData);
+			}
+			elseif (is_array($tableData))
+			{
+				$this->_setFromArray($tableData);
+			}
+		}
+
+		// Is there anything to display? No? Smite them!
+		if (empty($this->heading) && empty($this->rows))
+		{
+			return 'Undefined table data';
+		}
+
+		// Compile and validate the template date
+		$this->_compileTemplate();
+
+		// Validate a possibly existing custom cell manipulation function
+		if (isset($this->function) && ! is_callable($this->function))
+		{
+			$this->function = null;
+		}
+
+		// Build the table!
+		$out = $this->template['table_open'] . $this->newline;
+
+		// Add any caption here
+		if ($this->caption)
+		{
+			$out .= '<caption>' . $this->caption . '</caption>' . $this->newline;
+		}
+
+		// Is there a table heading to display?
+		if (! empty($this->heading))
+		{
+			$out .= $this->template['thead_open'] . $this->newline . $this->template['heading_row_start'] . $this->newline;
+
+			foreach ($this->heading as $heading)
+			{
+				$temp = $this->template['heading_cell_start'];
+
+				foreach ($heading as $key => $val)
+				{
+					if ($key !== 'data')
+					{
+						$temp = str_replace('<th', '<th ' . $key . '="' . $val . '"', $temp);
+					}
+				}
+
+				$out .= $temp . ($heading['data'] ?? '') . $this->template['heading_cell_end'];
+			}
+
+			$out .= $this->template['heading_row_end'] . $this->newline . $this->template['thead_close'] . $this->newline;
+		}
+
+		// Build the table rows
+		if (! empty($this->rows))
+		{
+			$out .= $this->template['tbody_open'] . $this->newline;
+
+			$i = 1;
+
+			foreach ($this->rows as $row)
+			{
+				// We use modulus to alternate the row colors
+				$name = fmod($i++, 2) ? '' : 'alt_';
+
+				$out .= $this->template['row_' . $name . 'start'] . $this->newline;
+
+				foreach ($row as $cell)
+				{
+					$temp = $this->template['cell_' . $name . 'start'];
+
+					foreach ($cell as $key => $val)
+					{
+						if ($key !== 'data')
+						{
+							$temp = str_replace('<td', '<td ' . $key . '="' . $val . '"', $temp);
+						}
+					}
+
+					$cell = $cell['data'] ?? '';
+					$out .= $temp;
+
+					if ($cell === '' || $cell === null)
+					{
+						$out .= $this->emptyCells;
+					}
+					elseif (isset($this->function))
+					{
+						$out .= call_user_func($this->function, $cell);
+					}
+					else
+					{
+						$out .= $cell;
+					}
+
+					$out .= $this->template['cell_' . $name . 'end'];
+				}
+
+				$out .= $this->template['row_' . $name . 'end'] . $this->newline;
+			}
+
+			$out .= $this->template['tbody_close'] . $this->newline;
+		}
+
+		// Any table footing to display?
+		if (! empty($this->footing))
+		{
+			$out .= $this->template['tfoot_open'] . $this->newline . $this->template['footing_row_start'] . $this->newline;
+
+			foreach ($this->footing as $footing)
+			{
+				$temp = $this->template['footing_cell_start'];
+
+				foreach ($footing as $key => $val)
+				{
+					if ($key !== 'data')
+					{
+						$temp = str_replace('<th', '<th ' . $key . '="' . $val . '"', $temp);
+					}
+				}
+
+				$out .= $temp . ($footing['data'] ?? '') . $this->template['footing_cell_end'];
+			}
+
+			$out .= $this->template['footing_row_end'] . $this->newline . $this->template['tfoot_close'] . $this->newline;
+		}
+
+		// And finally, close off the table
+		$out .= $this->template['table_close'];
+
+		// Clear table class properties before generating the table
+		$this->clear();
+
+		return $out;
+	}
+
+	/**
+	 * Clears the table arrays.  Useful if multiple tables are being generated
+	 *
+	 * @return Table
+	 */
+	public function clear()
+	{
+		$this->rows        = [];
+		$this->heading     = [];
+		$this->footing     = [];
+		$this->autoHeading = true;
+		$this->caption     = null;
+		return $this;
+	}
+
+	/**
+	 * Set table data from a database result object
+	 *
+	 * @param  BaseResult $object Database result object
+	 * @return void
+	 */
+	protected function _setFromDBResult($object)
+	{
+		// First generate the headings from the table column names
+		if ($this->autoHeading && empty($this->heading))
+		{
+			$this->heading = $this->_prepArgs($object->getFieldNames());
+		}
+
+		foreach ($object->getResultArray() as $row)
+		{
+			$this->rows[] = $this->_prepArgs($row);
+		}
+	}
+
+	/**
+	 * Set table data from an array
+	 *
+	 * @param array $data
+	 *
+	 * @return void
+	 */
+	protected function _setFromArray($data)
+	{
+		if ($this->autoHeading && empty($this->heading))
+		{
+			$this->heading = $this->_prepArgs(array_shift($data));
+		}
+
+		foreach ($data as &$row)
+		{
+			$this->rows[] = $this->_prepArgs($row);
+		}
+	}
+
+	/**
+	 * Compile Template
+	 *
+	 * @return void
+	 */
+	protected function _compileTemplate()
+	{
+		if ($this->template === null)
+		{
+			$this->template = $this->_defaultTemplate();
+			return;
+		}
+
+		foreach ($this->_defaultTemplate() as $field => $template)
+		{
+			if (! isset($this->template[$field]))
+			{
+				$this->template[$field] = $template;
+			}
+		}
+	}
+
+	/**
+	 * Default Template
+	 *
+	 * @return array
+	 */
+	protected function _defaultTemplate()
+	{
+		return [
+			'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
+			'thead_open'         => '<thead>',
+			'thead_close'        => '</thead>',
+			'heading_row_start'  => '<tr>',
+			'heading_row_end'    => '</tr>',
+			'heading_cell_start' => '<th>',
+			'heading_cell_end'   => '</th>',
+			'tfoot_open'         => '<tfoot>',
+			'tfoot_close'        => '</tfoot>',
+			'footing_row_start'  => '<tr>',
+			'footing_row_end'    => '</tr>',
+			'footing_cell_start' => '<td>',
+			'footing_cell_end'   => '</td>',
+			'tbody_open'         => '<tbody>',
+			'tbody_close'        => '</tbody>',
+			'row_start'          => '<tr>',
+			'row_end'            => '</tr>',
+			'cell_start'         => '<td>',
+			'cell_end'           => '</td>',
+			'row_alt_start'      => '<tr>',
+			'row_alt_end'        => '</tr>',
+			'cell_alt_start'     => '<td>',
+			'cell_alt_end'       => '</td>',
+			'table_close'        => '</table>',
+		];
+	}
+}
diff --git a/system/View/View.php b/system/View/View.php
new file mode 100644
index 0000000..33efdaa
--- /dev/null
+++ b/system/View/View.php
@@ -0,0 +1,521 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Debug\Toolbar\Collectors\Views;
+use CodeIgniter\View\Exceptions\ViewException;
+use Config\Services;
+use Config\Toolbar;
+use Config\View as ViewConfig;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+
+/**
+ * Class View
+ */
+class View implements RendererInterface
+{
+	/**
+	 * Data that is made available to the Views.
+	 *
+	 * @var array
+	 */
+	protected $data = [];
+
+	/**
+	 * Merge savedData and userData
+	 */
+	protected $tempData = null;
+
+	/**
+	 * The base directory to look in for our Views.
+	 *
+	 * @var string
+	 */
+	protected $viewPath;
+
+	/**
+	 * The render variables
+	 *
+	 * @var array
+	 */
+	protected $renderVars = [];
+
+	/**
+	 * Instance of FileLocator for when
+	 * we need to attempt to find a view
+	 * that's not in standard place.
+	 *
+	 * @var FileLocator
+	 */
+	protected $loader;
+
+	/**
+	 * Logger instance.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * Should we store performance info?
+	 *
+	 * @var boolean
+	 */
+	protected $debug = false;
+
+	/**
+	 * Cache stats about our performance here,
+	 * when CI_DEBUG = true
+	 *
+	 * @var array
+	 */
+	protected $performanceData = [];
+
+	/**
+	 * @var ViewConfig
+	 */
+	protected $config;
+
+	/**
+	 * Whether data should be saved between renders.
+	 *
+	 * @var boolean
+	 */
+	protected $saveData;
+
+	/**
+	 * Number of loaded views
+	 *
+	 * @var integer
+	 */
+	protected $viewsCount = 0;
+
+	/**
+	 * The name of the layout being used, if any.
+	 * Set by the `extend` method used within views.
+	 *
+	 * @var string|null
+	 */
+	protected $layout;
+
+
+	/**
+	 * Holds the sections and their data.
+	 *
+	 * @var array
+	 */
+	protected $sections = [];
+
+	/**
+	 * The name of the current section being rendered,
+	 * if any.
+	 *
+	 * @var string|null
+	 * @deprecated
+	 */
+	protected $currentSection;
+
+	/**
+	 * The name of the current section being rendered,
+	 * if any.
+	 *
+	 * @var array<string>
+	 */
+	protected $sectionStack = [];
+
+	/**
+	 * Constructor
+	 *
+	 * @param ViewConfig       $config
+	 * @param string|null      $viewPath
+	 * @param FileLocator|null $loader
+	 * @param boolean|null     $debug
+	 * @param LoggerInterface  $logger
+	 */
+	public function __construct(ViewConfig $config, string $viewPath = null, FileLocator $loader = null, bool $debug = null, LoggerInterface $logger = null)
+	{
+		$this->config   = $config;
+		$this->viewPath = rtrim($viewPath, '\\/ ') . DIRECTORY_SEPARATOR;
+		$this->loader   = $loader ?? Services::locator();
+		$this->logger   = $logger ?? Services::logger();
+		$this->debug    = $debug ?? CI_DEBUG;
+		$this->saveData = (bool) $config->saveData;
+	}
+
+	/**
+	 * Builds the output based upon a file name and any
+	 * data that has already been set.
+	 *
+	 * Valid $options:
+	 *  - cache      Number of seconds to cache for
+	 *  - cache_name Name to use for cache
+	 *
+	 * @param string       $view     File name of the view source
+	 * @param array|null   $options  Reserved for 3rd-party uses since
+	 *                               it might be needed to pass additional info
+	 *                               to other template engines.
+	 * @param boolean|null $saveData If true, saves data for subsequent calls,
+	 *                               if false, cleans the data after displaying,
+	 *                               if null, uses the config setting.
+	 *
+	 * @return string
+	 */
+	public function render(string $view, array $options = null, bool $saveData = null): string
+	{
+		$this->renderVars['start'] = microtime(true);
+
+		// Store the results here so even if
+		// multiple views are called in a view, it won't
+		// clean it unless we mean it to.
+		$saveData                    = $saveData ?? $this->saveData;
+		$fileExt                     = pathinfo($view, PATHINFO_EXTENSION);
+		$realPath                    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
+		$this->renderVars['view']    = $realPath;
+		$this->renderVars['options'] = $options ?? [];
+
+		// Was it cached?
+		if (isset($this->renderVars['options']['cache']))
+		{
+			$cacheName = $this->renderVars['options']['cache_name'] ?? str_replace('.php', '', $this->renderVars['view']);
+			$cacheName = str_replace(['\\', '/'], '', $cacheName);
+
+			$this->renderVars['cacheName'] = $cacheName;
+
+			if ($output = cache($this->renderVars['cacheName']))
+			{
+				$this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
+
+				return $output;
+			}
+		}
+
+		$this->renderVars['file'] = $this->viewPath . $this->renderVars['view'];
+
+		if (! is_file($this->renderVars['file']))
+		{
+			$this->renderVars['file'] = $this->loader->locateFile($this->renderVars['view'], 'Views', empty($fileExt) ? 'php' : $fileExt);
+		}
+
+		// locateFile will return an empty string if the file cannot be found.
+		if (empty($this->renderVars['file']))
+		{
+			throw ViewException::forInvalidFile($this->renderVars['view']);
+		}
+
+		// Make our view data available to the view.
+		$this->tempData = $this->tempData ?? $this->data;
+
+		if ($saveData)
+		{
+			$this->data = $this->tempData;
+		}
+
+		// Save current vars
+		$renderVars = $this->renderVars;
+
+		$output = (function (): string {
+			extract($this->tempData);
+			ob_start();
+			include $this->renderVars['file'];
+			return ob_get_clean() ?: '';
+		})();
+
+		// Get back current vars
+		$this->renderVars = $renderVars;
+
+		// When using layouts, the data has already been stored
+		// in $this->sections, and no other valid output
+		// is allowed in $output so we'll overwrite it.
+		if (! is_null($this->layout) && $this->sectionStack === [])
+		{
+			$layoutView   = $this->layout;
+			$this->layout = null;
+			// Save current vars
+			$renderVars = $this->renderVars;
+			$output     = $this->render($layoutView, $options, $saveData);
+			// Get back current vars
+			$this->renderVars = $renderVars;
+		}
+
+		$this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
+
+		if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
+			&& in_array('CodeIgniter\Filters\DebugToolbar', service('filters')->getFiltersClass()['after'], true)
+		)
+		{
+			$toolbarCollectors = config(Toolbar::class)->collectors;
+
+			if (in_array(Views::class, $toolbarCollectors, true))
+			{
+				// Clean up our path names to make them a little cleaner
+				$this->renderVars['file'] = clean_path($this->renderVars['file']);
+				$this->renderVars['file'] = ++$this->viewsCount . ' ' . $this->renderVars['file'];
+
+				$output = '<!-- DEBUG-VIEW START ' . $this->renderVars['file'] . ' -->' . PHP_EOL
+					. $output . PHP_EOL
+					. '<!-- DEBUG-VIEW ENDED ' . $this->renderVars['file'] . ' -->' . PHP_EOL;
+			}
+		}
+
+		// Should we cache?
+		if (isset($this->renderVars['options']['cache']))
+		{
+			cache()->save($this->renderVars['cacheName'], $output, (int) $this->renderVars['options']['cache']);
+		}
+
+		$this->tempData = null;
+
+		return $output;
+	}
+
+	/**
+	 * Builds the output based upon a string and any
+	 * data that has already been set.
+	 * Cache does not apply, because there is no "key".
+	 *
+	 * @param string       $view     The view contents
+	 * @param array|null   $options  Reserved for 3rd-party uses since
+	 *                               it might be needed to pass additional info
+	 *                               to other template engines.
+	 * @param boolean|null $saveData If true, saves data for subsequent calls,
+	 *                               if false, cleans the data after displaying,
+	 *                               if null, uses the config setting.
+	 *
+	 * @return string
+	 */
+	public function renderString(string $view, array $options = null, bool $saveData = null): string
+	{
+		$start          = microtime(true);
+		$saveData       = $saveData ?? $this->saveData;
+		$this->tempData = $this->tempData ?? $this->data;
+
+		if ($saveData)
+		{
+			$this->data = $this->tempData;
+		}
+
+		$output = (function (string $view): string {
+			extract($this->tempData);
+			ob_start();
+			eval('?>' . $view);
+			return ob_get_clean() ?: '';
+		})($view);
+
+		$this->logPerformance($start, microtime(true), $this->excerpt($view));
+		$this->tempData = null;
+
+		return $output;
+	}
+
+	/**
+	 * Extract first bit of a long string and add ellipsis
+	 *
+	 * @param  string  $string
+	 * @param  integer $length
+	 * @return string
+	 */
+	public function excerpt(string $string, int $length = 20): string
+	{
+		return (strlen($string) > $length) ? substr($string, 0, $length - 3) . '...' : $string;
+	}
+
+	/**
+	 * Sets several pieces of view data at once.
+	 *
+	 * @param array  $data
+	 * @param string $context The context to escape it for: html, css, js, url
+	 *                        If null, no escaping will happen
+	 *
+	 * @return RendererInterface
+	 */
+	public function setData(array $data = [], string $context = null): RendererInterface
+	{
+		if ($context)
+		{
+			$data = \esc($data, $context);
+		}
+
+		$this->tempData = $this->tempData ?? $this->data;
+		$this->tempData = array_merge($this->tempData, $data);
+
+		return $this;
+	}
+
+	/**
+	 * Sets a single piece of view data.
+	 *
+	 * @param string $name
+	 * @param mixed  $value
+	 * @param string $context The context to escape it for: html, css, js, url
+	 *                        If null, no escaping will happen
+	 *
+	 * @return RendererInterface
+	 */
+	public function setVar(string $name, $value = null, string $context = null): RendererInterface
+	{
+		if ($context)
+		{
+			$value = \esc($value, $context);
+		}
+
+		$this->tempData        = $this->tempData ?? $this->data;
+		$this->tempData[$name] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Removes all of the view data from the system.
+	 *
+	 * @return RendererInterface
+	 */
+	public function resetData(): RendererInterface
+	{
+		$this->data = [];
+
+		return $this;
+	}
+
+	/**
+	 * Returns the current data that will be displayed in the view.
+	 *
+	 * @return array
+	 */
+	public function getData(): array
+	{
+		return $this->tempData ?? $this->data;
+	}
+
+	/**
+	 * Specifies that the current view should extend an existing layout.
+	 *
+	 * @param string $layout
+	 *
+	 * @return void
+	 */
+	public function extend(string $layout)
+	{
+		$this->layout = $layout;
+	}
+
+	/**
+	 * Starts holds content for a section within the layout.
+	 *
+	 * @param string $name Section name
+	 *
+	 * @return void
+	 *
+	 */
+	public function section(string $name)
+	{
+		//Saved to prevent BC.
+		$this->currentSection = $name;
+		$this->sectionStack[] = $name;
+
+		ob_start();
+	}
+
+	/**
+	 * Captures the last section
+	 *
+	 * @return void
+	 * @throws RuntimeException
+	 */
+	public function endSection()
+	{
+		$contents = ob_get_clean();
+
+		if ($this->sectionStack === [])
+		{
+			throw new RuntimeException('View themes, no current section.');
+		}
+
+		$section = array_pop($this->sectionStack);
+
+		// Ensure an array exists so we can store multiple entries for this.
+		if (! array_key_exists($section, $this->sections))
+		{
+			$this->sections[$section] = [];
+		}
+
+		$this->sections[$section][] = $contents;
+	}
+
+	/**
+	 * Renders a section's contents.
+	 *
+	 * @param string $sectionName
+	 */
+	public function renderSection(string $sectionName)
+	{
+		if (! isset($this->sections[$sectionName]))
+		{
+			echo '';
+
+			return;
+		}
+
+		foreach ($this->sections[$sectionName] as $key => $contents)
+		{
+			echo $contents;
+			unset($this->sections[$sectionName][$key]);
+		}
+	}
+
+	/**
+	 * Used within layout views to include additional views.
+	 *
+	 * @param string     $view
+	 * @param array|null $options
+	 * @param boolean    $saveData
+	 *
+	 * @return string
+	 */
+	public function include(string $view, array $options = null, $saveData = true): string
+	{
+		return $this->render($view, $options, $saveData);
+	}
+
+	/**
+	 * Returns the performance data that might have been collected
+	 * during the execution. Used primarily in the Debug Toolbar.
+	 *
+	 * @return array
+	 */
+	public function getPerformanceData(): array
+	{
+		return $this->performanceData;
+	}
+
+	/**
+	 * Logs performance data for rendering a view.
+	 *
+	 * @param float  $start
+	 * @param float  $end
+	 * @param string $view
+	 *
+	 * @return void
+	 */
+	protected function logPerformance(float $start, float $end, string $view)
+	{
+		if ($this->debug)
+		{
+			$this->performanceData[] = [
+				'start' => $start,
+				'end'   => $end,
+				'view'  => $view,
+			];
+		}
+	}
+}
diff --git a/system/bootstrap.php b/system/bootstrap.php
new file mode 100644
index 0000000..d822c0c
--- /dev/null
+++ b/system/bootstrap.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Config\DotEnv;
+use Config\Autoload;
+use Config\Modules;
+use Config\Paths;
+use Config\Services;
+
+/*
+ * ---------------------------------------------------------------
+ * SETUP OUR PATH CONSTANTS
+ * ---------------------------------------------------------------
+ *
+ * The path constants provide convenient access to the folders
+ * throughout the application. We have to setup them up here
+ * so they are available in the config files that are loaded.
+ */
+
+// The path to the application directory.
+if (! defined('APPPATH'))
+{
+	/**
+	 * @var Paths $paths
+	 */
+	define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+}
+
+// The path to the project root directory. Just above APPPATH.
+if (! defined('ROOTPATH'))
+{
+	define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
+}
+
+// The path to the system directory.
+if (! defined('SYSTEMPATH'))
+{
+	/**
+	 * @var Paths $paths
+	 */
+	define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+}
+
+// The path to the writable directory.
+if (! defined('WRITEPATH'))
+{
+	/**
+	 * @var Paths $paths
+	 */
+	define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+}
+
+// The path to the tests directory
+if (! defined('TESTPATH'))
+{
+	/**
+	 * @var Paths $paths
+	 */
+	define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+}
+
+/*
+ * ---------------------------------------------------------------
+ * GRAB OUR CONSTANTS & COMMON
+ * ---------------------------------------------------------------
+ */
+if (! defined('APP_NAMESPACE'))
+{
+	require_once APPPATH . 'Config/Constants.php';
+}
+
+// Require app/Common.php file if exists.
+if (is_file(APPPATH . 'Common.php'))
+{
+	require_once APPPATH . 'Common.php';
+}
+
+// Require system/Common.php
+require_once SYSTEMPATH . 'Common.php';
+
+/*
+ * ---------------------------------------------------------------
+ * LOAD OUR AUTOLOADER
+ * ---------------------------------------------------------------
+ *
+ * The autoloader allows all of the pieces to work together in the
+ * framework. We have to load it here, though, so that the config
+ * files can use the path constants.
+ */
+
+if (! class_exists('Config\Autoload', false))
+{
+	require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
+	require_once APPPATH . 'Config/Autoload.php';
+	require_once SYSTEMPATH . 'Modules/Modules.php';
+	require_once APPPATH . 'Config/Modules.php';
+}
+
+require_once SYSTEMPATH . 'Autoloader/Autoloader.php';
+require_once SYSTEMPATH . 'Config/BaseService.php';
+require_once SYSTEMPATH . 'Config/Services.php';
+require_once APPPATH . 'Config/Services.php';
+
+// Use Config\Services as CodeIgniter\Services
+if (! class_exists('CodeIgniter\Services', false))
+{
+	class_alias('Config\Services', 'CodeIgniter\Services');
+}
+
+// Initialize and register the loader with the SPL autoloader stack.
+Services::autoloader()->initialize(new Autoload(), new Modules())->register();
+
+// Now load Composer's if it's available
+if (is_file(COMPOSER_PATH))
+{
+	/*
+	 * The path to the vendor directory.
+	 *
+	 * We do not want to enforce this, so set the constant if Composer was used.
+	 */
+	if (! defined('VENDORPATH'))
+	{
+		define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
+	}
+
+	require_once COMPOSER_PATH;
+}
+
+// Load environment settings from .env files into $_SERVER and $_ENV
+require_once SYSTEMPATH . 'Config/DotEnv.php';
+
+$env = new DotEnv(ROOTPATH);
+$env->load();
+
+// Always load the URL helper, it should be used in most of apps.
+helper('url');
+
+/*
+ * ---------------------------------------------------------------
+ * GRAB OUR CODEIGNITER INSTANCE
+ * ---------------------------------------------------------------
+ *
+ * The CodeIgniter class contains the core functionality to make
+ * the application run, and does all of the dirty work to get
+ * the pieces all working together.
+ */
+
+$app = Services::codeigniter();
+$app->initialize();
+
+return $app;
diff --git a/system/index.html b/system/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/system/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/writable/.htaccess b/writable/.htaccess
new file mode 100644
index 0000000..f24db0a
--- /dev/null
+++ b/writable/.htaccess
@@ -0,0 +1,6 @@
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/writable/cache/index.html b/writable/cache/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/writable/cache/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/writable/logs/index.html b/writable/logs/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/writable/logs/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/writable/session/index.html b/writable/session/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/writable/session/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/writable/uploads/index.html b/writable/uploads/index.html
new file mode 100644
index 0000000..b702fbc
--- /dev/null
+++ b/writable/uploads/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>