diff --git a/.gitignore b/.gitignore
index 44d49db..57e9a47 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ user_guide_src/cilexer/pycilexer.egg-info/*
 /.env
 /themeforest
 /documents
+/writable
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c8d2783
--- /dev/null
+++ b/README.md
@@ -0,0 +1,166 @@
+# PHP Docker Template
+
+Template voor PHP projecten (CodeIgniter, plain PHP, etc.) met Xdebug support.
+
+## Snelle start
+
+### 1. Kopieer bestanden naar je project
+
+```bash
+cp -r docker/ /pad/naar/jouw-project/
+cp docker-compose.yml /pad/naar/jouw-project/
+cp .env.example /pad/naar/jouw-project/.env
+```
+
+### 2. Configureer je project
+
+Pas `.env` aan:
+```env
+PROJECT_NAME=jouwproject
+PROJECT_DOMAIN=jouwproject.test
+DB_DATABASE=jouwproject_db
+```
+
+### 3. Pas PHP versie aan (indien nodig)
+
+In `docker-compose.yml`, wijzig de PHP_VERSION:
+```yaml
+args:
+  PHP_VERSION: "8.2"  # Opties: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4
+```
+
+### 4. Pas document root aan (indien nodig)
+
+In `docker/nginx.conf`, wijzig root als je project geen `/public` map heeft:
+```nginx
+# Voor CodeIgniter 3:
+root /var/www/html;
+
+# Voor CodeIgniter 4 / Laravel-style:
+root /var/www/html/public;
+```
+
+### 5. DNS instellen
+
+Voeg toe aan `/etc/hosts`:
+```
+127.0.0.1 jouwproject.test
+```
+
+Of gebruik dnsmasq voor automatische .test domeinen.
+
+### 6. Database aanmaken
+
+```bash
+docker exec -it shared-mysql mysql -u root -proot -e "CREATE DATABASE jouwproject_db;"
+```
+
+### 7. Start het project
+
+```bash
+# Zorg dat shared services draaien
+cd /Volumes/development/sites/docker-shared
+docker compose up -d
+
+# Start je project
+cd /pad/naar/jouw-project
+docker compose up -d --build
+```
+
+Je project is nu beschikbaar op http://jouwproject.test
+
+---
+
+## Xdebug met PHPStorm
+
+### 1. PHPStorm configureren
+
+1. **Preferences → PHP → Servers**
+   - Klik op `+`
+   - Name: `jouwproject.test`
+   - Host: `jouwproject.test`
+   - Port: `80`
+   - Debugger: `Xdebug`
+   - ✅ Use path mappings
+   - Map `/pad/naar/jouw-project` → `/var/www/html`
+
+2. **Preferences → PHP → Debug**
+   - Debug port: `9003`
+   - ✅ Can accept external connections
+
+3. **Preferences → PHP → Debug → DBGp Proxy**
+   - IDE key: `PHPSTORM`
+
+### 2. Debugging starten
+
+1. Klik op de telefoon-icoon in PHPStorm: "Start Listening for PHP Debug Connections"
+2. Zet een breakpoint
+3. Open je pagina in de browser
+4. PHPStorm stopt automatisch bij je breakpoint
+
+---
+
+## Handige commando's
+
+```bash
+# Start containers
+docker compose up -d
+
+# Herbouw na Dockerfile wijzigingen
+docker compose up -d --build
+
+# Stop containers
+docker compose down
+
+# Bekijk logs
+docker compose logs -f
+
+# Shell in PHP container
+docker exec -it jouwproject-app bash
+
+# Composer commands
+docker exec -it jouwproject-app composer install
+docker exec -it jouwproject-app composer update
+
+# Artisan commands (als je Laravel-achtige CLI hebt)
+docker exec -it jouwproject-app php artisan migrate
+```
+
+---
+
+## Structuur
+
+```
+jouw-project/
+├── docker/
+│   ├── Dockerfile      # PHP container configuratie
+│   ├── nginx.conf      # Nginx configuratie  
+│   ├── php.ini         # PHP settings
+│   └── xdebug.ini      # Xdebug settings
+├── docker-compose.yml  # Container orchestratie
+├── .env                # Project variabelen
+└── ... je project bestanden
+```
+
+---
+
+## Troubleshooting
+
+### Container kan shared-mysql niet bereiken
+Controleer of shared services draaien:
+```bash
+docker ps | grep shared-mysql
+```
+
+### Xdebug werkt niet
+1. Check of xdebug actief is:
+   ```bash
+   docker exec -it jouwproject-app php -m | grep xdebug
+   ```
+2. Check PHPStorm luistert op poort 9003
+3. Controleer path mapping in PHPStorm
+
+### Permission denied errors
+```bash
+docker exec -it jouwproject-app chown -R www:www /var/www/html/storage
+```
diff --git a/app/Config/App.php b/app/Config/App.php
new file mode 100644
index 0000000..2e8e5b9
--- /dev/null
+++ b/app/Config/App.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class App extends BaseConfig
+{
+    /**
+     * Base Site URL
+     */
+    public string $baseURL = '';
+
+    /**
+     * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
+     *
+     * @var list<string>
+     */
+    public array $allowedHostnames = [];
+
+    /**
+     * Index File
+     */
+    public string $indexPage = '';
+
+    /**
+     * URI Protocol
+     */
+    public string $uriProtocol = 'REQUEST_URI';
+
+    /**
+     * Default Locale
+     */
+    public string $defaultLocale = 'nl';
+
+    /**
+     * Negotiate Locale
+     */
+    public bool $negotiateLocale = false;
+
+    /**
+     * Supported Locales
+     *
+     * @var list<string>
+     */
+    public array $supportedLocales = ['nl', 'en'];
+
+    /**
+     * Application Timezone
+     */
+    public string $appTimezone = 'Europe/Amsterdam';
+
+    /**
+     * Default Character Set
+     */
+    public string $charset = 'UTF-8';
+
+    /**
+     * Force Global Secure Requests
+     */
+    public bool $forceGlobalSecureRequests = false;
+
+    /**
+     * Reverse Proxy IPs
+     *
+     * @var array<string, string>
+     */
+    public array $proxyIPs = [];
+
+    /**
+     * Content Security Policy
+     */
+    public bool $CSPEnabled = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        // Set baseURL from environment
+        $this->baseURL = $_ENV['APP_URL'] ?? 'http://localhost';
+
+        // Force HTTPS in production
+        if (($_ENV['ENVIRONMENT'] ?? 'development') === 'production') {
+            $this->forceGlobalSecureRequests = true;
+        }
+    }
+}
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
new file mode 100644
index 0000000..1cb8d07
--- /dev/null
+++ b/app/Config/Autoload.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
+/**
+ * Autoload
+ *
+ * This file defines the namespaces and class maps so the Autoloader
+ * can find the files as needed.
+ */
+class Autoload extends AutoloadConfig
+{
+    /**
+     * PSR-4 style namespaces
+     *
+     * @var array<string, list<string>|string>
+     */
+    public $psr4 = [
+        APP_NAMESPACE => APPPATH,
+    ];
+
+    /**
+     * Class Maps
+     *
+     * @var array<string, string>
+     */
+    public $classmap = [];
+
+    /**
+     * Files to be autoloaded.
+     *
+     * @var list<string>
+     */
+    public $files = [];
+
+    /**
+     * Helpers to be autoloaded.
+     *
+     * @var list<string>
+     */
+    public $helpers = ['common'];
+}
diff --git a/app/Config/Boot.php b/app/Config/Boot.php
new file mode 100644
index 0000000..df6e723
--- /dev/null
+++ b/app/Config/Boot.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * CodeIgniter 4 Boot file
+ */
+
+use CodeIgniter\Boot;
+use Config\Paths;
+
+/*
+ * ---------------------------------------------------------------
+ * SETUP OUR PATH CONSTANTS
+ * ---------------------------------------------------------------
+ */
+
+// Ensure $paths is available
+if (! isset($paths)) {
+    $paths = new Paths();
+}
+
+// Define ROOTPATH
+defined('ROOTPATH') || define('ROOTPATH', realpath($paths->appDirectory . '/..') . DIRECTORY_SEPARATOR);
+
+// Path to the application directory
+defined('APPPATH') || define('APPPATH', realpath($paths->appDirectory) . DIRECTORY_SEPARATOR);
+
+// Path to the public directory
+defined('PUBLICPATH') || define('PUBLICPATH', realpath($paths->publicDirectory) . DIRECTORY_SEPARATOR);
+
+// Path to the writable directory
+defined('WRITEPATH') || define('WRITEPATH', realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
+
+// Path to the tests directory
+defined('TESTPATH') || define('TESTPATH', realpath($paths->testsDirectory) . DIRECTORY_SEPARATOR);
+
+/*
+ * ---------------------------------------------------------------
+ * GRAB THE CODEIGNITER BOOT CLASS
+ * ---------------------------------------------------------------
+ */
+
+require ROOTPATH . 'vendor/codeigniter4/framework/system/Boot.php';
+
+return Boot::bootWeb($paths);
diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
new file mode 100644
index 0000000..a868447
--- /dev/null
+++ b/app/Config/Boot/development.php
@@ -0,0 +1,34 @@
+<?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.
+ |
+ | If you set 'display_errors' to '1', CI4's detailed error report will show.
+ */
+error_reporting(E_ALL);
+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..1822cf5
--- /dev/null
+++ b/app/Config/Boot/production.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | Don't show ANY in production environments. Instead, let the system catch
+ | it and display a generic error message.
+ |
+ | If you set 'display_errors' to '1', CI4's detailed error report will show.
+ */
+error_reporting(E_ALL & ~E_DEPRECATED);
+// If you want to suppress more types of errors.
+// error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+ini_set('display_errors', '0');
+
+/*
+ |--------------------------------------------------------------------------
+ | 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..29536c8
--- /dev/null
+++ b/app/Config/Boot/testing.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In testing, we want to show as many errors as possible to help
+ | make sure they don't make it to production.
+ */
+error_reporting(E_ALL);
+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/CURLRequest.php b/app/Config/CURLRequest.php
new file mode 100644
index 0000000..5a3d4e9
--- /dev/null
+++ b/app/Config/CURLRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class CURLRequest extends BaseConfig
+{
+    /**
+     * --------------------------------------------------------------------------
+     * CURLRequest Share Options
+     * --------------------------------------------------------------------------
+     *
+     * Whether share options between requests or not.
+     *
+     * If true, all the options won't be reset between requests.
+     * It may cause an error request with unnecessary headers.
+     */
+    public bool $shareOptions = false;
+}
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
new file mode 100644
index 0000000..1169c95
--- /dev/null
+++ b/app/Config/Cache.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Cache\CacheInterface;
+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.
+     */
+    public string $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.
+     */
+    public string $backupHandler = 'dummy';
+
+    /**
+     * --------------------------------------------------------------------------
+     * 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.
+     */
+    public string $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.
+     */
+    public int $ttl = 60;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Reserved Characters
+     * --------------------------------------------------------------------------
+     *
+     * A string of reserved characters that will not be allowed in keys or tags.
+     * Strings that violate this restriction will cause handlers to throw.
+     * Default: {}()/\@:
+     *
+     * NOTE: The default set is required for PSR-6 compliance.
+     */
+    public string $reservedCharacters = '{}()/\@:';
+
+    /**
+     * --------------------------------------------------------------------------
+     * File settings
+     * --------------------------------------------------------------------------
+     *
+     * Your file storage preferences can be specified below, if you are using
+     * the File driver.
+     *
+     * @var array{storePath?: string, mode?: int}
+     */
+    public array $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{host?: string, port?: int, weight?: int, raw?: bool}
+     */
+    public array $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{host?: string, password?: string|null, port?: int, timeout?: int, database?: int}
+     */
+    public array $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, class-string<CacheInterface>>
+     */
+    public array $validHandlers = [
+        'dummy'     => DummyHandler::class,
+        'file'      => FileHandler::class,
+        'memcached' => MemcachedHandler::class,
+        'predis'    => PredisHandler::class,
+        'redis'     => RedisHandler::class,
+        'wincache'  => WincacheHandler::class,
+    ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Web Page Caching: 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.
+     *    ['q'] = Enabled, but only take into account the specified list
+     *            of query parameters.
+     *
+     * @var bool|list<string>
+     */
+    public $cacheQueryString = false;
+}
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
new file mode 100644
index 0000000..671f59b
--- /dev/null
+++ b/app/Config/Constants.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ | --------------------------------------------------------------------
+ | App Version
+ | --------------------------------------------------------------------
+ */
+defined('APP_VERSION') || define('APP_VERSION', '1.00.81');
+
+/*
+ | --------------------------------------------------------------------
+ | App Namespace
+ | --------------------------------------------------------------------
+ */
+defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');
+
+/*
+ | --------------------------------------------------------------------
+ | Composer Path
+ | --------------------------------------------------------------------
+ */
+defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . 'vendor/autoload.php');
+
+/*
+ |--------------------------------------------------------------------------
+ | Timing Constants
+ |--------------------------------------------------------------------------
+ */
+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', 2_592_000);
+defined('YEAR')   || define('YEAR', 31_536_000);
+defined('DECADE') || define('DECADE', 315_360_000);
+
+/*
+ | --------------------------------------------------------------------------
+ | Exit Status Codes
+ | --------------------------------------------------------------------------
+ */
+defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0);
+defined('EXIT_ERROR')          || define('EXIT_ERROR', 1);
+defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3);
+defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE', 4);
+defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS', 5);
+defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6);
+defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT', 7);
+defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8);
+defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9);
+defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
+ */
+define('EVENT_PRIORITY_LOW', 200);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_NORMAL instead.
+ */
+define('EVENT_PRIORITY_NORMAL', 100);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
+ */
+define('EVENT_PRIORITY_HIGH', 10);
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
new file mode 100644
index 0000000..2ac41a7
--- /dev/null
+++ b/app/Config/ContentSecurityPolicy.php
@@ -0,0 +1,176 @@
+<?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
+     */
+    public bool $reportOnly = false;
+
+    /**
+     * Specifies a URL where a browser will send reports
+     * when a content security policy is violated.
+     */
+    public ?string $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.
+     */
+    public bool $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 list<string>|string|null
+     */
+    public $defaultSrc;
+
+    /**
+     * Lists allowed scripts' URLs.
+     *
+     * @var list<string>|string
+     */
+    public $scriptSrc = 'self';
+
+    /**
+     * Lists allowed stylesheets' URLs.
+     *
+     * @var list<string>|string
+     */
+    public $styleSrc = 'self';
+
+    /**
+     * Defines the origins from which images can be loaded.
+     *
+     * @var list<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 list<string>|string|null
+     */
+    public $baseURI;
+
+    /**
+     * Lists the URLs for workers and embedded frame contents
+     *
+     * @var list<string>|string
+     */
+    public $childSrc = 'self';
+
+    /**
+     * Limits the origins that you can connect to (via XHR,
+     * WebSockets, and EventSource).
+     *
+     * @var list<string>|string
+     */
+    public $connectSrc = 'self';
+
+    /**
+     * Specifies the origins that can serve web fonts.
+     *
+     * @var list<string>|string
+     */
+    public $fontSrc;
+
+    /**
+     * Lists valid endpoints for submission from `<form>` tags.
+     *
+     * @var list<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 list<string>|string|null
+     */
+    public $frameAncestors;
+
+    /**
+     * The frame-src directive restricts the URLs which may
+     * be loaded into nested browsing contexts.
+     *
+     * @var list<string>|string|null
+     */
+    public $frameSrc;
+
+    /**
+     * Restricts the origins allowed to deliver video and audio.
+     *
+     * @var list<string>|string|null
+     */
+    public $mediaSrc;
+
+    /**
+     * Allows control over Flash and other plugins.
+     *
+     * @var list<string>|string
+     */
+    public $objectSrc = 'self';
+
+    /**
+     * @var list<string>|string|null
+     */
+    public $manifestSrc;
+
+    /**
+     * Limits the kinds of plugins a page may invoke.
+     *
+     * @var list<string>|string|null
+     */
+    public $pluginTypes;
+
+    /**
+     * List of actions allowed.
+     *
+     * @var list<string>|string|null
+     */
+    public $sandbox;
+
+    /**
+     * Nonce tag for style
+     */
+    public string $styleNonceTag = '{csp-style-nonce}';
+
+    /**
+     * Nonce tag for script
+     */
+    public string $scriptNonceTag = '{csp-script-nonce}';
+
+    /**
+     * Replace nonce tag automatically
+     */
+    public bool $autoNonce = true;
+}
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
new file mode 100644
index 0000000..3bad184
--- /dev/null
+++ b/app/Config/Cookie.php
@@ -0,0 +1,107 @@
+<?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.
+     */
+    public string $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|int|string
+     */
+    public $expires = 0;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Path
+     * --------------------------------------------------------------------------
+     *
+     * Typically will be a forward slash.
+     */
+    public string $path = '/';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Domain
+     * --------------------------------------------------------------------------
+     *
+     * Set to `.your-domain.com` for site-wide cookies.
+     */
+    public string $domain = '';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Secure
+     * --------------------------------------------------------------------------
+     *
+     * Cookie will only be set if a secure HTTPS connection exists.
+     */
+    public bool $secure = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie HTTPOnly
+     * --------------------------------------------------------------------------
+     *
+     * Cookie will only be accessible via HTTP(S) (no JavaScript).
+     */
+    public bool $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 ''|'Lax'|'None'|'Strict'
+     */
+    public string $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.
+     *
+     * @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 bool $raw = false;
+}
diff --git a/app/Config/Database.php b/app/Config/Database.php
new file mode 100644
index 0000000..ca42414
--- /dev/null
+++ b/app/Config/Database.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Database\Config;
+
+class Database extends Config
+{
+    /**
+     * Default database group.
+     */
+    public string $defaultGroup = 'default';
+
+    /**
+     * Default database connection values
+     */
+    public array $default = [
+        'DSN'          => '',
+        'hostname'     => '',
+        'username'     => '',
+        'password'     => '',
+        'database'     => '',
+        'DBDriver'     => 'MySQLi',
+        'DBPrefix'     => '',
+        'pConnect'     => false,
+        'DBDebug'      => true,
+        'charset'      => 'utf8mb4',
+        'DBCollat'     => 'utf8mb4_unicode_ci',
+        'swapPre'      => '',
+        'encrypt'      => false,
+        'compress'     => false,
+        'strictOn'     => false,
+        'failover'     => [],
+        'port'         => 3306,
+        'numberNative' => false,
+    ];
+
+    /**
+     * Test database connection values (for PHPUnit)
+     */
+    public array $tests = [
+        'DSN'          => '',
+        'hostname'     => '127.0.0.1',
+        'username'     => '',
+        'password'     => '',
+        'database'     => ':memory:',
+        'DBDriver'     => 'SQLite3',
+        'DBPrefix'     => 'db_',
+        'pConnect'     => false,
+        'DBDebug'      => true,
+        'charset'      => 'utf8',
+        'DBCollat'     => '',
+        'swapPre'      => '',
+        'encrypt'      => false,
+        'compress'     => false,
+        'strictOn'     => false,
+        'failover'     => [],
+        'port'         => 3306,
+        'numberNative' => false,
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        // Load from environment variables
+        $this->default['hostname'] = $_ENV['DB_HOST'] ?? '127.0.0.1';
+        $this->default['username'] = $_ENV['DB_USER'] ?? '';
+        $this->default['password'] = $_ENV['DB_PASS'] ?? '';
+        $this->default['database'] = $_ENV['DB_NAME'] ?? '';
+
+        // Debug mode based on environment
+        $this->default['DBDebug'] = ($_ENV['ENVIRONMENT'] ?? 'development') !== 'production';
+    }
+}
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
new file mode 100644
index 0000000..788d68f
--- /dev/null
+++ b/app/Config/DocTypes.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Config;
+
+class DocTypes
+{
+    /**
+     * List of valid document types.
+     *
+     * @var array<string, string>
+     */
+    public array $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">',
+    ];
+
+    /**
+     * Whether to remove the solidus (`/`) character for void HTML elements (e.g. `<input>`)
+     * for HTML5 compatibility.
+     *
+     * Set to:
+     *    `true` - to be HTML5 compatible
+     *    `false` - to be XHTML compatible
+     */
+    public bool $html5 = true;
+}
diff --git a/app/Config/Email.php b/app/Config/Email.php
new file mode 100644
index 0000000..adad729
--- /dev/null
+++ b/app/Config/Email.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Email extends BaseConfig
+{
+    public string $fromEmail  = '';
+    public string $fromName   = '';
+    public string $recipients = '';
+
+    /**
+     * The "user agent"
+     */
+    public string $userAgent = 'CodeIgniter';
+
+    /**
+     * The mail sending protocol: mail, sendmail, smtp
+     */
+    public string $protocol = 'smtp';
+
+    /**
+     * The server path to Sendmail.
+     */
+    public string $mailPath = '/usr/sbin/sendmail';
+
+    /**
+     * SMTP Server Hostname
+     */
+    public string $SMTPHost = '';
+
+    /**
+     * SMTP Username
+     */
+    public string $SMTPUser = '';
+
+    /**
+     * SMTP Password
+     */
+    public string $SMTPPass = '';
+
+    /**
+     * SMTP Port
+     */
+    public int $SMTPPort = 25;
+
+    /**
+     * SMTP Timeout (in seconds)
+     */
+    public int $SMTPTimeout = 5;
+
+    /**
+     * Enable persistent SMTP connections
+     */
+    public bool $SMTPKeepAlive = false;
+
+    /**
+     * SMTP Encryption.
+     *
+     * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+     *             to the server. 'ssl' means implicit SSL. Connection on port
+     *             465 should set this to ''.
+     */
+    public string $SMTPCrypto = 'tls';
+
+    /**
+     * Enable word-wrap
+     */
+    public bool $wordWrap = true;
+
+    /**
+     * Character count to wrap at
+     */
+    public int $wrapChars = 76;
+
+    /**
+     * Type of mail, either 'text' or 'html'
+     */
+    public string $mailType = 'html';
+
+    /**
+     * Character set (utf-8, iso-8859-1, etc.)
+     */
+    public string $charset = 'UTF-8';
+
+    /**
+     * Whether to validate the email address
+     */
+    public bool $validate = false;
+
+    /**
+     * Email Priority. 1 = highest. 5 = lowest. 3 = normal
+     */
+    public int $priority = 3;
+
+    /**
+     * Newline character. (Use "\r\n" to comply with RFC 822)
+     */
+    public string $CRLF = "\r\n";
+
+    /**
+     * Newline character. (Use "\r\n" to comply with RFC 822)
+     */
+    public string $newline = "\r\n";
+
+    /**
+     * Enable BCC Batch Mode.
+     */
+    public bool $BCCBatchMode = false;
+
+    /**
+     * Number of emails in each BCC batch
+     */
+    public int $BCCBatchSize = 200;
+
+    /**
+     * Enable notify message from server
+     */
+    public bool $DSN = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        // Load from environment
+        $this->SMTPHost = str_replace(',', '', $_ENV['SMTP_HOST'] ?? '');
+        $this->SMTPUser = str_replace(',', '', $_ENV['SMTP_USER'] ?? '');
+        $this->SMTPPass = str_replace(',', '', $_ENV['SMTP_PASS'] ?? '');
+        $this->SMTPPort = (int) str_replace(',', '', $_ENV['SMTP_PORT'] ?? '587');
+    }
+}
diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
new file mode 100644
index 0000000..2834413
--- /dev/null
+++ b/app/Config/Encryption.php
@@ -0,0 +1,92 @@
+<?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.
+     */
+    public string $key = '';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Encryption Driver to Use
+     * --------------------------------------------------------------------------
+     *
+     * One of the supported encryption drivers.
+     *
+     * Available drivers:
+     * - OpenSSL
+     * - Sodium
+     */
+    public string $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.
+     */
+    public int $blockSize = 16;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Encryption digest
+     * --------------------------------------------------------------------------
+     *
+     * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
+     */
+    public string $digest = 'SHA512';
+
+    /**
+     * Whether the cipher-text should be raw. If set to false, then it will be base64 encoded.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to false for CI3 Encryption compatibility.
+     */
+    public bool $rawData = true;
+
+    /**
+     * Encryption key info.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to 'encryption' for CI3 Encryption compatibility.
+     */
+    public string $encryptKeyInfo = '';
+
+    /**
+     * Authentication key info.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to 'authentication' for CI3 Encryption compatibility.
+     */
+    public string $authKeyInfo = '';
+
+    /**
+     * Cipher to use.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to 'AES-128-CBC' to decrypt encrypted data that encrypted
+     * by CI3 Encryption default configuration.
+     */
+    public string $cipher = 'AES-256-CTR';
+}
diff --git a/app/Config/Events.php b/app/Config/Events.php
new file mode 100644
index 0000000..98555e8
--- /dev/null
+++ b/app/Config/Events.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+/*
+ * --------------------------------------------------------------------
+ * Application Events
+ * --------------------------------------------------------------------
+ */
+
+Events::on('pre_system', static function () {
+    // Boot Eloquent ORM
+    bootEloquent();
+});
+
+/**
+ * Bootstrap Eloquent ORM with database configuration from environment
+ */
+function bootEloquent(): void
+{
+    $capsule = new Capsule();
+
+    $capsule->addConnection([
+        'driver'    => 'mysql',
+        'host'      => $_ENV['DB_HOST'] ?? '127.0.0.1',
+        'database'  => $_ENV['DB_NAME'] ?? '',
+        'username'  => $_ENV['DB_USER'] ?? '',
+        'password'  => $_ENV['DB_PASS'] ?? '',
+        'charset'   => 'utf8mb4',
+        'collation' => 'utf8mb4_unicode_ci',
+        'prefix'    => '',
+    ]);
+
+    // Make this Capsule instance available globally via static methods
+    $capsule->setAsGlobal();
+
+    // Setup the Eloquent ORM
+    $capsule->bootEloquent();
+}
diff --git a/app/Config/Exceptions.php b/app/Config/Exceptions.php
new file mode 100644
index 0000000..f61a13d
--- /dev/null
+++ b/app/Config/Exceptions.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Debug\ExceptionHandler;
+use CodeIgniter\Debug\ExceptionHandlerInterface;
+use Psr\Log\LogLevel;
+use Throwable;
+
+class Exceptions extends BaseConfig
+{
+    /**
+     * Log Exceptions?
+     */
+    public bool $log = true;
+
+    /**
+     * DO NOT log These Exceptions.
+     *
+     * @var list<class-string<Throwable>>
+     */
+    public array $ignoreCodes = [404];
+
+    /**
+     * Error Views Path
+     */
+    public string $errorViewPath = APPPATH . 'Views/errors';
+
+    /**
+     * Hide Error Messages?
+     */
+    public bool $hideErrors = false;
+
+    /**
+     * Custom Exception Handler for AJAX requests
+     *
+     * @var class-string<ExceptionHandlerInterface>|null
+     */
+    public ?string $handler = null;
+
+    /**
+     * Sensitive Data in Trace
+     *
+     * @var list<string>
+     */
+    public array $sensitiveDataInTraceStep = [
+        'password',
+        'pass',
+        'salt'
+    ];
+
+    /**
+     * Sensitive Data in Trace (for deprecated property)
+     *
+     * @var list<string>
+     */
+    public array $sensitiveDataInTrace = [
+        'password',
+        'pass',
+        'salt'
+    ];
+
+    /**
+     * Whether to log deprecation warnings.
+     */
+    public bool $logDeprecations = true;
+
+    /**
+     * The log level for deprecation warnings.
+     */
+    public string $deprecationLogLevel = LogLevel::WARNING;
+
+    public function handler(int $statusCode, Throwable $exception): ExceptionHandlerInterface
+    {
+        return new ExceptionHandler($this);
+    }
+}
diff --git a/app/Config/Feature.php b/app/Config/Feature.php
new file mode 100644
index 0000000..ec1435a
--- /dev/null
+++ b/app/Config/Feature.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Enable/disable backward compatibility breaking features.
+ */
+class Feature extends BaseConfig
+{
+    /**
+     * Use improved new auto routing instead of the legacy version.
+     */
+    public bool $autoRoutesImproved = true;
+
+    /**
+     * Use filter execution order in 4.4 or before.
+     */
+    public bool $oldFilterOrder = false;
+
+    /**
+     * The behavior of `limit(0)` in Query Builder.
+     *
+     * If true, `limit(0)` returns all records. (the behavior of 4.4.x or before in version 4.x.)
+     * If false, `limit(0)` returns no records. (the behavior of 3.1.9 or later in version 3.x.)
+     */
+    public bool $limitZeroAsAll = true;
+
+    /**
+     * Use strict location negotiation.
+     *
+     * By default, the locale is selected based on a loose comparison of the language code (ISO 639-1)
+     * Enabling strict comparison will also consider the region code (ISO 3166-1 alpha-2).
+     */
+    public bool $strictLocaleNegotiation = false;
+}
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
new file mode 100644
index 0000000..9b1bc90
--- /dev/null
+++ b/app/Config/Filters.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\Filters as BaseFilters;
+use CodeIgniter\Filters\Cors;
+use CodeIgniter\Filters\CSRF;
+use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Filters\ForceHTTPS;
+use CodeIgniter\Filters\Honeypot;
+use CodeIgniter\Filters\InvalidChars;
+use CodeIgniter\Filters\PageCache;
+use CodeIgniter\Filters\PerformanceMetrics;
+use CodeIgniter\Filters\SecureHeaders;
+
+class Filters extends BaseFilters
+{
+    /**
+     * Configures aliases for Filter classes to
+     * make reading things nicer and simpler.
+     *
+     * @var array<string, class-string|list<class-string>>
+     */
+    public array $aliases = [
+        'csrf'          => CSRF::class,
+        'toolbar'       => DebugToolbar::class,
+        'honeypot'      => Honeypot::class,
+        'invalidchars'  => InvalidChars::class,
+        'secureheaders' => SecureHeaders::class,
+        'cors'          => Cors::class,
+        'forcehttps'    => ForceHTTPS::class,
+        'pagecache'     => PageCache::class,
+        'performance'   => PerformanceMetrics::class,
+        'auth'          => \App\Filters\AuthFilter::class,
+    ];
+
+    /**
+     * List of special required filters.
+     *
+     * @var array{before: list<string>, after: list<string>}
+     */
+    public array $required = [
+        'before' => [
+            'forcehttps',
+            'pagecache',
+        ],
+        'after' => [
+            'pagecache',
+            'performance',
+            'toolbar',
+        ],
+    ];
+
+    /**
+     * List of filter aliases that are always
+     * applied before and after every request.
+     *
+     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
+     */
+    public array $globals = [
+        'before' => [
+            // 'honeypot',
+            // 'csrf',
+            // 'invalidchars',
+        ],
+        'after' => [
+            // 'honeypot',
+            // 'secureheaders',
+        ],
+    ];
+
+    /**
+     * List of filter aliases that works on a
+     * particular HTTP method (GET, POST, etc.).
+     *
+     * @var array<string, list<string>>
+     */
+    public array $methods = [];
+
+    /**
+     * List of filter aliases that should run on any
+     * before or after URI patterns.
+     *
+     * @var array<string, array<string, list<string>>>
+     */
+    public array $filters = [];
+}
diff --git a/app/Config/ForeignCharacters.php b/app/Config/ForeignCharacters.php
new file mode 100644
index 0000000..f1a9572
--- /dev/null
+++ b/app/Config/ForeignCharacters.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
+
+/**
+ * @immutable
+ */
+class ForeignCharacters extends BaseForeignCharacters
+{
+}
diff --git a/app/Config/Format.php b/app/Config/Format.php
new file mode 100644
index 0000000..0d334d7
--- /dev/null
+++ b/app/Config/Format.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Format\JSONFormatter;
+use CodeIgniter\Format\XMLFormatter;
+
+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 list<string>
+     */
+    public array $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 array $formatters = [
+        'application/json' => JSONFormatter::class,
+        'application/xml'  => XMLFormatter::class,
+        'text/xml'         => XMLFormatter::class,
+    ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * 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 array $formatterOptions = [
+        'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+        'application/xml'  => 0,
+        'text/xml'         => 0,
+    ];
+}
diff --git a/app/Config/Generators.php b/app/Config/Generators.php
new file mode 100644
index 0000000..cc92c7a
--- /dev/null
+++ b/app/Config/Generators.php
@@ -0,0 +1,44 @@
+<?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, array<string, string>|string>
+     */
+    public array $views = [
+        'make:cell' => [
+            'class' => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
+            'view'  => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
+        ],
+        'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
+        'make:config'       => 'CodeIgniter\Commands\Generators\Views\config.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..67ebcb0
--- /dev/null
+++ b/app/Config/Honeypot.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Honeypot extends BaseConfig
+{
+    /**
+     * Makes Honeypot visible or not to human
+     */
+    public bool $hidden = true;
+
+    /**
+     * Honeypot Label Content
+     */
+    public string $label = 'Fill This Field';
+
+    /**
+     * Honeypot Field Name
+     */
+    public string $name = 'honeypot';
+
+    /**
+     * Honeypot HTML Template
+     */
+    public string $template = '<label>{label}</label><input type="text" name="{name}" value="">';
+
+    /**
+     * Honeypot container
+     *
+     * If you enabled CSP, you can remove `style="display:none"`.
+     */
+    public string $container = '<div style="display:none">{template}</div>';
+
+    /**
+     * The id attribute for Honeypot container tag
+     *
+     * Used when CSP is enabled.
+     */
+    public string $containerId = 'hpc';
+}
diff --git a/app/Config/Images.php b/app/Config/Images.php
new file mode 100644
index 0000000..a33ddad
--- /dev/null
+++ b/app/Config/Images.php
@@ -0,0 +1,31 @@
+<?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.
+     */
+    public string $defaultHandler = 'gd';
+
+    /**
+     * The path to the image library.
+     * Required for ImageMagick, GraphicsMagick, or NetPBM.
+     */
+    public string $libraryPath = '/usr/local/bin/convert';
+
+    /**
+     * The available handler classes.
+     *
+     * @var array<string, string>
+     */
+    public array $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..931ad47
--- /dev/null
+++ b/app/Config/Kint.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Config;
+
+use Kint\Parser\ConstructablePluginInterface;
+use Kint\Renderer\Rich\TabPluginInterface;
+use Kint\Renderer\Rich\ValuePluginInterface;
+
+/**
+ * --------------------------------------------------------------------------
+ * 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
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Global Settings
+    |--------------------------------------------------------------------------
+    */
+
+    /**
+     * @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>|null
+     */
+    public $plugins;
+
+    public int $maxDepth           = 6;
+    public bool $displayCalledFrom = true;
+    public bool $expanded          = false;
+
+    /*
+    |--------------------------------------------------------------------------
+    | RichRenderer Settings
+    |--------------------------------------------------------------------------
+    */
+    public string $richTheme = 'aante-light.css';
+    public bool $richFolder  = false;
+
+    /**
+     * @var array<string, class-string<ValuePluginInterface>>|null
+     */
+    public $richObjectPlugins;
+
+    /**
+     * @var array<string, class-string<TabPluginInterface>>|null
+     */
+    public $richTabPlugins;
+
+    /*
+    |--------------------------------------------------------------------------
+    | CLI Settings
+    |--------------------------------------------------------------------------
+    */
+    public bool $cliColors      = true;
+    public bool $cliForceUTF8   = false;
+    public bool $cliDetectWidth = true;
+    public int $cliMinWidth     = 40;
+}
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
new file mode 100644
index 0000000..1792e24
--- /dev/null
+++ b/app/Config/Logger.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Log\Handlers\FileHandler;
+
+class Logger extends BaseConfig
+{
+    /**
+     * Error Logging Threshold
+     *
+     * @var int|list<int>
+     */
+    public $threshold = 4;
+
+    /**
+     * Date Format for Logs
+     */
+    public string $dateFormat = 'Y-m-d H:i:s';
+
+    /**
+     * Handlers
+     *
+     * @var array<class-string, array<string, int|list<string>|string>>
+     */
+    public array $handlers = [
+        FileHandler::class => [
+            'handles'         => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+            'fileExtension'   => '',
+            'filePermissions' => 0644,
+            'path'            => '',
+        ],
+    ];
+}
diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php
new file mode 100644
index 0000000..1dec8b9
--- /dev/null
+++ b/app/Config/Migrations.php
@@ -0,0 +1,50 @@
+<?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.
+     */
+    public bool $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
+     * files have already been run.
+     */
+    public string $table = 'migrations';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Timestamp Format
+     * --------------------------------------------------------------------------
+     *
+     * This is the format that will be used when creating new migrations
+     * using the CLI command:
+     *   > php spark make:migration
+     *
+     * NOTE: if you set an unsupported format, migration runner will not find
+     *       your migration files.
+     *
+     * Supported formats:
+     * - YmdHis_
+     * - Y-m-d-His_
+     * - Y_m_d_His_
+     */
+    public string $timestampFormat = 'Y-m-d-His_';
+}
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
new file mode 100644
index 0000000..c2db734
--- /dev/null
+++ b/app/Config/Mimes.php
@@ -0,0 +1,534 @@
+<?php
+
+namespace Config;
+
+/**
+ * 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<string, list<string>|string>
+     */
+    public static array $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/vnd.microsoft.portable-executable',
+            'application/x-dosexec',
+            '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',
+        ],
+        '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',
+        ],
+        'webp' => 'image/webp',
+        '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',
+            'model/stl',
+            'application/octet-stream',
+        ],
+    ];
+
+    /**
+     * Attempts to determine the best mime type for the given file 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|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 !== ''
+            && array_key_exists($proposedExtension, static::$mimes)
+            && in_array($type, (array) static::$mimes[$proposedExtension], true)
+        ) {
+            // The detected mime type matches with the proposed extension.
+            return $proposedExtension;
+        }
+
+        // Reverse check the mime type list if no extension was proposed.
+        // This search is order sensitive!
+        foreach (static::$mimes as $ext => $types) {
+            if (in_array($type, (array) $types, true)) {
+                return $ext;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
new file mode 100644
index 0000000..9e82103
--- /dev/null
+++ b/app/Config/Modules.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Modules\Modules as BaseModules;
+
+/**
+ * Modules Configuration
+ */
+class Modules extends BaseModules
+{
+    /**
+     * Should the application auto-discover resources
+     * within the modules.
+     */
+    public $enabled = true;
+
+    /**
+     * Should Composer packages be auto-discovered?
+     */
+    public $discoverInComposer = true;
+
+    /**
+     * The Composer packages to auto-discover.
+     *
+     * @var list<string>
+     */
+    public $composerPackages = [];
+
+    /**
+     * Aliases
+     *
+     * @var array<string, string|null>
+     */
+    public $aliases = [];
+}
diff --git a/app/Config/Optimize.php b/app/Config/Optimize.php
new file mode 100644
index 0000000..481e645
--- /dev/null
+++ b/app/Config/Optimize.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Config;
+
+/**
+ * Optimization Configuration.
+ *
+ * NOTE: This class does not extend BaseConfig for performance reasons.
+ *       So you cannot replace the property values with Environment Variables.
+ */
+class Optimize
+{
+    /**
+     * --------------------------------------------------------------------------
+     * Config Caching
+     * --------------------------------------------------------------------------
+     *
+     * @see https://codeigniter.com/user_guide/concepts/factories.html#config-caching
+     */
+    public bool $configCacheEnabled = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Config Caching
+     * --------------------------------------------------------------------------
+     *
+     * @see https://codeigniter.com/user_guide/concepts/autoloader.html#file-locator-caching
+     */
+    public bool $locatorCacheEnabled = false;
+}
diff --git a/app/Config/Pager.php b/app/Config/Pager.php
new file mode 100644
index 0000000..e341f4d
--- /dev/null
+++ b/app/Config/Pager.php
@@ -0,0 +1,37 @@
+<?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 array $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.
+     */
+    public int $perPage = 20;
+}
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
new file mode 100644
index 0000000..2a6c1d6
--- /dev/null
+++ b/app/Config/Paths.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Config;
+
+/**
+ * Paths
+ *
+ * Holds the paths that are used by the system to
+ * locate the main directories. These may be
+ * modified to more easily work within different
+ * environments.
+ */
+class Paths
+{
+    /**
+     * The path to the application directory.
+     */
+    public string $appDirectory = __DIR__ . '/..';
+
+    /**
+     * The path to the system directory.
+     */
+    public string $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
+
+    /**
+     * The path to the public directory.
+     * This is where the front controller (index.php) is.
+     */
+    public string $publicDirectory = __DIR__ . '/../../public';
+
+    /**
+     * The path to the writable directory.
+     */
+    public string $writableDirectory = __DIR__ . '/../../writable';
+
+    /**
+     * The path to the tests directory
+     */
+    public string $testsDirectory = __DIR__ . '/../../tests';
+
+    /**
+     * The path to the views directory,
+     * must have a trailing slash.
+     */
+    public string $viewDirectory = __DIR__ . '/../Views/';
+}
diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
new file mode 100644
index 0000000..bf03be1
--- /dev/null
+++ b/app/Config/Publisher.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\Publisher as BasePublisher;
+
+/**
+ * Publisher Configuration
+ *
+ * Defines basic security restrictions for the Publisher class
+ * to prevent abuse by injecting malicious files into a project.
+ */
+class Publisher extends BasePublisher
+{
+    /**
+     * A list of allowed destinations with a (pseudo-)regex
+     * of allowed files for each destination.
+     * Attempts to publish to directories not in this list will
+     * result in a PublisherException. Files that do no fit the
+     * pattern will cause copy/merge to fail.
+     *
+     * @var array<string, string>
+     */
+    public $restrictions = [
+        ROOTPATH => '*',
+        FCPATH   => '#\.(s?css|js|map|html?|xml|json|webmanifest|ttf|eot|woff2?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+    ];
+}
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
new file mode 100644
index 0000000..2e2eaeb
--- /dev/null
+++ b/app/Config/Routes.php
@@ -0,0 +1,195 @@
+<?php
+
+use CodeIgniter\Router\RouteCollection;
+
+/**
+ * @var RouteCollection $routes
+ */
+
+// Default controller
+$routes->setDefaultController('Main');
+$routes->setDefaultMethod('index');
+$routes->setTranslateURIDashes(false);
+$routes->set404Override();
+$routes->setAutoRoute(true);
+
+// Main routes
+$routes->get('/', 'Main::index');
+
+// Login routes
+$routes->match(['get', 'post'], 'login', 'Login::index');
+$routes->get('login/logout', 'Login::logout');
+$routes->get('login/showVerify2fa', 'Login::showVerify2fa');
+$routes->post('login/verify2fa', 'Login::verify2fa');
+$routes->post('login/resendOtp', 'Login::resendOtp');
+$routes->post('login/changeWeakPassword', 'Login::changeWeakPassword');
+$routes->post('login/requestPassword', 'Login::requestPassword');
+
+// Menu
+$routes->get('menu', 'Menu::index');
+$routes->get('menu/(:any)', 'Menu::$1');
+
+// Beheer (Management) routes
+$routes->group('beheer', static function ($routes) {
+    // Users (support both old CI3 URLs and new URLs)
+    $routes->get('users', 'Beheer\UsersController::index');
+    $routes->get('users/(:any)', 'Beheer\UsersController::$1');
+    $routes->post('users/(:any)', 'Beheer\UsersController::$1');
+    $routes->get('usersController/(:any)', 'Beheer\UsersController::$1');
+    $routes->post('usersController/(:any)', 'Beheer\UsersController::$1');
+
+    // Customers (support both old CI3 URLs and new URLs)
+    $routes->get('customers', 'Beheer\CustomersController::index');
+    $routes->get('customers/(:any)', 'Beheer\CustomersController::$1');
+    $routes->post('customers/(:any)', 'Beheer\CustomersController::$1');
+    $routes->get('customersController/(:any)', 'Beheer\CustomersController::$1');
+    $routes->post('customersController/(:any)', 'Beheer\CustomersController::$1');
+
+    // Externals (support both old CI3 URLs and new URLs)
+    $routes->get('externals', 'Beheer\ExternalsController::index');
+    $routes->get('externals/(:any)', 'Beheer\ExternalsController::$1');
+    $routes->post('externals/(:any)', 'Beheer\ExternalsController::$1');
+    $routes->get('externalsController/(:any)', 'Beheer\ExternalsController::$1');
+    $routes->post('externalsController/(:any)', 'Beheer\ExternalsController::$1');
+
+    // Roles (support both old CI3 URLs and new URLs)
+    $routes->get('roles', 'Beheer\RolesController::index');
+    $routes->get('roles/(:any)', 'Beheer\RolesController::$1');
+    $routes->post('roles/(:any)', 'Beheer\RolesController::$1');
+    $routes->get('rolesController/(:any)', 'Beheer\RolesController::$1');
+    $routes->post('rolesController/(:any)', 'Beheer\RolesController::$1');
+
+    // Authorisation
+    $routes->get('authorisation', 'Beheer\AuthorisationController::index');
+    $routes->get('authorisation/(:any)', 'Beheer\AuthorisationController::$1');
+    $routes->post('authorisation/(:any)', 'Beheer\AuthorisationController::$1');
+    $routes->get('authorisationController/(:any)', 'Beheer\AuthorisationController::$1');
+    $routes->post('authorisationController/(:any)', 'Beheer\AuthorisationController::$1');
+    $routes->get('AuthorisationController/(:any)', 'Beheer\AuthorisationController::$1');
+    $routes->post('AuthorisationController/(:any)', 'Beheer\AuthorisationController::$1');
+
+    // Two Factor
+    $routes->get('twofactor', 'Beheer\TwoFactorController::index');
+    $routes->get('twofactor/(:any)', 'Beheer\TwoFactorController::$1');
+    $routes->post('twofactor/(:any)', 'Beheer\TwoFactorController::$1');
+    $routes->get('twofactorController/(:any)', 'Beheer\TwoFactorController::$1');
+    $routes->post('twofactorController/(:any)', 'Beheer\TwoFactorController::$1');
+
+    // Employee Target
+    $routes->get('employeetarget', 'Beheer\EmployeeTargetController::index');
+    $routes->get('employeetarget/(:any)', 'Beheer\EmployeeTargetController::$1');
+    $routes->post('employeetarget/(:any)', 'Beheer\EmployeeTargetController::$1');
+    $routes->get('employeetargetController/(:any)', 'Beheer\EmployeeTargetController::$1');
+    $routes->post('employeetargetController/(:any)', 'Beheer\EmployeeTargetController::$1');
+
+    // VAT
+    $routes->get('vat', 'Beheer\VatController::index');
+    $routes->get('vat/(:any)', 'Beheer\VatController::$1');
+    $routes->post('vat/(:any)', 'Beheer\VatController::$1');
+    $routes->get('vatController/(:any)', 'Beheer\VatController::$1');
+    $routes->post('vatController/(:any)', 'Beheer\VatController::$1');
+});
+
+// Projects routes - support both old CI3 URLs (projects/offersController/...) and new URLs
+$routes->group('projects', static function ($routes) {
+    $routes->get('/', 'Projects\ProjectsController::index');
+    // Legacy CI3 routes with Controller suffix
+    $routes->get('projectsController/(:any)', 'Projects\ProjectsController::$1');
+    $routes->post('projectsController/(:any)', 'Projects\ProjectsController::$1');
+    $routes->get('offersController/(:any)', 'Projects\OffersController::$1');
+    $routes->post('offersController/(:any)', 'Projects\OffersController::$1');
+    $routes->get('commentsController/(:any)', 'Projects\CommentsController::$1');
+    $routes->post('commentsController/(:any)', 'Projects\CommentsController::$1');
+    $routes->get('documentsController/(:any)', 'Projects\DocumentsController::$1');
+    $routes->post('documentsController/(:any)', 'Projects\DocumentsController::$1');
+    $routes->get('employeehoursController/(:any)', 'Projects\EmployeeHoursController::$1');
+    $routes->post('employeehoursController/(:any)', 'Projects\EmployeeHoursController::$1');
+    $routes->get('employeeHoursController/(:any)', 'Projects\EmployeeHoursController::$1');
+    $routes->post('employeeHoursController/(:any)', 'Projects\EmployeeHoursController::$1');
+    // New style routes
+    $routes->get('(:any)', 'Projects\ProjectsController::$1');
+    $routes->post('(:any)', 'Projects\ProjectsController::$1');
+});
+
+// Employee Hours
+$routes->group('employeehours', static function ($routes) {
+    $routes->get('/', 'Projects\EmployeeHoursController::index');
+    $routes->get('employeehoursController/(:any)', 'Projects\EmployeeHoursController::$1');
+    $routes->post('employeehoursController/(:any)', 'Projects\EmployeeHoursController::$1');
+    $routes->get('(:any)', 'Projects\EmployeeHoursController::$1');
+    $routes->post('(:any)', 'Projects\EmployeeHoursController::$1');
+});
+
+// Offers
+$routes->group('offers', static function ($routes) {
+    $routes->get('/', 'Projects\OffersController::index');
+    $routes->get('offersController/(:any)', 'Projects\OffersController::$1');
+    $routes->post('offersController/(:any)', 'Projects\OffersController::$1');
+    $routes->get('(:any)', 'Projects\OffersController::$1');
+    $routes->post('(:any)', 'Projects\OffersController::$1');
+});
+
+// Comments
+$routes->group('comments', static function ($routes) {
+    $routes->get('/', 'Projects\CommentsController::index');
+    $routes->get('commentsController/(:any)', 'Projects\CommentsController::$1');
+    $routes->post('commentsController/(:any)', 'Projects\CommentsController::$1');
+    $routes->get('(:any)', 'Projects\CommentsController::$1');
+    $routes->post('(:any)', 'Projects\CommentsController::$1');
+});
+
+// Documents
+$routes->group('documents', static function ($routes) {
+    $routes->get('/', 'Projects\DocumentsController::index');
+    $routes->get('documentsController/(:any)', 'Projects\DocumentsController::$1');
+    $routes->post('documentsController/(:any)', 'Projects\DocumentsController::$1');
+    $routes->get('(:any)', 'Projects\DocumentsController::$1');
+    $routes->post('(:any)', 'Projects\DocumentsController::$1');
+});
+
+// Reports routes
+$routes->group('reports', static function ($routes) {
+    $routes->get('/', 'Reports\ReportsController::index');
+    $routes->get('reportsController/(:any)', 'Reports\ReportsController::$1');
+    $routes->post('reportsController/(:any)', 'Reports\ReportsController::$1');
+    // Reservations controller accessible under reports/
+    $routes->get('reservationsController/(:any)', 'Reports\ReservationsController::$1');
+    $routes->post('reservationsController/(:any)', 'Reports\ReservationsController::$1');
+    // Reportsdefault controller accessible under reports/
+    $routes->get('reportsdefaultController/(:any)', 'Reports\ReportsdefaultController::$1');
+    $routes->post('reportsdefaultController/(:any)', 'Reports\ReportsdefaultController::$1');
+    $routes->get('(:any)', 'Reports\ReportsController::$1');
+    $routes->post('(:any)', 'Reports\ReportsController::$1');
+});
+
+$routes->group('reportsdefault', static function ($routes) {
+    $routes->get('/', 'Reports\ReportsdefaultController::index');
+    $routes->get('reportsdefaultController/(:any)', 'Reports\ReportsdefaultController::$1');
+    $routes->post('reportsdefaultController/(:any)', 'Reports\ReportsdefaultController::$1');
+    $routes->get('(:any)', 'Reports\ReportsdefaultController::$1');
+    $routes->post('(:any)', 'Reports\ReportsdefaultController::$1');
+});
+
+$routes->group('reservations', static function ($routes) {
+    $routes->get('/', 'Reports\ReservationsController::index');
+    $routes->get('reservationsController/(:any)', 'Reports\ReservationsController::$1');
+    $routes->post('reservationsController/(:any)', 'Reports\ReservationsController::$1');
+    $routes->get('(:any)', 'Reports\ReservationsController::$1');
+    $routes->post('(:any)', 'Reports\ReservationsController::$1');
+});
+
+// Dashboard
+$routes->group('dashboard', static function ($routes) {
+    $routes->get('/', 'Dashboard\DashboardController::index');
+    $routes->get('dashboardController/(:any)', 'Dashboard\DashboardController::$1');
+    $routes->post('dashboardController/(:any)', 'Dashboard\DashboardController::$1');
+    $routes->get('(:any)', 'Dashboard\DashboardController::$1');
+    $routes->post('(:any)', 'Dashboard\DashboardController::$1');
+});
+
+// File Upload
+$routes->post('fileupload/(:any)', 'FileUpload::$1');
+
+// Download DB
+$routes->get('downloaddb', 'DownloadDB::index');
+$routes->get('downloaddb/(:any)', 'DownloadDB::$1');
diff --git a/app/Config/Routing.php b/app/Config/Routing.php
new file mode 100644
index 0000000..3005543
--- /dev/null
+++ b/app/Config/Routing.php
@@ -0,0 +1,140 @@
+<?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.
+ */
+
+namespace Config;
+
+use CodeIgniter\Config\Routing as BaseRouting;
+
+/**
+ * Routing configuration
+ */
+class Routing extends BaseRouting
+{
+    /**
+     * For Defined Routes.
+     * An array of files that contain route definitions.
+     * Route files are read in order, with the first match
+     * found taking precedence.
+     *
+     * Default: APPPATH . 'Config/Routes.php'
+     *
+     * @var list<string>
+     */
+    public array $routeFiles = [
+        APPPATH . 'Config/Routes.php',
+    ];
+
+    /**
+     * For Defined Routes and Auto Routing.
+     * The default namespace to use for Controllers when no other
+     * namespace has been specified.
+     *
+     * Default: 'App\Controllers'
+     */
+    public string $defaultNamespace = 'App\Controllers';
+
+    /**
+     * For Auto Routing.
+     * The default controller to use when no other controller has been
+     * specified.
+     *
+     * Default: 'Home'
+     */
+    public string $defaultController = 'Home';
+
+    /**
+     * For Defined Routes and Auto Routing.
+     * The default method to call on the controller when no other
+     * method has been set in the route.
+     *
+     * Default: 'index'
+     */
+    public string $defaultMethod = 'index';
+
+    /**
+     * For Auto Routing.
+     * Whether to translate dashes in URIs for controller/method to underscores.
+     * Primarily useful when using the auto-routing.
+     *
+     * Default: false
+     */
+    public bool $translateURIDashes = false;
+
+    /**
+     * Sets the class/method that should be called if routing doesn't
+     * find a match. It can be the controller/method name like: Users::index
+     *
+     * This setting is passed to the Router class and handled there.
+     *
+     * If you want to use a closure, you will have to set it in the
+     * routes file by calling:
+     *
+     * $routes->set404Override(function() {
+     *    // Do something here
+     * });
+     *
+     * Example:
+     *  public $override404 = 'App\Errors::show404';
+     */
+    public ?string $override404 = null;
+
+    /**
+     * 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.
+     */
+    public bool $autoRoute = false;
+
+    /**
+     * For Defined Routes.
+     * If TRUE, will enable the use of the 'prioritize' option
+     * when defining routes.
+     *
+     * Default: false
+     */
+    public bool $prioritize = false;
+
+    /**
+     * For Defined Routes.
+     * If TRUE, matched multiple URI segments will be passed as one parameter.
+     *
+     * Default: false
+     */
+    public bool $multipleSegmentsOneParam = false;
+
+    /**
+     * For Auto Routing (Improved).
+     * Map of URI segments and namespaces.
+     *
+     * The key is the first URI segment. The value is the controller namespace.
+     * E.g.,
+     *   [
+     *       'blog' => 'Acme\Blog\Controllers',
+     *   ]
+     *
+     * @var array<string, string>
+     */
+    public array $moduleRoutes = [];
+
+    /**
+     * For Auto Routing (Improved).
+     * Whether to translate dashes in URIs for controller/method to CamelCase.
+     * E.g., blog-controller -> BlogController
+     *
+     * If you enable this, $translateURIDashes is ignored.
+     *
+     * Default: false
+     */
+    public bool $translateUriToCamelCase = true;
+}
diff --git a/app/Config/Security.php b/app/Config/Security.php
new file mode 100644
index 0000000..635f8b7
--- /dev/null
+++ b/app/Config/Security.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Security extends BaseConfig
+{
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Protection Method
+     * --------------------------------------------------------------------------
+     *
+     * Protection Method for Cross Site Request Forgery protection.
+     *
+     * @var string 'cookie' or 'session'
+     */
+    public string $csrfProtection = 'cookie';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Token Randomization
+     * --------------------------------------------------------------------------
+     *
+     * Randomize the CSRF Token for added security.
+     */
+    public bool $tokenRandomize = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Token Name
+     * --------------------------------------------------------------------------
+     *
+     * Token name for Cross Site Request Forgery protection.
+     */
+    public string $tokenName = 'csrf_test_name';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Header Name
+     * --------------------------------------------------------------------------
+     *
+     * Header name for Cross Site Request Forgery protection.
+     */
+    public string $headerName = 'X-CSRF-TOKEN';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Cookie Name
+     * --------------------------------------------------------------------------
+     *
+     * Cookie name for Cross Site Request Forgery protection.
+     */
+    public string $cookieName = 'csrf_cookie_name';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Expires
+     * --------------------------------------------------------------------------
+     *
+     * Expiration time for Cross Site Request Forgery protection cookie.
+     *
+     * Defaults to two hours (in seconds).
+     */
+    public int $expires = 7200;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Regenerate
+     * --------------------------------------------------------------------------
+     *
+     * Regenerate CSRF Token on every submission.
+     */
+    public bool $regenerate = true;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Redirect
+     * --------------------------------------------------------------------------
+     *
+     * Redirect to previous page with error on failure.
+     *
+     * @see https://codeigniter4.github.io/userguide/libraries/security.html#redirection-on-failure
+     */
+    public bool $redirect = (ENVIRONMENT === 'production');
+}
diff --git a/app/Config/Services.php b/app/Config/Services.php
new file mode 100644
index 0000000..0435f28
--- /dev/null
+++ b/app/Config/Services.php
@@ -0,0 +1,18 @@
+<?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.
+ */
+class Services extends BaseService
+{
+    // Add any custom services here
+}
diff --git a/app/Config/Session.php b/app/Config/Session.php
new file mode 100644
index 0000000..77e2dcf
--- /dev/null
+++ b/app/Config/Session.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Session\Handlers\BaseHandler;
+use CodeIgniter\Session\Handlers\DatabaseHandler;
+use CodeIgniter\Session\Handlers\FileHandler;
+
+class Session extends BaseConfig
+{
+    /**
+     * 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 class-string<BaseHandler>
+     */
+    public string $driver = DatabaseHandler::class;
+
+    /**
+     * Session Cookie Name
+     */
+    public string $cookieName = '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.
+     */
+    public int $expiration = 7200;
+
+    /**
+     * Session Save Path
+     *
+     * For DatabaseHandler, this is the table name.
+     */
+    public string $savePath = 'ci_sessions';
+
+    /**
+     * Session Match IP
+     */
+    public bool $matchIP = false;
+
+    /**
+     * Session Time to Update
+     *
+     * How many seconds between CI regenerating the session ID.
+     */
+    public int $timeToUpdate = 300;
+
+    /**
+     * Session Regenerate Destroy
+     *
+     * Whether to destroy session data associated with the old session ID
+     * when auto-regenerating the session ID.
+     */
+    public bool $regenerateDestroy = false;
+
+    /**
+     * Session Database Group
+     *
+     * DB Group for the database session handler
+     */
+    public ?string $DBGroup = null;
+}
diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
new file mode 100644
index 0000000..5a3e504
--- /dev/null
+++ b/app/Config/Toolbar.php
@@ -0,0 +1,122 @@
+<?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 list<class-string>
+     */
+    public array $collectors = [
+        Timers::class,
+        Database::class,
+        Logs::class,
+        Views::class,
+        // \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+        Files::class,
+        Routes::class,
+        Events::class,
+    ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Collect Var Data
+     * --------------------------------------------------------------------------
+     *
+     * If set to false var data from the views will not be collected. Useful to
+     * avoid high memory usage when there are lots of data passed to the view.
+     */
+    public bool $collectVarData = true;
+
+    /**
+     * --------------------------------------------------------------------------
+     * 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.
+     */
+    public int $maxHistory = 20;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Toolbar Views Path
+     * --------------------------------------------------------------------------
+     *
+     * The full path to the the views that are used by the toolbar.
+     * This MUST have a trailing slash.
+     */
+    public string $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.
+     */
+    public int $maxQueries = 100;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Watched Directories
+     * --------------------------------------------------------------------------
+     *
+     * Contains an array of directories that will be watched for changes and
+     * used to determine if the hot-reload feature should reload the page or not.
+     * We restrict the values to keep performance as high as possible.
+     *
+     * NOTE: The ROOTPATH will be prepended to all values.
+     *
+     * @var list<string>
+     */
+    public array $watchedDirectories = [
+        'app',
+    ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Watched File Extensions
+     * --------------------------------------------------------------------------
+     *
+     * Contains an array of file extensions that will be watched for changes and
+     * used to determine if the hot-reload feature should reload the page or not.
+     *
+     * @var list<string>
+     */
+    public array $watchedExtensions = [
+        'php', 'css', 'js', 'html', 'svg', 'json', 'env',
+    ];
+}
diff --git a/app/Config/UserAgents.php b/app/Config/UserAgents.php
new file mode 100644
index 0000000..fda7374
--- /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 array $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 array $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 array $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 array $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..6342dbb
--- /dev/null
+++ b/app/Config/Validation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Validation\StrictRules\CreditCardRules;
+use CodeIgniter\Validation\StrictRules\FileRules;
+use CodeIgniter\Validation\StrictRules\FormatRules;
+use CodeIgniter\Validation\StrictRules\Rules;
+
+class Validation extends BaseConfig
+{
+    // --------------------------------------------------------------------
+    // Setup
+    // --------------------------------------------------------------------
+
+    /**
+     * Stores the classes that contain the
+     * rules that are available.
+     *
+     * @var list<string>
+     */
+    public array $ruleSets = [
+        Rules::class,
+        FormatRules::class,
+        FileRules::class,
+        CreditCardRules::class,
+    ];
+
+    /**
+     * Specifies the views that are used to display the
+     * errors.
+     *
+     * @var array<string, string>
+     */
+    public array $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..cf8dd06
--- /dev/null
+++ b/app/Config/View.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+use CodeIgniter\View\ViewDecoratorInterface;
+
+/**
+ * @phpstan-type parser_callable (callable(mixed): mixed)
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
+ */
+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 bool
+     */
+    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<string, string>
+     * @phpstan-var array<string, parser_callable_string>
+     */
+    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<string, callable|list<string>|string>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
+     */
+    public $plugins = [];
+
+    /**
+     * View Decorators are class methods that will be run in sequence to
+     * have a chance to alter the generated output just prior to caching
+     * the results.
+     *
+     * All classes must implement CodeIgniter\View\ViewDecoratorInterface
+     *
+     * @var list<class-string<ViewDecoratorInterface>>
+     */
+    public array $decorators = [];
+}
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
new file mode 100644
index 0000000..1317aa6
--- /dev/null
+++ b/app/Controllers/BaseController.php
@@ -0,0 +1,160 @@
+<?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;
+use App\Libraries\Beheer\Session\RetrieveUserSession;
+
+/**
+ * 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.
+ */
+abstract class BaseController extends Controller
+{
+    /**
+     * Instance of the main Request object.
+     *
+     * @var CLIRequest|IncomingRequest
+     */
+    protected $request;
+
+    /**
+     * An array of helpers to be loaded automatically upon
+     * class instantiation.
+     *
+     * @var list<string>
+     */
+    protected $helpers = ['common'];
+
+    /**
+     * Session instance
+     */
+    protected $session;
+
+    /**
+     * Current authenticated user
+     */
+    public $user;
+
+    /**
+     * Authentication status
+     */
+    public $authenticated = false;
+
+    /**
+     * Application version
+     */
+    public $version = '1.00.81';
+
+    /**
+     * User Model instance
+     */
+    protected $userModel;
+
+    /**
+     * @return void
+     */
+    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.
+        $this->session = \Config\Services::session();
+
+        // Make version available to all views
+        $renderer = \Config\Services::renderer();
+        $renderer->setVar('version', $this->version);
+
+        // Initialize user session handler
+        $this->handleSession();
+    }
+
+    /**
+     * Handle session and authentication
+     */
+    protected function handleSession(): void
+    {
+        // Garbage collection for old sessions
+        $this->garbageCiSessions();
+
+        // Set secure site in production
+        $this->setSecureSite();
+
+        // Retrieve user session
+        $retrieveSession = new RetrieveUserSession($this->session);
+        $retrieveSession->handle();
+
+        // Get the authenticated flag and user ID from constants
+        $this->authenticated = defined('AUTHENTICATED') ? AUTHENTICATED : false;
+
+        if ($this->authenticated && defined('USERID') && USERID) {
+            $this->user = \User::find(USERID);
+        }
+    }
+
+    /**
+     * Garbage collection for old CI sessions
+     */
+    protected function garbageCiSessions(): void
+    {
+        $number = random_int(0, 100);
+
+        if ($number !== 17) {
+            return;
+        }
+
+        $db = \Config\Database::connect();
+        $db->query("DELETE FROM ci_sessions WHERE TIMESTAMPDIFF(MINUTE, FROM_UNIXTIME(timestamp), NOW()) > 60");
+    }
+
+    /**
+     * Force HTTPS in production
+     */
+    protected function setSecureSite(): void
+    {
+        if (($_ENV['ENVIRONMENT'] ?? 'development') !== 'production') {
+            return;
+        }
+
+        if (!isset($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] !== "on") {
+            header("Location: " . ($_ENV['APP_URL'] ?? ''));
+            exit;
+        }
+    }
+
+    /**
+     * Clean input value (replaces CI3's clean_input method)
+     */
+    protected function cleanInput(string $key): string
+    {
+        $value = $this->request->getPost($key) ?? $this->request->getGet($key) ?? '';
+        return str_replace('null', '', $value);
+    }
+
+    /**
+     * Return JSON response (replaces CI3's json method)
+     */
+    protected function json($data): ResponseInterface
+    {
+        return $this->response
+            ->setContentType('application/json')
+            ->setJSON($data);
+    }
+
+    /**
+     * Check if user is authorized (placeholder for subclass implementation)
+     */
+    public function unAuthorized(): void
+    {
+        // Override in subclasses if needed
+    }
+}
diff --git a/app/Controllers/Beheer/AuthorisationController.php b/app/Controllers/Beheer/AuthorisationController.php
new file mode 100644
index 0000000..4f5602f
--- /dev/null
+++ b/app/Controllers/Beheer/AuthorisationController.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class AuthorisationController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getRoleAuthorisations(): ResponseInterface
+    {
+        $roleAuthorisations = \Role::getPagesAccessByRole();
+
+        return $this->json($roleAuthorisations);
+    }
+
+    public function toggleAuhorisation(): ResponseInterface
+    {
+        $pageID = $this->cleanInput('pageID');
+        $roleLevel = $this->cleanInput('roleLevel');
+        $access = $this->cleanInput('access');
+
+        $page = \Page::find($pageID);
+
+        if ($access == 'F') {
+            $roleLevel = -$roleLevel;
+        }
+
+        $page->pagelevel = $page->pagelevel + $roleLevel;
+
+        $page->save();
+
+        return $this->json(['success' => true]);
+    }
+}
diff --git a/app/Controllers/Beheer/CustomersController.php b/app/Controllers/Beheer/CustomersController.php
new file mode 100644
index 0000000..fa618d9
--- /dev/null
+++ b/app/Controllers/Beheer/CustomersController.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class CustomersController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getAllCustomers(string $archive = 'F'): ResponseInterface
+    {
+        $customers = \Customer::getAllCustomers($archive);
+
+        return $this->json($customers);
+    }
+
+    public function saveCustomer(): ResponseInterface
+    {
+        $customerValidation = new \CustomerValidation();
+
+        if (!$customerValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $customerValidation->getErrorMessages()
+            ]);
+        }
+
+        $customer = $this->request->getPost();
+
+        $customerID = $customer['id'];
+        unset($customer['id']);
+
+        $customerID = \Customer::saveCustomer($customerID, $customer);
+
+        return $this->json(['success' => true, 'customerID' => $customerID]);
+    }
+
+    public function archiveCustomer(int $customerID, string $status): ResponseInterface
+    {
+        \Customer::whereId($customerID)->update(['archive' => $status]);
+        return $this->json(['success' => true]);
+    }
+
+    public function removeCustomer(int $customerID): ResponseInterface
+    {
+        $removeCustomer = new \RemoveCustomer($customerID);
+
+        if ($removeCustomer->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Customer::removeCustomer($customerID);
+
+        return $this->json(['result' => true]);
+    }
+}
diff --git a/app/Controllers/Beheer/EmployeeTargetController.php b/app/Controllers/Beheer/EmployeeTargetController.php
new file mode 100644
index 0000000..9082c0b
--- /dev/null
+++ b/app/Controllers/Beheer/EmployeeTargetController.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class EmployeeTargetController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getEmployeeTargets(int $employeeID): ResponseInterface
+    {
+        $employeeTargets = \Employeetarget::whereUserId($employeeID)
+            ->orderBy('id')
+            ->get();
+
+        return $this->json($employeeTargets);
+    }
+
+    public function saveEmployeeTarget(): ResponseInterface
+    {
+        $employeeTargetValidation = new \EmployeeTargetValidation();
+
+        if (!$employeeTargetValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $employeeTargetValidation->getErrorMessages()
+            ]);
+        }
+
+        $target = $this->request->getPost();
+
+        $targetID = $target['id'];
+        unset($target['id']);
+
+        $target['endmonth'] = $target['endmonth'] ? $target['endmonth'] : null;
+        $target['endyear'] = $target['endyear'] ? $target['endyear'] : null;
+
+        $targetID = \Employeetarget::saveTarget($targetID, $target);
+
+        return $this->json(['success' => true, 'targetID' => $targetID]);
+    }
+}
diff --git a/app/Controllers/Beheer/ExternalsController.php b/app/Controllers/Beheer/ExternalsController.php
new file mode 100644
index 0000000..7ec6a5f
--- /dev/null
+++ b/app/Controllers/Beheer/ExternalsController.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class ExternalsController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getAllExternals(string $archive = 'F'): ResponseInterface
+    {
+        $externals = \External::getAllExternals($archive);
+
+        return $this->json($externals);
+    }
+
+    public function saveExternal(): ResponseInterface
+    {
+        $externalValidation = new \ExternalValidation();
+
+        if (!$externalValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $externalValidation->getErrorMessages()
+            ]);
+        }
+
+        $external = $this->request->getPost();
+
+        $externalID = $external['id'];
+        unset($external['id']);
+
+        $externalID = \External::saveExternal($externalID, $external);
+
+        return $this->json(['success' => true, 'externalID' => $externalID]);
+    }
+
+    public function archiveExternal(int $externalID, string $status): ResponseInterface
+    {
+        \External::whereId($externalID)->update(['archive' => $status]);
+        return $this->json(['success' => true]);
+    }
+
+    public function removeExternal(int $externalID): ResponseInterface
+    {
+        $removeExternal = new \RemoveExternal($externalID);
+
+        if ($removeExternal->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \External::removeExternal($externalID);
+
+        return $this->json(['result' => true]);
+    }
+}
diff --git a/app/Controllers/Beheer/RolesController.php b/app/Controllers/Beheer/RolesController.php
new file mode 100644
index 0000000..1cecc8d
--- /dev/null
+++ b/app/Controllers/Beheer/RolesController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class RolesController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getAllRoles(string $archive = 'F'): ResponseInterface
+    {
+        $roles = \Role::getAllRoles($archive);
+
+        return $this->json($roles);
+    }
+}
diff --git a/app/Controllers/Beheer/TwoFactorController.php b/app/Controllers/Beheer/TwoFactorController.php
new file mode 100644
index 0000000..cbfbd1b
--- /dev/null
+++ b/app/Controllers/Beheer/TwoFactorController.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+use App\Libraries\TwoFactorAuth;
+
+/**
+ * Two-Factor Authentication Settings Controller
+ * Allows users to manage their 2FA settings
+ */
+class TwoFactorController extends BaseController
+{
+    protected TwoFactorAuth $twoFactorAuth;
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        // Ensure user is authenticated
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            header('Location: ' . site_url('login'));
+            exit;
+        }
+
+        $this->twoFactorAuth = new TwoFactorAuth();
+    }
+
+    /**
+     * Show 2FA settings page
+     */
+    public function index(): string
+    {
+        $data = [
+            'user' => $this->user,
+            'version' => $this->version
+        ];
+
+        return view('pages/beheer/twofactor/settings_view', $data);
+    }
+
+    /**
+     * Enable 2FA for the user
+     * POST parameters:
+     * - method: 'email' or 'authenticator'
+     */
+    public function enable(): ResponseInterface
+    {
+        $method = $this->cleanInput('method');
+
+        if (!in_array($method, ['email', 'authenticator'])) {
+            return $this->json(['success' => false, 'message' => 'Ongeldige methode']);
+        }
+
+        $secret = null;
+        $qrCodeUrl = null;
+
+        // If authenticator method, generate secret
+        if ($method === 'authenticator') {
+            $secret = $this->twoFactorAuth->generateSecret();
+            $qrCodeUrl = $this->twoFactorAuth->getQRCodeUrl(
+                $secret,
+                $this->user->username,
+                'DBOIS'
+            );
+        }
+
+        // Update user record
+        \User::whereId($this->user->id)->update([
+            'two_factor_enabled' => 'T',
+            'two_factor_method' => $method,
+            'two_factor_secret' => $secret
+        ]);
+
+        $response = [
+            'success' => true,
+            'message' => 'Tweefactorauthenticatie ingeschakeld',
+            'method' => $method
+        ];
+
+        if ($method === 'authenticator') {
+            $response['secret'] = $secret;
+            $response['qrCodeUrl'] = $qrCodeUrl;
+        }
+
+        return $this->json($response);
+    }
+
+    /**
+     * Verify authenticator setup
+     * POST parameters:
+     * - code: The 6-digit code from Google Authenticator
+     */
+    public function verifySetup(): ResponseInterface
+    {
+        $code = $this->cleanInput('code');
+
+        if (!$this->user->two_factor_secret) {
+            return $this->json(['success' => false, 'message' => 'Geen geheim gevonden']);
+        }
+
+        $isValid = $this->twoFactorAuth->verifyCode($this->user->two_factor_secret, $code);
+
+        if ($isValid) {
+            return $this->json(['success' => true, 'message' => 'Code geverifieerd']);
+        } else {
+            return $this->json(['success' => false, 'message' => 'Ongeldige code']);
+        }
+    }
+
+    /**
+     * Disable 2FA for the user
+     */
+    public function disable(): ResponseInterface
+    {
+        \User::whereId($this->user->id)->update([
+            'two_factor_enabled' => 'F',
+            'two_factor_method' => null,
+            'two_factor_secret' => null
+        ]);
+
+        // Clean up any existing OTP codes
+        \UserOtp::where('user_id', $this->user->id)->delete();
+
+        return $this->json([
+            'success' => true,
+            'message' => 'Tweefactorauthenticatie uitgeschakeld'
+        ]);
+    }
+
+    /**
+     * Change 2FA method
+     * POST parameters:
+     * - method: 'email' or 'authenticator'
+     */
+    public function changeMethod(): ResponseInterface
+    {
+        $method = $this->cleanInput('method');
+
+        if (!in_array($method, ['email', 'authenticator'])) {
+            return $this->json(['success' => false, 'message' => 'Ongeldige methode']);
+        }
+
+        // If user is not enabled for 2FA, they should use enable endpoint
+        if ($this->user->two_factor_enabled !== 'T') {
+            return $this->json(['success' => false, 'message' => '2FA is niet ingeschakeld']);
+        }
+
+        $secret = null;
+        $qrCodeUrl = null;
+
+        // If switching to authenticator, generate new secret
+        if ($method === 'authenticator') {
+            $secret = $this->twoFactorAuth->generateSecret();
+            $qrCodeUrl = $this->twoFactorAuth->getQRCodeUrl(
+                $secret,
+                $this->user->username,
+                'DBOIS'
+            );
+        }
+
+        \User::whereId($this->user->id)->update([
+            'two_factor_method' => $method,
+            'two_factor_secret' => $secret
+        ]);
+
+        $response = [
+            'success' => true,
+            'message' => '2FA methode gewijzigd',
+            'method' => $method
+        ];
+
+        if ($method === 'authenticator') {
+            $response['secret'] = $secret;
+            $response['qrCodeUrl'] = $qrCodeUrl;
+        }
+
+        return $this->json($response);
+    }
+
+    /**
+     * Get current 2FA status
+     */
+    public function status(): ResponseInterface
+    {
+        $response = [
+            'enabled' => $this->user->two_factor_enabled === 'T',
+            'method' => $this->user->two_factor_method
+        ];
+
+        return $this->json($response);
+    }
+}
diff --git a/app/Controllers/Beheer/UsersController.php b/app/Controllers/Beheer/UsersController.php
new file mode 100644
index 0000000..86fcd4c
--- /dev/null
+++ b/app/Controllers/Beheer/UsersController.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class UsersController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getAllUsers(string $archive = 'F'): ResponseInterface
+    {
+        $users = \User::getAllUsers($archive);
+        return $this->json($users);
+    }
+
+    public function getUser(int $userID): ResponseInterface
+    {
+        $user = \User::find($userID);
+        return $this->json($user);
+    }
+
+    public function getCurrentUser(): ResponseInterface
+    {
+        return $this->json($this->user);
+    }
+
+    public function getUserWithprojects(): ResponseInterface
+    {
+        $usersWithProjects = \User::getUserWithprojects();
+        return $this->json($usersWithProjects);
+    }
+
+    public function getUserActiveProjects(int $userID): ResponseInterface
+    {
+        $userActiveProjects = \User::getUserActiveProjects($userID);
+        return $this->json($userActiveProjects);
+    }
+
+    public function getUniqueprojectEmployees(): ResponseInterface
+    {
+        $projectEmployees = \User::getUniqueProjectUsers();
+        return $this->json($projectEmployees);
+    }
+
+    public function getUniqueEmployeesWithActivity(string $archive): ResponseInterface
+    {
+        $projectEmployees = \Projectemployee::getUniqueEmployeesWithActivity($archive);
+        return $this->json($projectEmployees);
+    }
+
+    public function saveUser(): ResponseInterface
+    {
+        $userValidation = new \UserValidation();
+
+        if (!$userValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $userValidation->getErrorMessages()
+            ]);
+        }
+
+        $user = $this->request->getPost();
+
+        $userID = $user['id'];
+        unset($user['id']);
+
+        if ($userID == 0) {
+            $user = $this->newUser($user);
+        }
+
+        $user['role'] = empty($user['role']) ? null : $user['role'];
+
+        $userID = \User::saveUser($userID, $user);
+
+        return $this->json(['success' => true, 'userID' => $userID]);
+    }
+
+    public function savePassword(): ResponseInterface
+    {
+        $password = $this->cleanInput('password');
+
+        $user = \User::find(USERID);
+
+        $saltedPassword = \User::getSaltedPassword($password, $user->salt);
+
+        \User::whereId(USERID)->update(['password' => $saltedPassword]);
+
+        return $this->json(['success' => true]);
+    }
+
+    public function archiveUser(int $userID, string $status): ResponseInterface
+    {
+        \User::whereId($userID)->update(['archive' => $status]);
+        return $this->json(['success' => true]);
+    }
+
+    public function removeUser(int $userID): ResponseInterface
+    {
+        $removeUser = new \RemoveUser($userID);
+
+        if ($removeUser->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \User::removeUser($userID);
+
+        return $this->json(['result' => true]);
+    }
+
+    private function newUser(array $user): array
+    {
+        $userCreation = new \UserCreation($user);
+
+        $user = $userCreation->getUser();
+        $password = $userCreation->getPassword();
+
+        $this->sendWelcomeEmail($user, $password);
+
+        return $user;
+    }
+
+    private function sendWelcomeEmail(array $user, string $password): bool
+    {
+        $email = \Config\Services::email();
+
+        $html = view('emails/welcome_email', [
+            'password' => $password,
+            'user' => $user
+        ]);
+
+        $email->setFrom('noreply@debeleidsonderzoekers.nl', 'DBOIS');
+        $email->setTo($user['email']);
+        $email->setSubject('Wachtwoord DBOIS');
+        $email->setMessage($html);
+
+        return $email->send();
+    }
+}
diff --git a/app/Controllers/Beheer/VatController.php b/app/Controllers/Beheer/VatController.php
new file mode 100644
index 0000000..2f1bdab
--- /dev/null
+++ b/app/Controllers/Beheer/VatController.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Controllers\Beheer;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class VatController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getVats(string $archive): ResponseInterface
+    {
+        $vats = \Vat::getVats($archive);
+
+        return $this->json($vats);
+    }
+
+    public function addVat(): ResponseInterface
+    {
+        \Vat::create([]);
+        return $this->json(['success' => true]);
+    }
+
+    public function saveVat(int $vatID): ResponseInterface
+    {
+        $vatrate = $this->request->getPost('vatrate');
+        \Vat::whereId($vatID)->update(['vatrate' => $vatrate]);
+        return $this->json(['success' => true]);
+    }
+
+    public function removeVat(int $vatID): ResponseInterface
+    {
+        $removeVat = new \RemoveVat($vatID);
+
+        $allowRemove = $removeVat->getRemoveAllowed();
+
+        if ($allowRemove === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Vat::whereId($vatID)->delete();
+
+        return $this->json(['result' => true]);
+    }
+}
diff --git a/app/Controllers/Dashboard/DashboardController.php b/app/Controllers/Dashboard/DashboardController.php
new file mode 100644
index 0000000..9f2c8e9
--- /dev/null
+++ b/app/Controllers/Dashboard/DashboardController.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Controllers\Dashboard;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class DashboardController extends BaseController
+{
+    private array $invoiceOverviews = [];
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function getOwhp(): ResponseInterface
+    {
+        $recapprojects = new \Recapprojects('F', false, false);
+
+        $projects = $recapprojects->getProjects();
+
+        $currentFinancialYear = 0;
+        $totalRevenues = 0;
+        $totalOwp = 0;
+        $ownRevenue = 0;
+        $available = 0;
+
+        foreach ($projects as $project) {
+            $revenues = 0;
+            foreach ($project['employees'] as $employee) {
+                $revenues += $employee['revenues'];
+            }
+            $currentFinancialYear += $project['current_financial_year'];
+
+            $owp = $project['own_revenue'] - $revenues;
+            $owp = $owp > 0 ? $owp : 0;
+            $totalOwp += $owp;
+
+            $ownRevenue += $project['own_revenue'];
+            $totalRevenues += $revenues;
+            $available += $project['budgetAvailable'];
+        }
+
+        $outstandings = \Invoice::getTotalsOutstandingPerProject(false);
+
+        $this->setInvoiceOverview();
+
+        return $this->json([
+            'totalOwp'             => round($totalOwp, 0),
+            'revenuesThisYear'     => $this->getRevenuesThisYear(),
+            'currentFinancialYear' => round($currentFinancialYear),
+            'owpNextyear'          => round($totalOwp - $currentFinancialYear),
+            'revenuesNextyear'     => round($totalOwp / 0.4),
+            'totalRevenues'        => round($totalRevenues),
+            'outstandings'         => $this->invoiceOverviews,
+            'costsToPay'           => $this->reservations(),
+            'invoiced'             => $this->getInvoiced(),
+            'totalChance'          => $this->getChanceRevenues(),
+            'totalPayment'         => round(\Payment::getPaymentInYear(date('Y')))
+        ]);
+    }
+
+    private function getRevenuesThisYear(): float
+    {
+        $year = date('Y');
+        $sql = \QEmployeeHours::fire(false, $year);
+
+        $db = \Config\Database::connect();
+        $query = $db->query($sql);
+
+        $result = $query->getResult();
+
+        $totalRevenue = 0;
+        foreach ($result as $revenue) {
+            $totalRevenue += $revenue->revenues;
+        }
+
+        return $totalRevenue;
+    }
+
+    private function setInvoiceOverview(): void
+    {
+        $projects = \Project::whereArchive('F')->get();
+
+        foreach ($projects as $project) {
+            $invoiceOverview = new \InvoiceOverview($project, date('Y'));
+
+            $this->invoiceOverviews[] = $invoiceOverview->getProjectDetails();
+        }
+    }
+
+    private function reservations(): float
+    {
+        $sql = \ReservationTotals::fire();
+
+        $db = \Config\Database::connect();
+        $query = $db->query($sql);
+
+        $results = $query->getResult();
+
+        $costsToPay = 0;
+        foreach ($results as $result) {
+            $toPay = $result->other_revenue - $result->costs + $result->saldoToPay;
+            $costsToPay += $toPay;
+        }
+
+        return $costsToPay;
+    }
+
+    private function getInvoiced(): float
+    {
+        $invoiced = \Invoice::getInvoiced(date('Y'));
+
+        $totalInvoiced = 0;
+        foreach ($invoiced as $invoice) {
+            $totalInvoiced += round(($invoice->invoiceamount * 1.21), 0);
+        }
+
+        return $totalInvoiced;
+    }
+
+    private function getChanceRevenues(): float
+    {
+        $offers = \Offer::getAllOffers(false, 'F', '', 'id', 'desc');
+
+        $totalChance = 0;
+        foreach ($offers as $offer) {
+            $totalChance += round(
+                ($offer->own_revenue) *  // + $offer->other_revenue mail 17-01-2022
+                ($offer->acceptance_chance / 100),
+                0
+            );
+        }
+
+        return $totalChance;
+    }
+}
diff --git a/app/Controllers/DownloadDB.php b/app/Controllers/DownloadDB.php
new file mode 100644
index 0000000..5fe7c59
--- /dev/null
+++ b/app/Controllers/DownloadDB.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\HTTP\ResponseInterface;
+
+class DownloadDB extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index(): ResponseInterface
+    {
+        $db = \Config\Database::connect();
+        $dbutil = \Config\Database::utils();
+
+        $filename = "backupDBOIS_" . date('YmdHis');
+
+        $prefs = [
+            'tables'     => [],   // Array of tables to backup
+            'ignore'     => [],   // List of tables to omit from the backup
+            'format'     => '',   // gzip, zip, txt
+            'filename'   => null, // File name - NEEDED ONLY WITH ZIP FILES
+            'add_drop'   => true, // Whether to add DROP TABLE statements to backup file
+            'add_insert' => true, // Whether to add INSERT data to backup file
+            'newline'    => "\n"  // Newline character used in backup file
+        ];
+
+        $backup = $dbutil->backup($prefs);
+
+        return $this->response->download($filename . '.sql', $backup);
+    }
+}
diff --git a/app/Controllers/FileUpload.php b/app/Controllers/FileUpload.php
new file mode 100644
index 0000000..3937751
--- /dev/null
+++ b/app/Controllers/FileUpload.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\HTTP\ResponseInterface;
+
+class FileUpload extends BaseController
+{
+    private string $storagename = '';
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function upload(int $foreignID): ResponseInterface
+    {
+        $validationRule = [
+            'userfile' => [
+                'label' => 'File',
+                'rules' => 'uploaded[userfile]'
+            ]
+        ];
+
+        if (!$this->validate($validationRule)) {
+            return $this->json(['error' => $this->validator->getErrors()]);
+        }
+
+        $file = $this->request->getFile('userfile');
+
+        if (!$file->isValid()) {
+            return $this->json(['error' => $file->getErrorString()]);
+        }
+
+        // Move to temp directory first
+        $tempPath = ROOTPATH . 'documents/temp';
+        $originalName = $file->getName();
+        $file->move($tempPath, $originalName);
+
+        $this->setStoragename();
+
+        $uploadData = [
+            'file_name' => $originalName,
+            'full_path' => $tempPath . '/' . $originalName
+        ];
+
+        $this->persistDocument($uploadData, $foreignID);
+        $this->renameDocument($uploadData['full_path']);
+
+        return $this->json(['success' => true, 'storagename' => $this->storagename]);
+    }
+
+    private function setStoragename(): void
+    {
+        $this->storagename = sha1(bin2hex(random_bytes(16)));
+    }
+
+    private function persistDocument(array $data, int $foreignID): void
+    {
+        $file = [
+            'storagename'  => $this->storagename,
+            'originalname' => $data['file_name'],
+            'user_id'      => USERID,
+            'uploaddate'   => date('Y-m-d H:i:s'),
+            'foreign_id'   => $foreignID
+        ];
+
+        \Document::create($file);
+    }
+
+    private function renameDocument(string $original): void
+    {
+        rename($original, ROOTPATH . 'documents/' . $this->storagename);
+    }
+}
diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
new file mode 100644
index 0000000..dfe1880
--- /dev/null
+++ b/app/Controllers/Login.php
@@ -0,0 +1,311 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Libraries\Beheer\Session\CreateUserSession;
+use App\Libraries\TwoFactorAuth;
+
+class Login extends BaseController
+{
+    protected CreateUserSession $createUserSession;
+    protected TwoFactorAuth $twoFactorAuth;
+
+    public function __construct()
+    {
+        $this->createUserSession = new CreateUserSession(\Config\Services::session());
+        $this->twoFactorAuth = new TwoFactorAuth();
+    }
+
+    public function index()
+    {
+        $username = $this->cleanInput('username');
+        $password = $this->cleanInput('password');
+
+        $user = \User::where('username', $username)->first();
+
+        if (!$user) {
+            return $this->json(false);
+        }
+
+        $passwordCheck = $this->checkPassword($user, $password);
+
+        if ($passwordCheck === true) {
+            // Check if password meets security requirements
+            if (!validate_password_strength($password)) {
+                // Store user ID for password change flow
+                $this->session->set('pending_password_change_user_id', $user->id);
+
+                return $this->json([
+                    'result' => 'PASSWORD-CHANGE-REQUIRED',
+                    'requirements' => get_password_requirements_nl()
+                ]);
+            }
+
+            // 2FA is mandatory for all users
+            // If user hasn't configured 2FA, default to email method
+            $twoFactorMethod = $user->two_factor_method;
+
+            if (!$twoFactorMethod || $user->two_factor_enabled !== 'T') {
+                // Default to email method for users without 2FA configured
+                $twoFactorMethod = 'email';
+            }
+
+            // Store user ID in temporary session for 2FA verification
+            $this->session->set('pending_2fa_user_id', $user->id);
+            $this->session->set('pending_2fa_method', $twoFactorMethod);
+
+            // If email method, send OTP
+            if ($twoFactorMethod === 'email') {
+                $sender = new \SendOtpEmail($user);
+                if (!$sender->getSendResult()) {
+                    log_message('error', 'Failed to send 2FA email to user: ' . $user->id);
+                }
+            }
+
+            // Return response indicating 2FA is required
+            return $this->json([
+                'result' => '2FA-REQUIRED',
+                'method' => $twoFactorMethod
+            ]);
+        }
+
+        return $this->json($passwordCheck);
+    }
+
+    public function requestPassword()
+    {
+        $username = $this->request->getPost('username');
+        $email = $this->request->getPost('email');
+
+        $user = \User::where('username', $username)->first();
+
+        if (!$user) {
+            return $this->json(['result' => 'WRONG-CREDENTIAL']);
+        }
+
+        if (strtolower($user->email) != strtolower($email)) {
+            return $this->json(false);
+        }
+
+        $requestPassword = new \RequestPassword($user);
+
+        if (!$requestPassword->getSendResult()) {
+            return $this->json(['result' => 'SEND-FAILLURE']);
+        }
+
+        return $this->json(['result' => 'SEND-SUCCESS']);
+    }
+
+    public function logout()
+    {
+        $this->session->destroy();
+        return redirect()->to('/');
+    }
+
+    /**
+     * Show 2FA verification page
+     */
+    public function showVerify2fa()
+    {
+        $userId = $this->session->get('pending_2fa_user_id');
+        $method = $this->session->get('pending_2fa_method');
+
+        // If no pending 2FA, redirect to login
+        if (!$userId || !$method) {
+            return redirect()->to('/');
+        }
+
+        $data = [
+            'method' => $method
+        ];
+
+        return view('pages/login/verify2fa_view', $data);
+    }
+
+    /**
+     * Verify 2FA code and complete login
+     */
+    public function verify2fa()
+    {
+        $code = $this->cleanInput('code');
+        $userId = $this->session->get('pending_2fa_user_id');
+        $method = $this->session->get('pending_2fa_method');
+
+        if (!$userId || !$method) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Geen 2FA verificatie in behandeling'
+            ]);
+        }
+
+        $user = \User::find($userId);
+
+        if (!$user) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Gebruiker niet gevonden'
+            ]);
+        }
+
+        $isValid = false;
+
+        // Verify based on method
+        if ($method === 'email') {
+            $isValid = \UserOtp_model::verifyOTP($userId, $code);
+        } elseif ($method === 'authenticator') {
+            $isValid = $this->twoFactorAuth->verifyCode($user->two_factor_secret, $code);
+        }
+
+        if ($isValid) {
+            // Clear temporary session data
+            $this->session->remove('pending_2fa_user_id');
+            $this->session->remove('pending_2fa_method');
+
+            // Create full user session
+            $this->createUserSession->handle($user);
+
+            return $this->json([
+                'success' => true,
+                'message' => 'Succesvol geverifieerd'
+            ]);
+        } else {
+            return $this->json([
+                'success' => false,
+                'message' => 'Ongeldige verificatiecode'
+            ]);
+        }
+    }
+
+    /**
+     * Resend OTP code for email method
+     */
+    public function resendOtp()
+    {
+        $userId = $this->session->get('pending_2fa_user_id');
+        $method = $this->session->get('pending_2fa_method');
+
+        if (!$userId || $method !== 'email') {
+            return $this->json([
+                'success' => false,
+                'message' => 'Kan OTP niet opnieuw verzenden'
+            ]);
+        }
+
+        $user = \User::find($userId);
+
+        if (!$user) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Gebruiker niet gevonden'
+            ]);
+        }
+
+        // Send new OTP
+        new \SendOtpEmail($user);
+
+        return $this->json([
+            'success' => true,
+            'message' => 'Nieuwe code verzonden'
+        ]);
+    }
+
+    /**
+     * Handle forced password change for weak passwords
+     */
+    public function changeWeakPassword()
+    {
+        $userId = $this->session->get('pending_password_change_user_id');
+        $newPassword = $this->cleanInput('new_password');
+        $confirmPassword = $this->cleanInput('confirm_password');
+
+        if (!$userId) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Geen wachtwoordwijziging in behandeling'
+            ]);
+        }
+
+        // Validate passwords match
+        if ($newPassword !== $confirmPassword) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Wachtwoorden komen niet overeen'
+            ]);
+        }
+
+        // Validate password strength
+        if (!validate_password_strength($newPassword)) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Wachtwoord voldoet niet aan de eisen',
+                'requirements' => get_password_requirements_nl()
+            ]);
+        }
+
+        // Get user
+        $user = \User::find($userId);
+
+        if (!$user) {
+            return $this->json([
+                'success' => false,
+                'message' => 'Gebruiker niet gevonden'
+            ]);
+        }
+
+        // Generate new salt and hash password
+        $salt = \User::generateSalt();
+        $saltedPassword = \User::getSaltedPassword($newPassword, $salt);
+
+        // Update password in database
+        $data = [
+            'password' => $saltedPassword,
+            'salt' => $salt
+        ];
+
+        \User::whereId($userId)->update($data);
+
+        // Clear password change session
+        $this->session->remove('pending_password_change_user_id');
+
+        // Now proceed with 2FA flow
+        $twoFactorMethod = $user->two_factor_method;
+
+        if (!$twoFactorMethod || $user->two_factor_enabled !== 'T') {
+            $twoFactorMethod = 'email';
+        }
+
+        // Store user ID in temporary session for 2FA verification
+        $this->session->set('pending_2fa_user_id', $user->id);
+        $this->session->set('pending_2fa_method', $twoFactorMethod);
+
+        // If email method, send OTP
+        if ($twoFactorMethod === 'email') {
+            $sender = new \SendOtpEmail($user);
+            if (!$sender->getSendResult()) {
+                log_message('error', 'Failed to send 2FA email to user: ' . $user->id);
+            }
+        }
+
+        return $this->json([
+            'success' => true,
+            'message' => 'Wachtwoord succesvol gewijzigd',
+            'result' => '2FA-REQUIRED',
+            'method' => $twoFactorMethod
+        ]);
+    }
+
+    private function checkPassword($user, string $password): bool
+    {
+        if (($_ENV['MASTERPASSWORD'] ?? '') == $password) {
+            return true;
+        }
+
+        $saltedPassword = \User::getSaltedPassword($password, $user->salt);
+
+        if ($saltedPassword == $user->password) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/Controllers/Main.php b/app/Controllers/Main.php
new file mode 100644
index 0000000..eba55b2
--- /dev/null
+++ b/app/Controllers/Main.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Controllers;
+
+class Main extends BaseController
+{
+    public function index()
+    {
+        // Check for maintenance mode
+        // if ($_ENV['MAINTENANCE'] ?? false) return view('underconstruction');
+
+        if (!$this->authenticated) {
+            return $this->showLoginPage();
+        }
+
+        $pages = \Page::getPages($this->user);
+
+        return view('main_view', ['pages' => $pages]);
+    }
+
+    private function showLoginPage()
+    {
+        return view('pages/login/login_view');
+    }
+}
diff --git a/app/Controllers/Menu.php b/app/Controllers/Menu.php
new file mode 100644
index 0000000..a39f795
--- /dev/null
+++ b/app/Controllers/Menu.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\HTTP\ResponseInterface;
+
+class Menu extends BaseController
+{
+    public function __construct()
+    {
+        // No authentication required for menu - handled by BaseController
+    }
+
+    public function getAppPages(): ResponseInterface
+    {
+        $appPages = \Page::getAppPages($this->user);
+
+        return $this->json($appPages);
+    }
+}
diff --git a/app/Controllers/Projects/CommentsController.php b/app/Controllers/Projects/CommentsController.php
new file mode 100644
index 0000000..04805ea
--- /dev/null
+++ b/app/Controllers/Projects/CommentsController.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Controllers\Projects;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class CommentsController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getComments(int $foreignID, string $tablename): ResponseInterface
+    {
+        $comments = \Comment::getComments($foreignID, $tablename);
+
+        return $this->json($comments);
+    }
+
+    public function getComment(int $commentID): ResponseInterface
+    {
+        $comment = \Comment::find($commentID);
+
+        $comment->comment = base64_decode($comment->comment);
+
+        return $this->json($comment);
+    }
+
+    public function addComment(int $foreignID, string $tablename): ResponseInterface
+    {
+        $commentID = \Comment::addComment($foreignID, $tablename);
+
+        return $this->json($commentID);
+    }
+
+    public function saveComment(int $commentID): ResponseInterface
+    {
+        $comment = $this->request->getPost('comment');
+
+        $comment = base64_encode($comment);
+
+        \Comment::whereId($commentID)->update(['comment' => $comment]);
+
+        return $this->json(['success' => true]);
+    }
+}
diff --git a/app/Controllers/Projects/DocumentsController.php b/app/Controllers/Projects/DocumentsController.php
new file mode 100644
index 0000000..1a7c6c6
--- /dev/null
+++ b/app/Controllers/Projects/DocumentsController.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Controllers\Projects;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class DocumentsController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function getDocuments(int $foreignID): ResponseInterface
+    {
+        $documents = \Document::getDocuments($foreignID);
+
+        return $this->json($documents);
+    }
+
+    public function downloadDocument(int $documentID): ResponseInterface
+    {
+        $document = \Document::find($documentID);
+
+        $filePath = ROOTPATH . 'documents/' . $document->storagename;
+
+        if (!file_exists($filePath)) {
+            return $this->json(['error' => 'File not found']);
+        }
+
+        $data = file_get_contents($filePath);
+
+        return $this->response->download($document->originalname, $data);
+    }
+
+    public function removeDocument(int $documentID): ResponseInterface
+    {
+        $document = \Document::find($documentID);
+
+        $filePath = ROOTPATH . 'documents/' . $document->storagename;
+
+        if (file_exists($filePath)) {
+            unlink($filePath);
+        }
+
+        \Document::whereId($documentID)->delete();
+
+        return $this->json(['success' => true]);
+    }
+}
diff --git a/app/Controllers/Projects/EmployeeHoursController.php b/app/Controllers/Projects/EmployeeHoursController.php
new file mode 100644
index 0000000..88300ab
--- /dev/null
+++ b/app/Controllers/Projects/EmployeeHoursController.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Controllers\Projects;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class EmployeeHoursController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function getEmployeehours(int $month, int $year, int $employeeID): ResponseInterface
+    {
+        $sql = \EmployeehoursMonthly::fire($month, $year, $employeeID);
+
+        $db = \Config\Database::connect();
+        $query = $db->query($sql);
+
+        $result = $query->getResult();
+
+        return $this->json($result);
+    }
+
+    public function getHourtypes(): ResponseInterface
+    {
+        $hourtypes = \Hourtype::all();
+
+        return $this->json($hourtypes);
+    }
+
+    public function saveEmployeehour(): ResponseInterface
+    {
+        // TODO: validatie inbouwen
+        $data = $this->request->getPost();
+
+        $employeehourID = $data['id'];
+        $hourType = $data['hourType'];
+        $projectID = $data['project_id'];
+        unset($data['id']);
+        unset($data['hourType']);
+        unset($data['project_id']);
+
+        if ($hourType == 'OFFERS') {
+            $data['offer_id'] = $projectID;
+        }
+
+        $data['hourdate'] = date2mysql($data['hourdate']);
+
+        if ($hourType == 'PROJECTS') {
+            $projectemployee = \Projectemployee::select('id')
+                ->whereUserId($data['employee_id'])
+                ->whereProjectId($projectID)
+                ->first();
+            $data['projectemployee_id'] = $projectemployee->id;
+            unset($data['employee_id']);
+
+            $data['hourtype_id'] = $data['hourtype_id'] - 8;
+
+            $employeehourID = \Projecthour::saveProjecthour($data);
+        } elseif ($hourType == 'OFFERS') {
+            $data['projectemployee_id'] = $data['employee_id'];
+            unset($data['employee_id']);
+            $data['hourtype_id'] = $data['hourtype_id'] - 8;
+
+            $employeehourID = \Projecthour::saveProjecthour($data);
+        } else {
+            $employeehourID = \Employeehour::saveEmployeehour($data);
+        }
+
+        return $this->json(['employeehourID' => $employeehourID]);
+    }
+
+    public function removeEmployeehour(int $employeehourID, string $hourType): ResponseInterface
+    {
+        // TODO: check op delete
+        if ($hourType == 'OVERHEAD') {
+            \Employeehour::whereId($employeehourID)->delete();
+        } else {
+            \Projecthour::whereId($employeehourID)->delete();
+        }
+
+        return $this->json(['result' => true]);
+    }
+}
diff --git a/app/Controllers/Projects/OffersController.php b/app/Controllers/Projects/OffersController.php
new file mode 100644
index 0000000..26be686
--- /dev/null
+++ b/app/Controllers/Projects/OffersController.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Controllers\Projects;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class OffersController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getAllOffers(): ResponseInterface
+    {
+        $projectID = $this->cleanInput('projectID');
+        $archive = $this->cleanInput('archive');
+        $search = $this->cleanInput('search');
+        $order = $this->cleanInput('order');
+        $direction = $this->cleanInput('direction');
+
+        $offers = \Offer::getAllOffers($projectID, $archive, $search, $order, $direction);
+
+        return $this->json($offers);
+    }
+
+    public function getOffersWithoutProject(): ResponseInterface
+    {
+        $offersWithoutProject = \Offer::getOffersWithoutProject();
+
+        return $this->json($offersWithoutProject);
+    }
+
+    public function saveOffer(): ResponseInterface
+    {
+        $offerValidation = new \OfferValidation();
+
+        if (!$offerValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $offerValidation->getErrorMessages()
+            ]);
+        }
+
+        $offer = $this->request->getPost();
+
+        $offerID = $offer['id'];
+        unset($offer['id']);
+
+        $offerID = \Offer::saveOffer($offerID, $offer);
+
+        $createProject = $this->checkCreateproject($offerID);
+
+        return $this->json(['success' => true, 'offerID' => $offerID, 'createProject' => $createProject]);
+    }
+
+    public function archiveOffer(int $offerID, string $status): ResponseInterface
+    {
+        \Offer::whereId($offerID)->update(['archive' => $status]);
+        return $this->json(['success' => true]);
+    }
+
+    public function removeOffer(int $offerID): ResponseInterface
+    {
+        $removeOffer = new \RemoveOffer($offerID);
+
+        if ($removeOffer->getRemoveAllowed() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Offer::removeOffer($offerID);
+
+        return $this->json(['result' => true]);
+    }
+
+    private function checkCreateproject(int $offerID): bool
+    {
+        $offer = \Offer::find($offerID);
+
+        if (is_int($offer->project_id)) {
+            return false;
+        }
+        if (is_null($offer->accepteddate)) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/Controllers/Projects/ProjectsController.php b/app/Controllers/Projects/ProjectsController.php
new file mode 100644
index 0000000..18935f4
--- /dev/null
+++ b/app/Controllers/Projects/ProjectsController.php
@@ -0,0 +1,399 @@
+<?php
+
+namespace App\Controllers\Projects;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class ProjectsController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getAllProjects(): ResponseInterface
+    {
+        $archive = $this->cleanInput('archive');
+        $search = $this->cleanInput('search');
+        $order = $this->cleanInput('order');
+        $direction = $this->cleanInput('direction');
+
+        $projects = \Project::getAllProjects($archive, $search, $order, $direction);
+
+        return $this->json($projects);
+    }
+
+    public function getProject(int $projectID): ResponseInterface
+    {
+        $project = \Project::getProject($projectID);
+
+        // Get invoice details using the Invoices_model equivalent
+        $db = \Config\Database::connect();
+        $builder = $db->table('invoices');
+        $project->invoiceDetails = $builder
+            ->selectSum('invoiceamount', 'invoiceTotal')
+            ->selectSum('forecastamount', 'forecastTotal')
+            ->where('project_id', $project->id)
+            ->get()
+            ->getRow();
+
+        $project->hourTotals = \Projecthour::getTotalHoursPerProject($project->id);
+
+        return $this->json($project);
+    }
+
+    public function getAvailableEmployees(int $projectID): ResponseInterface
+    {
+        $availableEmployees = \Projectemployee::getAvailableEmployees($projectID);
+        return $this->json($availableEmployees);
+    }
+
+    public function addProject(): ResponseInterface
+    {
+        $projectID = \Project::createProject();
+        return $this->json($projectID);
+    }
+
+    public function creatProjectFromOffer(int $offerID): ResponseInterface
+    {
+        $offer = \Offer::find($offerID);
+
+        $offernumber = $offer->offernumber;
+        $projectnumber = 'P' . substr($offernumber, 1);
+
+        $data = [
+            'projectnumber' => $projectnumber,
+            'projectname' => $offer->offername,
+            'projectleader_id' => $offer->offerleader_id,
+            'startdate' => $offer->accepteddate,
+            'customer_id' => $offer->customer_id
+        ];
+
+        $project = \Project::create($data);
+
+        \Offer::whereId($offerID)->update(['project_id' => $project->id]);
+
+        \Projectemployee::firstOrCreateProjectemployee($offer->offerleader_id, $project->id);
+
+        $offerteHours = \Employeehour::whereOfferId($offerID)->get();
+        foreach ($offerteHours as $offerteHour) {
+            $projectemployee = \Projectemployee::firstOrCreateProjectemployee($offerteHour->employee_id, $project->id);
+
+            $data = [
+                'projectemployee_id' => $projectemployee->id,
+                'hourtype_id' => 10,
+                'hourdate' => $offerteHour->hourdate,
+                'hours' => $offerteHour->hours
+            ];
+
+            \Projecthour::create($data);
+            \Employeehour::whereId($offerteHour->id)->delete();
+        }
+
+        return $this->json(['success' => true, 'projectnumber' => $projectnumber]);
+    }
+
+    public function addProjectEmployee(int $projectID): ResponseInterface
+    {
+        \Projectemployee::createProjectEmployee($projectID);
+        return $this->json(['success' => true]);
+    }
+
+    public function saveProject(): ResponseInterface
+    {
+        $projectValidation = new \ProjectValidation();
+
+        if (!$projectValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $projectValidation->getErrorMessages()
+            ]);
+        }
+
+        $project = $this->request->getPost();
+
+        $projectID = $project['id'];
+        unset($project['id']);
+
+        $project['startdate'] = date2mysql($project['startdate']);
+        $project['enddate'] = date2mysql($project['enddate']);
+
+        $projectID = \Project::saveProject($projectID, $project);
+
+        \Offer::syncProjectname($projectID);
+
+        return $this->json(['success' => true, 'projectID' => $projectID]);
+    }
+
+    public function saveProjectemployee(): ResponseInterface
+    {
+        $projectemployeeValidation = new \ProjectemployeeValidation();
+
+        if (!$projectemployeeValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $projectemployeeValidation->getErrorMessages()
+            ]);
+        }
+
+        $projectemployee = $this->request->getPost();
+
+        $projectemployeeID = $projectemployee['id'];
+        unset($projectemployee['id']);
+
+        \Projectemployee::saveProjectemployee($projectemployeeID, $projectemployee);
+
+        return $this->json(['success' => true]);
+    }
+
+    public function saveInvoice(): ResponseInterface
+    {
+        $invoiceValidation = new \InvoiceValidation();
+
+        if (!$invoiceValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $invoiceValidation->getErrorMessages()
+            ]);
+        }
+
+        $invoice = $this->request->getPost();
+
+        $invoiceID = $invoice['id'];
+        unset($invoice['id']);
+
+        $invoice['invoicedate'] = date2mysql($invoice['invoicedate']);
+        $invoice['forecastdate'] = date2mysql($invoice['forecastdate']);
+        $invoice['invoiceamount'] = str_replace(',', '.', $invoice['invoiceamount'] ?? '');
+        $invoice['forecastamount'] = str_replace(',', '.', $invoice['forecastamount'] ?? '');
+
+        $invoiceID = \Invoice::saveInvoice($invoiceID, $invoice);
+
+        return $this->json(['success' => true, 'invoiceID' => $invoiceID]);
+    }
+
+    public function savePayment(): ResponseInterface
+    {
+        $paymentValidation = new \PaymentValidation();
+
+        if (!$paymentValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $paymentValidation->getErrorMessages()
+            ]);
+        }
+
+        $payment = $this->request->getPost();
+
+        $paymentID = $payment['id'];
+        unset($payment['id']);
+
+        $payment['paymentdate'] = date2mysql($payment['paymentdate']);
+        $payment['paymentamount'] = str_replace(',', '.', $payment['paymentamount'] ?? '');
+
+        $paymentID = \Payment::savePayment($paymentID, $payment);
+
+        return $this->json(['success' => true, 'paymentID' => $paymentID]);
+    }
+
+    public function saveProjectcost(): ResponseInterface
+    {
+        $projectcostValidation = new \ProjectcostValidation();
+
+        if (!$projectcostValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $projectcostValidation->getErrorMessages()
+            ]);
+        }
+
+        $projectcost = $this->request->getPost();
+
+        $projectcostID = $projectcost['id'];
+        unset($projectcost['id']);
+
+        $projectcost['date'] = date2mysql($projectcost['date']);
+
+        $projectcostID = \Projectcost::saveProjectcost($projectcostID, $projectcost);
+
+        return $this->json(['success' => true, 'projectcostID' => $projectcostID]);
+    }
+
+    public function saveProjecthour(): ResponseInterface
+    {
+        $projecthourValidation = new \ProjecthourValidation();
+
+        if (!$projecthourValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $projecthourValidation->getErrorMessages()
+            ]);
+        }
+
+        $projecthour = $this->request->getPost();
+
+        $projecthourID = $projecthour['id'];
+        unset($projecthour['id']);
+
+        $projecthour['hourdate'] = date2mysql($projecthour['hourdate']);
+
+        $paymentID = \Projecthour::saveProjecthour($projecthourID, $projecthour);
+
+        return $this->json(['success' => true, 'projecthourID' => $paymentID]);
+    }
+
+    public function saveForecast(): ResponseInterface
+    {
+        $forecastValidation = new \ForecastValidation();
+
+        if (!$forecastValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $forecastValidation->getErrorMessages()
+            ]);
+        }
+
+        $forecast = $this->request->getPost();
+
+        $forecastID = $forecast['id'];
+        unset($forecast['id']);
+
+        $forecastID = \Forecast::saveForecast($forecastID, $forecast);
+
+        return $this->json(['success' => true, 'forecastID' => $forecastID]);
+    }
+
+    public function saveReservation(): ResponseInterface
+    {
+        $reservationValidation = new \ReservationValidation();
+
+        if (!$reservationValidation->getValidationResult()) {
+            return $this->json([
+                'success' => false,
+                'messages' => $reservationValidation->getErrorMessages()
+            ]);
+        }
+
+        $reservation = $this->request->getPost();
+
+        $reservationID = $reservation['id'];
+        unset($reservation['id']);
+
+        $reservationID = \Reservation::saveReservation($reservationID, $reservation);
+
+        return $this->json(['success' => true, 'reservationID' => $reservationID]);
+    }
+
+    public function archiveProject(int $projectID, string $status): ResponseInterface
+    {
+        \Project::whereId($projectID)->update(['archive' => $status]);
+        return $this->json(['success' => true]);
+    }
+
+    public function removeProjectemployee(int $projectemployeeID): ResponseInterface
+    {
+        $removeProjectemployee = new \RemoveProjectemployee($projectemployeeID);
+
+        if ($removeProjectemployee->getRemoveAllowed() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Projectemployee::removeProjectemployee($projectemployeeID);
+
+        return $this->json(['result' => true]);
+    }
+
+    public function removeInvoice(int $invoiceID): ResponseInterface
+    {
+        $removeInvoice = new \RemoveInvoice($invoiceID);
+
+        if ($removeInvoice->getRemoveAllowed() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Invoice::whereId($invoiceID)->delete();
+
+        return $this->json(['result' => true]);
+    }
+
+    public function removeIncomingInvoice(int $invoiceID): ResponseInterface
+    {
+        \Projectcost::whereId($invoiceID)->delete();
+        return $this->json(['result' => true]);
+    }
+
+    public function removePayment(int $paymentID): ResponseInterface
+    {
+        $removePayment = new \RemovePayment($paymentID);
+
+        if ($removePayment->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Payment::removePayment($paymentID);
+
+        return $this->json(['result' => true]);
+    }
+
+    public function removeProjecthour(int $projecthourID): ResponseInterface
+    {
+        $removeProjecthour = new \RemoveProjecthour($projecthourID);
+
+        if ($removeProjecthour->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Projecthour::removeProjecthour($projecthourID);
+
+        return $this->json(['result' => true]);
+    }
+
+    public function removeForecast(int $forecastID): ResponseInterface
+    {
+        $removeForecast = new \RemoveForecast($forecastID);
+
+        if ($removeForecast->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Forecast::removeForecast($forecastID);
+
+        return $this->json(['result' => true]);
+    }
+
+    public function removeReservation(int $reservationID): ResponseInterface
+    {
+        $removeReservation = new \RemoveReservation($reservationID);
+
+        if ($removeReservation->getAllowDelete() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Reservation::removeReservation($reservationID);
+
+        return $this->json(['result' => true]);
+    }
+
+    public function removeProject(int $projectID): ResponseInterface
+    {
+        $removeProject = new \RemoveProject($projectID);
+
+        if ($removeProject->getRemoveAllowed() === false) {
+            return $this->json(['result' => false]);
+        }
+
+        \Project::removeProject($projectID);
+
+        return $this->json(['result' => true]);
+    }
+}
diff --git a/app/Controllers/Reports/ReportsController.php b/app/Controllers/Reports/ReportsController.php
new file mode 100644
index 0000000..6788727
--- /dev/null
+++ b/app/Controllers/Reports/ReportsController.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Controllers\Reports;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class ReportsController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function recapProjects(string $archive): ResponseInterface
+    {
+        $field = $this->request->getPost('field');
+        $direction = $this->request->getPost('direction');
+
+        $recapprojects = new \Recapprojects($archive, $field, $direction);
+
+        $projects = $recapprojects->getProjects();
+
+        return $this->json($projects);
+    }
+
+    public function getMonthlyEmployeeHoursPerProject(int $employeeID, int $year): ResponseInterface
+    {
+        $monthlyhours = \Projecthour::getMonthlyEmployeeHoursPerProject($employeeID, $year);
+
+        return $this->json($monthlyhours);
+    }
+
+    public function getMonthlyEmployeehours(int $month, int $year): ResponseInterface
+    {
+        $sql = \QEmployeeHours::fire($month, $year);
+
+        $db = \Config\Database::connect();
+        $query = $db->query($sql);
+
+        $result = $query->getResult();
+
+        foreach ($result as $user) {
+            $user->targethours = \Employeetarget::getTargetHoursPerEmployee($user->user_id, $year, $month);
+        }
+
+        return $this->json($result);
+    }
+
+    public function getInvoiceOverview(int $year, string $orderType, string $orderDirection, string $archive): ResponseInterface
+    {
+        $invoices = new \Invoices($year, $orderType, $orderDirection, $archive);
+
+        $invoiceReport = $invoices->getInvoiceReport();
+
+        return $this->json($invoiceReport);
+    }
+
+    public function createInvoicesSpreadsheet(int $year, string $orderType, string $orderDirection, string $archive): ResponseInterface
+    {
+        $invoices = new \Invoices($year, $orderType, $orderDirection, $archive);
+
+        $invoiceReport = $invoices->getInvoiceReport();
+
+        new \InvoiceSpreadsheet($invoiceReport);
+
+        return $this->json(['success' => true]);
+    }
+
+    public function saveCurrentFinnacialYear(int $projectID): ResponseInterface
+    {
+        $amount = $this->request->getPost('amount');
+
+        \Project::whereId($projectID)->update(['current_financial_year' => $amount]);
+
+        return $this->json(['success' => true]);
+    }
+}
diff --git a/app/Controllers/Reports/ReportsdefaultController.php b/app/Controllers/Reports/ReportsdefaultController.php
new file mode 100644
index 0000000..825d6fe
--- /dev/null
+++ b/app/Controllers/Reports/ReportsdefaultController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers\Reports;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class ReportsdefaultController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function index()
+    {
+        // Default action
+    }
+
+    public function getUsedYears(): ResponseInterface
+    {
+        $years = \Projecthour::getUsedYears();
+
+        return $this->json($years);
+    }
+}
diff --git a/app/Controllers/Reports/ReservationsController.php b/app/Controllers/Reports/ReservationsController.php
new file mode 100644
index 0000000..819af69
--- /dev/null
+++ b/app/Controllers/Reports/ReservationsController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Controllers\Reports;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class ReservationsController extends BaseController
+{
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            die('NO ACCESS');
+        }
+    }
+
+    public function getReservations(): ResponseInterface
+    {
+        $sql = \ReservationTotals::fire();
+
+        $db = \Config\Database::connect();
+        $query = $db->query($sql);
+
+        $results = $query->getResult();
+
+        $projects = [];
+        foreach ($results as $result) {
+            if (!isset($projects[$result->projectID])) {
+                $projects[$result->projectID] = [
+                    'projectnumber'   => $result->projectnumber,
+                    'projectname'     => $result->projectname,
+                    'costs'           => 0,
+                    'reservation'     => 0,
+                    'payed'           => 0,
+                    'fromreservation' => 0,
+                    'saldo'           => 0,
+                    'saldoToPay'      => 0,
+                    'other_revenue'   => 0,
+                    'customers'       => [],
+                    'externals'       => []
+                ];
+            }
+
+            $projects[$result->projectID]['reservation'] += $result->reservation;
+            $projects[$result->projectID]['costs'] += $result->costs;
+            $projects[$result->projectID]['payed'] += $result->payed;
+            $projects[$result->projectID]['fromreservation'] += $result->fromreservation;
+            $projects[$result->projectID]['saldo'] += $result->saldo;
+            $projects[$result->projectID]['saldoToPay'] += $result->saldoToPay;
+            $projects[$result->projectID]['other_revenue'] = $result->other_revenue;
+
+            $projects[$result->projectID]['externals'][] = [
+                'external'        => $result->contactperson,
+                'reservation'     => $result->reservation,
+                'costs'           => $result->costs,
+                'payed'           => $result->payed,
+                'saldo'           => $result->saldo,
+                'fromreservation' => $result->fromreservation,
+                'saldoToPay'      => $result->saldoToPay
+            ];
+        }
+
+        return $this->json($projects);
+    }
+}
diff --git a/app/Filters/AuthFilter.php b/app/Filters/AuthFilter.php
new file mode 100644
index 0000000..11a71f6
--- /dev/null
+++ b/app/Filters/AuthFilter.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class AuthFilter implements FilterInterface
+{
+    /**
+     * Check if user is authenticated
+     *
+     * @param RequestInterface $request
+     * @param array|null       $arguments
+     *
+     * @return RequestInterface|ResponseInterface|string|void
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        // Check if user is authenticated
+        if (!defined('AUTHENTICATED') || AUTHENTICATED === false) {
+            // Check if this is an AJAX request
+            if ($request->isAJAX()) {
+                return \Config\Services::response()
+                    ->setStatusCode(401)
+                    ->setJSON(['error' => 'Unauthorized']);
+            }
+
+            // Redirect to login page
+            return redirect()->to('/');
+        }
+    }
+
+    /**
+     * Allows After filters to inspect and modify the response
+     * object as needed.
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array|null        $arguments
+     *
+     * @return ResponseInterface|void
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // No action needed after request
+    }
+}
diff --git a/app/Helpers/common_helper.php b/app/Helpers/common_helper.php
new file mode 100644
index 0000000..083d864
--- /dev/null
+++ b/app/Helpers/common_helper.php
@@ -0,0 +1,331 @@
+<?php
+
+/**
+ * Common helper functions for DBOIS application
+ * Migrated from CodeIgniter 3 to CodeIgniter 4
+ */
+
+if (!function_exists('dump')) {
+    /**
+     * Dump helper - dumps variables to the screen in a nicely formatted manner
+     */
+    function dump($var, string $label = 'Dump', bool $echo = true): ?string
+    {
+        ob_start();
+        var_dump($var);
+        $output = ob_get_clean();
+
+        // Add formatting
+        $output = preg_replace("/]=>n(s+)/m", "] => ", $output);
+        $output = '<pre style="background: #FFFEEF; color: #000; border: 1px dotted #000; padding: 10px; margin: 10px 0; text-align: left;">' . $label . ' => ' . $output . '</pre>';
+
+        if ($echo) {
+            echo $output;
+            return null;
+        }
+
+        return $output;
+    }
+}
+
+if (!function_exists('dump_exit')) {
+    /**
+     * Dump and exit
+     */
+    function dump_exit($var, string $label = 'Dump', bool $echo = true): void
+    {
+        dump($var, $label, $echo);
+        exit;
+    }
+}
+
+if (!function_exists('mysql2text')) {
+    function mysql2text(?string $message): string
+    {
+        $regeleinden = ['\r\n', '\r', '\n'];
+        $message = str_replace($regeleinden, chr(13), $message ?? '');
+        $message = stripslashes($message);
+
+        return $message;
+    }
+}
+
+if (!function_exists('mysql2html')) {
+    function mysql2html(?string $message): string
+    {
+        $regeleinden = ['\r\n', '\r', '\n'];
+        $message = str_replace($regeleinden, "<br />", $message ?? '');
+        $message = stripslashes($message);
+
+        return $message;
+    }
+}
+
+if (!function_exists('textarea2html')) {
+    function textarea2html(?string $message): string
+    {
+        $regeleinden = [chr(13)];
+        $message = str_replace($regeleinden, "<br />", $message ?? '');
+        $message = stripslashes($message);
+
+        return $message;
+    }
+}
+
+if (!function_exists('date2mysql')) {
+    function date2mysql(?string $date): ?string
+    {
+        if (!check_date($date)) {
+            return null;
+        }
+
+        return date('Y-m-d', strtotime($date));
+    }
+}
+
+if (!function_exists('mysql2date')) {
+    function mysql2date(?string $date): string
+    {
+        if (!check_date($date)) {
+            return '';
+        }
+
+        return date('d-m-Y', strtotime($date));
+    }
+}
+
+if (!function_exists('mysql2dateWithTime')) {
+    function mysql2dateWithTime(?string $date): string
+    {
+        if (!check_date($date)) {
+            return '';
+        }
+
+        return date('d-m-Y H:i:s', strtotime($date));
+    }
+}
+
+if (!function_exists('check_date')) {
+    function check_date(?string $date): bool
+    {
+        if (is_null($date) || strlen($date) < 6) {
+            return false;
+        }
+
+        return true;
+    }
+}
+
+if (!function_exists('mysql2timestamp')) {
+    function mysql2timestamp(string $date): int
+    {
+        $a = strptime($date, '%Y-%m-%d');
+        $timestamp = mktime(0, 0, 0, $a['tm_mon'] + 1, $a['tm_mday'], $a['tm_year'] + 1900);
+
+        return $timestamp;
+    }
+}
+
+if (!function_exists('readTextFromStorage')) {
+    function readTextFromStorage(?string $text): string
+    {
+        return base64_decode($text ?? '');
+    }
+}
+
+if (!function_exists('cleanTextForStorage')) {
+    function cleanTextForStorage(?string $text): string
+    {
+        $text = str_replace('/r/n', '', $text ?? '');
+        $text = str_replace('\r\n', '', $text);
+        $text = str_replace('/n', '', $text);
+        $text = str_replace('\n', '', $text);
+        $text = stripslashes($text);
+
+        return base64_encode($text);
+    }
+}
+
+if (!function_exists('setTextareaForStorage')) {
+    function setTextareaForStorage(?string $text): string
+    {
+        $text = setTextArea($text);
+
+        return base64_encode($text);
+    }
+}
+
+if (!function_exists('setTextArea')) {
+    function setTextArea(?string $text): string
+    {
+        $text = str_replace('/r/n', chr(13), $text ?? '');
+        $text = str_replace('\r\n', chr(13), $text);
+        $text = str_replace('/n', chr(13), $text);
+        $text = str_replace('\n', chr(13), $text);
+        $text = str_replace('\r', chr(13), $text);
+        $text = str_replace('/r', chr(13), $text);
+        $text = str_replace('\n\n', chr(13) . chr(13), $text);
+        $text = stripslashes($text);
+
+        return $text;
+    }
+}
+
+if (!function_exists('setTextAreaHtml')) {
+    function setTextAreaHtml(?string $text): string
+    {
+        $text = str_replace('/r/n', '<br />', $text ?? '');
+        $text = str_replace('\r\n', '<br />', $text);
+        $text = str_replace('/n', '<br />', $text);
+        $text = str_replace('\n', '<br />', $text);
+        $text = str_replace('\r', '<br />', $text);
+        $text = str_replace('/r', '<br />', $text);
+        $text = str_replace('\n\n', '<br /><br />', $text);
+        $text = stripslashes($text);
+
+        return $text;
+    }
+}
+
+if (!function_exists('checkBsn')) {
+    function checkBsn(string $bsn): bool
+    {
+        return true;
+    }
+}
+
+if (!function_exists('isNotNullOrEmpty')) {
+    /**
+     * Validate an object property
+     */
+    function isNotNullOrEmpty($in, ?string $property = null, bool $zeroAllowed = false): bool
+    {
+        if ($property === null) {
+            if (is_object($in) && count((array)$in) === 0) {
+                return false;
+            }
+            $isNotEmpty = $zeroAllowed ? !empty($in) : $in === 0 || $in === '0' || !empty($in);
+            if (is_string($in)) {
+                return $isNotEmpty && strtoupper($in) !== 'NULL' && strtoupper($in) !== 'FALSE' && strtoupper($in) !== 'UNDEFINED';
+            }
+
+            return $isNotEmpty;
+        }
+
+        if (!is_object($in)) {
+            throw new Exception('Provided test $in must be a class instance(object) or a valid classname(string)');
+        }
+        if (!property_exists($in, $property)) {
+            return false;
+        }
+        $prop = $in->{$property};
+        $isNotEmpty = $zeroAllowed ? !empty($prop) : $prop === 0 || $prop === '0' || !empty($prop);
+        if (is_string($prop)) {
+            return $isNotEmpty && strtoupper($prop) !== 'NULL' && strtoupper($prop) !== 'FALSE' && strtoupper($prop) !== 'UNDEFINED';
+        }
+
+        return $isNotEmpty;
+    }
+}
+
+if (!function_exists('isNotNullOrEmptyOrZero')) {
+    function isNotNullOrEmptyOrZero($in, ?string $property = null): bool
+    {
+        return isNotNullOrEmpty($in, $property, true);
+    }
+}
+
+if (!function_exists('isNullOrEmpty')) {
+    function isNullOrEmpty($in, ?string $property = null): bool
+    {
+        return !isNotNullOrEmpty($in, $property);
+    }
+}
+
+if (!function_exists('isNullOrEmptyOrZero')) {
+    function isNullOrEmptyOrZero($in, ?string $property = null): bool
+    {
+        return !isNotNullOrEmpty($in, $property, true);
+    }
+}
+
+if (!function_exists('parseNotNullField')) {
+    function parseNotNullField($in): string
+    {
+        if (isNullOrEmpty($in)) {
+            return '';
+        }
+
+        return (string)$in;
+    }
+}
+
+if (!function_exists('unique_multidim_array')) {
+    function unique_multidim_array(array $array, string $key): array
+    {
+        $temp_array = [];
+        $key_array = [];
+
+        foreach ($array as $val) {
+            $keyValue = is_array($val) ? $val[$key] : $val->$key;
+            if (!in_array($keyValue, $key_array)) {
+                $key_array[] = $keyValue;
+                $temp_array[] = $val;
+            }
+        }
+
+        return $temp_array;
+    }
+}
+
+if (!function_exists('validate_password_strength')) {
+    /**
+     * Validate password strength
+     * Password must contain:
+     * - At least 8 characters
+     * - At least 1 uppercase letter
+     * - At least 1 lowercase letter
+     * - At least 1 number
+     * - At least 1 special character
+     */
+    function validate_password_strength(string $password): bool
+    {
+        if (strlen($password) < 8) {
+            return false;
+        }
+
+        if (!preg_match('/[A-Z]/', $password)) {
+            return false;
+        }
+
+        if (!preg_match('/[a-z]/', $password)) {
+            return false;
+        }
+
+        if (!preg_match('/[0-9]/', $password)) {
+            return false;
+        }
+
+        if (!preg_match('/[^A-Za-z0-9]/', $password)) {
+            return false;
+        }
+
+        return true;
+    }
+}
+
+if (!function_exists('get_password_requirements_nl')) {
+    /**
+     * Get password validation requirements in Dutch
+     */
+    function get_password_requirements_nl(): array
+    {
+        return [
+            'Minimaal 8 karakters',
+            'Minimaal 1 hoofdletter',
+            'Minimaal 1 kleine letter',
+            'Minimaal 1 cijfer',
+            'Minimaal 1 speciaal teken (!@#$%^&* etc.)'
+        ];
+    }
+}
diff --git a/app/Libraries/Beheer/Customer/RemoveCustomer.php b/app/Libraries/Beheer/Customer/RemoveCustomer.php
new file mode 100644
index 0000000..1fd17f4
--- /dev/null
+++ b/app/Libraries/Beheer/Customer/RemoveCustomer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveCustomer {
+
+    private $customerID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $userID )
+    {
+        $this->setCustomerID( $userID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setCustomerID( $customerID )
+    {
+        $this->customerID = $customerID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Beheer/Externals/RemoveExternal.php b/app/Libraries/Beheer/Externals/RemoveExternal.php
new file mode 100644
index 0000000..88dd9fd
--- /dev/null
+++ b/app/Libraries/Beheer/Externals/RemoveExternal.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveExternal {
+
+    private $externalID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $userID )
+    {
+        $this->setExternalID( $userID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setExternalID( $externalID )
+    {
+        $this->externalID = $externalID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Beheer/Session/CreateUserSession.php b/app/Libraries/Beheer/Session/CreateUserSession.php
new file mode 100644
index 0000000..884aafd
--- /dev/null
+++ b/app/Libraries/Beheer/Session/CreateUserSession.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Libraries\Beheer\Session;
+
+use CodeIgniter\Session\Session;
+
+class CreateUserSession
+{
+    private Session $session;
+    private object $user;
+    private array $sessionArray = [];
+
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    public function handle(object $user): void
+    {
+        $this->setUser($user);
+        $this->setSessionArray();
+        $this->createSession();
+    }
+
+    private function setUser(object $user): void
+    {
+        $this->user = $user;
+    }
+
+    private function setSessionArray(): void
+    {
+        $this->sessionArray = [
+            'userID' => $this->user->id,
+            'role'   => $this->user->role
+        ];
+    }
+
+    private function createSession(): void
+    {
+        $this->session->set($this->sessionArray);
+    }
+}
diff --git a/app/Libraries/Beheer/Session/RetrieveUserSession.php b/app/Libraries/Beheer/Session/RetrieveUserSession.php
new file mode 100644
index 0000000..bd2ff8b
--- /dev/null
+++ b/app/Libraries/Beheer/Session/RetrieveUserSession.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Libraries\Beheer\Session;
+
+use CodeIgniter\Session\Session;
+
+class RetrieveUserSession
+{
+    private Session $session;
+
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    public function handle(): void
+    {
+        $this->setUserID();
+        $this->setRole();
+        $this->setAuthenticated();
+    }
+
+    private function setUserID(): void
+    {
+        $userId = $this->session->get('userID');
+        if (!defined('USERID')) {
+            define('USERID', $userId);
+        }
+    }
+
+    private function setRole(): void
+    {
+        $role = $this->session->get('role');
+        if (!defined('ROLE')) {
+            define('ROLE', $role);
+        }
+    }
+
+    private function setAuthenticated(): void
+    {
+        if (!defined('AUTHENTICATED')) {
+            define('AUTHENTICATED', USERID ? true : false);
+        }
+    }
+}
diff --git a/app/Libraries/Beheer/TwoFactor/SendOtpEmail.php b/app/Libraries/Beheer/TwoFactor/SendOtpEmail.php
new file mode 100644
index 0000000..c6c079d
--- /dev/null
+++ b/app/Libraries/Beheer/TwoFactor/SendOtpEmail.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Send OTP Email Library
+ * Generates and sends a one-time password via email for two-factor authentication
+ */
+class SendOtpEmail
+{
+    private $user;
+    private $otpCode;
+    private $sendResult = false;
+
+    public function __construct($user)
+    {
+        $this->user = $user;
+        $this->handle();
+    }
+
+    /**
+     * Get the result of the email send operation
+     * @return bool True if email was sent successfully
+     */
+    public function getSendResult()
+    {
+        return $this->sendResult;
+    }
+
+    /**
+     * Get the generated OTP code (for testing purposes)
+     * @return string The OTP code
+     */
+    public function getOtpCode()
+    {
+        return $this->otpCode;
+    }
+
+    /**
+     * Main handler for OTP email process
+     */
+    private function handle()
+    {
+        $this->generateOTP();
+        $this->sendOTPEmail();
+    }
+
+    /**
+     * Generate a new OTP code
+     */
+    private function generateOTP()
+    {
+        // Generate OTP valid for 10 minutes
+        $this->otpCode = \UserOtp_model::generateOTP($this->user->id, 10);
+    }
+
+    /**
+     * Send the OTP code via email
+     */
+    private function sendOTPEmail()
+    {
+        $email = \Config\Services::email();
+
+        // Build email configuration directly from environment variables
+        $config = [
+            'protocol'   => str_replace(',', '', $_ENV['PROTOCOL'] ?? 'smtp'),
+            'SMTPHost'   => str_replace(',', '', $_ENV['SMTP_HOST'] ?? ''),
+            'SMTPUser'   => str_replace(',', '', $_ENV['SMTP_USER'] ?? ''),
+            'SMTPPass'   => str_replace(',', '', $_ENV['SMTP_PASS'] ?? ''),
+            'SMTPPort'   => (int) str_replace(',', '', $_ENV['SMTP_PORT'] ?? 25),
+            'SMTPCrypto' => 'tls',
+            'SMTPTimeout' => 30,
+            'charset'    => 'UTF-8',
+            'mailType'   => 'html',
+            'newline'    => "\r\n",
+            'CRLF'       => "\r\n",
+            'wordWrap'   => true,
+        ];
+
+        $email->initialize($config);
+
+        $data = [
+            'username'   => $this->user->username,
+            'firstname'  => $this->user->firstname,
+            'middlename' => $this->user->middlename,
+            'lastname'   => $this->user->lastname,
+            'otp_code'   => $this->otpCode
+        ];
+
+        $html = view('emails/twofactor_otp_email', ['user' => $data]);
+
+        $email->setFrom('noreply@dbois.nl', 'DBOIS');
+        $email->setTo($this->user->email);
+        $email->setSubject('DBOIS Tweefactorauthenticatie - Verificatiecode');
+        $email->setMessage($html);
+
+        $this->sendResult = $email->send();
+
+        if (!$this->sendResult) {
+            log_message('error', 'Failed to send 2FA OTP email to ' . $this->user->email . ': ' . $email->printDebugger());
+        }
+    }
+}
diff --git a/app/Libraries/Beheer/User/CreateUser.php b/app/Libraries/Beheer/User/CreateUser.php
new file mode 100644
index 0000000..f215e4d
--- /dev/null
+++ b/app/Libraries/Beheer/User/CreateUser.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 26/12/2017
+ * Time: 12:39
+ */
+
+class CreateUser {
+
+    public function __construct()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Beheer/User/PasswordRecipe.php b/app/Libraries/Beheer/User/PasswordRecipe.php
new file mode 100644
index 0000000..de399cc
--- /dev/null
+++ b/app/Libraries/Beheer/User/PasswordRecipe.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 26/12/2017
+ * Time: 12:40
+ */
+
+
+class PasswordRecipe {
+
+    private $password = FALSE;
+    private $salt     = FALSE;
+    private $saltedPassword;
+
+    public function __construct()
+    {
+        $this->handle();
+    }
+
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    public function getSalt()
+    {
+        return $this->salt;
+    }
+
+    public function getSaltedPassword()
+    {
+        return $this->saltedPassword;
+    }
+
+    public function setPassword( $password )
+    {
+        $this->password = $password;
+    }
+
+    public function setSalt( $salt )
+    {
+        $this->salt = $salt;
+    }
+
+    private function handle()
+    {
+        $this->checkPassword();
+
+        $this->checkSalt();
+
+        $this->setSaltedPassword();
+    }
+
+    private function checkPassword()
+    {
+        if ( ! $this->password ) $this->createPassword();
+
+        if ( strlen( $this->password ) < 6 ) return;
+    }
+
+    private function checkSalt()
+    {
+        if ( ! $this->salt ) $this->createSalt();
+    }
+
+    private function createPassword()
+    {
+        $pass = $this->getRandomString( 8 );
+
+        $this->password = $pass;
+    }
+
+    private function createSalt()
+    {
+        $salt = $this->getRandomString( 18 );
+
+        $this->salt = sha1($salt);
+    }
+
+    private function setSaltedPassword()
+    {
+        $this->saltedPassword = User::getSaltedPassword( $this->password, $this->salt);
+    }
+
+    private function getRandomString( $length = 8 )
+    {
+        $rand = '';
+        $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+        $alphaLength = strlen( $alphabet ) - 1; //put the length -1 in cache
+        for ( $i = 0; $i < $length; $i ++ )
+        {
+            $n = rand( 0, $alphaLength );
+            $rand .= $alphabet[ $n ];
+        }
+
+        return $rand;
+    }
+}
diff --git a/app/Libraries/Beheer/User/RemoveUser.php b/app/Libraries/Beheer/User/RemoveUser.php
new file mode 100644
index 0000000..eb04c3b
--- /dev/null
+++ b/app/Libraries/Beheer/User/RemoveUser.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveUser {
+
+    private $userID;
+    private $allowDelete=FALSE;
+
+    public function __construct( $userID )
+    {
+        $this->setUserID($userID);
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setUserID( $userID )
+    {
+        $this->userID = $userID;
+    }
+
+    private function handle()
+    {
+        //$this->checkIfUserHasProjects();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Beheer/User/RequestPassword.php b/app/Libraries/Beheer/User/RequestPassword.php
new file mode 100644
index 0000000..b8a5c47
--- /dev/null
+++ b/app/Libraries/Beheer/User/RequestPassword.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 28/07/2018
+ * Time: 14:31
+ */
+
+class RequestPassword {
+
+    private $ci;
+    private $salt;
+    private $user;
+    private $password;
+    private $sendResult;
+    private $passwordRecipe;
+    private $saltedPassword;
+
+    public function __construct( $user )
+    {
+        $this->ci =& get_instance();
+
+        $this->user = $user;
+
+        $this->ci->load->library( 'email' );
+
+        $this->handle();
+    }
+
+    public function getSendResult()
+    {
+        return $this->sendResult;
+    }
+
+    private function handle()
+    {
+        $this->createPassword();
+
+        $this->setPassword();
+
+        $this->setSalt();
+
+        $this->setSaltedPassword();
+
+        $this->persistNewpassword();
+
+        $this->sendNewPassword();
+    }
+
+    private function createPassword()
+    {
+        $this->passwordRecipe = new PasswordRecipe();
+    }
+
+    private function setPassword()
+    {
+        $this->password = $this->passwordRecipe->getPassword();
+    }
+
+    private function setSalt()
+    {
+        $this->salt = $this->passwordRecipe->getsalt();
+    }
+
+    private function setSaltedPassword()
+    {
+        $this->saltedPassword = $this->passwordRecipe->getSaltedPassword();
+    }
+
+    private function persistNewPassword()
+    {
+        $data = [
+            'password' => $this->saltedPassword,
+            'salt'     => $this->salt
+        ];
+
+        User::whereId( $this->user->id )->update( $data );
+    }
+
+    private function sendNewPassword()
+    {
+        $data = [
+            'username'   => $this->user->username,
+            'firstname'  => $this->user->firstname,
+            'middlename' => $this->user->middlename,
+            'lastname'   => $this->user->lastname,
+            'password'   => $this->password
+        ];
+
+        $html = $this->ci->load->view( 'emails/requestpassword_email', ['user'=>$data], true );
+
+        $this->ci->email->from( 'noreply@dbois.nl', 'DBOIS' );
+        $this->ci->email->to( $this->user->email );
+        $this->ci->email->subject( 'Nieuw wachtwoord DBOIS' );
+        $this->ci->email->message( $html );
+        $this->ci->email->set_mailtype("html");
+        $this->ci->email->set_newline("\r\n");
+
+        $this->sendResult = $this->ci->email->send();
+
+        if( ! $this->sendResult ) log_message( 'error', json_encode($this->ci->email->print_debugger()));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Beheer/User/UserCreation.php b/app/Libraries/Beheer/User/UserCreation.php
new file mode 100644
index 0000000..c700fb9
--- /dev/null
+++ b/app/Libraries/Beheer/User/UserCreation.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 14:10
+ */
+
+class UserCreation {
+
+    private $user;
+    private $passWordRecipe;
+    private $password;
+    private $saltedPassword;
+    private $salt;
+
+    public function __construct( $user )
+    {
+        $this->setUser( $user );
+
+        $this->handle();
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    private function setUser( $user )
+    {
+        $this->user = $user;
+    }
+
+    private function handle()
+    {
+        $this->passWordRecipe = new PasswordRecipe();
+
+        $this->setPassword();
+
+        $this->setSalt();
+
+        $this->setSaltedPassword();
+
+        $this->enrichUser();
+    }
+
+    private function setPassword()
+    {
+        $this->password = $this->passWordRecipe->getPassword();
+    }
+
+    private function setSalt()
+    {
+        $this->salt = $this->passWordRecipe->getSalt();
+    }
+
+    private function setSaltedPassword()
+    {
+        $this->saltedPassword = $this->passWordRecipe->getSaltedPassword();
+    }
+
+    private function enrichUser()
+    {
+        $this->user['password'] = $this->saltedPassword;
+        $this->user['salt'] = $this->salt;
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Deletions/RemoveInvoice.php b/app/Libraries/Deletions/RemoveInvoice.php
new file mode 100644
index 0000000..c217630
--- /dev/null
+++ b/app/Libraries/Deletions/RemoveInvoice.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/06/2018
+ * Time: 17:06
+ */
+
+class RemoveInvoice {
+
+    private $invoiceID;
+    private $payments;
+    private $removeAllowed;
+
+    public function __construct( $invoiceID )
+    {
+        $this->setInvoiceID( $invoiceID );
+
+        $this->handle();
+    }
+
+    public function getRemoveAllowed()
+    {
+        return $this->removeAllowed;
+    }
+
+    private function setInvoiceID( $invoiceID )
+    {
+        $this->invoiceID = $invoiceID;
+    }
+
+    private function handle()
+    {
+        $this->setPayment();
+
+        $this->setRemoveAllowed();
+    }
+
+    private function setPayment()
+    {
+        $payments = Payment::whereInvoiceId( $this->invoiceID );
+
+        $this->payments = $payments->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setRemoveAllowed()
+    {
+        if ( $this->payments === FALSE ) return $this->removeAllowed = FALSE;
+
+        $this->removeAllowed = TRUE;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Deletions/RemoveInvoices.php b/app/Libraries/Deletions/RemoveInvoices.php
new file mode 100644
index 0000000..afc9629
--- /dev/null
+++ b/app/Libraries/Deletions/RemoveInvoices.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/06/2018
+ * Time: 15:56
+ */
+
+class RemoveInvoices {
+
+    private $invoiceID;
+    private $payments;
+    private $removeAllowed;
+
+    public function __construct( $invoiceID )
+    {
+        $this->setInvoiceID($invoiceID);
+
+        $this->handle();
+    }
+
+    private function setInvoiceID( $invoiceID )
+    {
+        $this->invoiceID = $invoiceID;
+    }
+
+    private function handle()
+    {
+        $this->setPayments();
+
+        $this->setRemoveAllowed();
+    }
+
+    private function setPayments()
+    {
+        $payments = Payment::whereInvoiceId($this->invoiceID);
+
+        $this->payments = $payments->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setRemoveAllowed()
+    {
+        $this->removeAllowed = $this->payments;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Deletions/RemoveOffer.php b/app/Libraries/Deletions/RemoveOffer.php
new file mode 100644
index 0000000..3d74389
--- /dev/null
+++ b/app/Libraries/Deletions/RemoveOffer.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/06/2018
+ * Time: 16:28
+ */
+
+class RemoveOffer {
+
+    private $offerID;
+    private $project;
+    private $removeAllowed;
+
+    public function __construct($offerID)
+    {
+        $this->setOfferID($offerID);
+
+        $this->handle();
+    }
+
+    public function getRemoveAllowed()
+    {
+        return $this->removeAllowed;
+    }
+
+    private function setOfferID( $offerID )
+    {
+        $this->offerID = $offerID;
+    }
+
+    private function handle()
+    {
+        $this->setProject();
+
+        $this->setRemoveAllowed();
+    }
+
+    private function setProject()
+    {
+        $offer = Offer::Find($this->offerID);
+
+        $this->project = is_null($offer->project_id) ? TRUE : FALSE;
+    }
+
+    private function setRemoveAllowed()
+    {
+        if( $this->project === FALSE ) return $this->removeAllowed = FALSE;
+
+        $this->removeAllowed = TRUE;
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Deletions/RemoveProject.php b/app/Libraries/Deletions/RemoveProject.php
new file mode 100644
index 0000000..c47dd1a
--- /dev/null
+++ b/app/Libraries/Deletions/RemoveProject.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/06/2018
+ * Time: 15:53
+ */
+
+class RemoveProject {
+
+    private $projectID;
+    private $forecast;
+    private $invoices;
+    private $projectemployees;
+    private $reservations;
+    private $removeAllowed;
+    private $projectcosts;
+
+    public function __construct( $projectID )
+    {
+        $this->setProjectID( $projectID );
+
+        $this->handle();
+    }
+
+    public function getRemoveAllowed()
+    {
+        return $this->removeAllowed;
+    }
+
+    private function setProjectID( $projectID )
+    {
+        $this->projectID = $projectID;
+    }
+
+    private function handle()
+    {
+        $this->setForecast();
+
+        $this->setInvoices();
+
+        $this->setProjectemployees();
+
+        $this->setReservations();
+
+        $this->setRemoveAllowed();
+
+        $this->setProjectCosts();
+    }
+
+    private function setForecast()
+    {
+        $forecast = Forecast::whereProjectId( $this->projectID );
+
+        $this->forecast = $forecast->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setInvoices()
+    {
+        $invoices = Invoice::whereProjectId( $this->projectID );
+
+        $this->invoices = $invoices->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setProjectemployees(  )
+    {
+        $setProjectemployees = Projectemployee::whereProjectId($this->projectID);
+
+        $this->projectemployees = $setProjectemployees->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setReservations(  )
+    {
+        $reservations = Reservation::whereProjectId($this->projectID);
+
+        $this->reservations = $reservations->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setProjectcosts(  )
+    {
+        $projectcosts = Projectcost::whereProjectId($this->projectID);
+
+        $this->projectcosts = $projectcosts->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setRemoveAllowed()
+    {
+        if( $this->forecast === false ) return $this->removeAllowed = FALSE;
+        if( $this->invoices === false ) return $this->removeAllowed = FALSE;
+        if( $this->projectemployees === false ) return $this->removeAllowed = FALSE;
+        if( $this->reservations === false ) return $this->removeAllowed = FALSE;
+        if( $this->projectcosts === false ) return $this->removeAllowed = FALSE;
+
+        $this->removeAllowed = TRUE;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Deletions/RemoveProjectemployee.php b/app/Libraries/Deletions/RemoveProjectemployee.php
new file mode 100644
index 0000000..9c8e56e
--- /dev/null
+++ b/app/Libraries/Deletions/RemoveProjectemployee.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveProjectemployee {
+
+    private $projectemployeeID;
+    private $removeAllowed;
+    private $projecthours;
+
+    public function __construct( $projectemployeeID )
+    {
+        $this->setProjectemployeeID( $projectemployeeID );
+
+        $this->handle();
+    }
+
+    public function getRemoveAllowed()
+    {
+        return $this->removeAllowed;
+    }
+
+    private function setProjectemployeeID( $projectemployeeID )
+    {
+        $this->projectemployeeID = $projectemployeeID;
+    }
+
+    private function handle()
+    {
+        $this->setProjectHours();
+
+        $this->setRemoveAllowed();
+    }
+
+    private function setProjecthours()
+    {
+        $projecthours = Projecthour::whereProjectemployeeId($this->projectemployeeID);
+
+        $this->projecthours = $projecthours->count() == 0 ?TRUE : FALSE;
+    }
+
+    private function setRemoveAllowed()
+    {
+        if( $this->projecthours === false ) return $this->removeAllowed = FALSE;
+
+        $this->removeAllowed = TRUE;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Deletions/RemoveVat.php b/app/Libraries/Deletions/RemoveVat.php
new file mode 100644
index 0000000..a36e38e
--- /dev/null
+++ b/app/Libraries/Deletions/RemoveVat.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/06/2018
+ * Time: 17:06
+ */
+
+class RemoveVat {
+
+    private $vatID;
+    private $projects;
+    private $invoices;
+    private $removeAllowed;
+
+    public function __construct( $vatID )
+    {
+        $this->setVatID( $vatID );
+
+        $this->handle();
+    }
+
+    public function getRemoveAllowed()
+    {
+        return $this->removeAllowed;
+    }
+
+    private function setVatID( $vatID )
+    {
+        $this->vatID = $vatID;
+    }
+
+    private function handle()
+    {
+        $this->setProject();
+
+        $this->setInvoices();
+
+        $this->setRemoveAllowed();
+    }
+
+    private function setProject()
+    {
+        $projects = Project::whereVatId( $this->vatID );
+
+        $this->projects = $projects->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setInvoices()
+    {
+        $invoices = Invoice::whereVatId( $this->vatID );
+
+        $this->invoices = $invoices->count() == 0 ? TRUE : FALSE;
+    }
+
+    private function setRemoveAllowed()
+    {
+        if ( $this->projects === FALSE ) return $this->removeAllowed = FALSE;
+
+        if ( $this->invoices === FALSE ) return $this->removeAllowed = FALSE;
+
+        $this->removeAllowed = TRUE;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Projects/RemoveForecast.php b/app/Libraries/Projects/RemoveForecast.php
new file mode 100644
index 0000000..70f8f3b
--- /dev/null
+++ b/app/Libraries/Projects/RemoveForecast.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveForecast {
+
+    private $forecastID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $forecastID )
+    {
+        $this->setForecastID( $forecastID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setForecastID( $forecastID )
+    {
+        $this->forecastID = $forecastID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Projects/RemovePayment.php b/app/Libraries/Projects/RemovePayment.php
new file mode 100644
index 0000000..918d742
--- /dev/null
+++ b/app/Libraries/Projects/RemovePayment.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemovePayment {
+
+    private $paymentID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $paymentID )
+    {
+        $this->setPaymentID( $paymentID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setPaymentID( $paymentID )
+    {
+        $this->paymentID = $paymentID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Projects/RemoveProjecthour.php b/app/Libraries/Projects/RemoveProjecthour.php
new file mode 100644
index 0000000..37a4f4f
--- /dev/null
+++ b/app/Libraries/Projects/RemoveProjecthour.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveProjecthour {
+
+    private $projecthourID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $projecthourID )
+    {
+        $this->setProjecthourID( $projecthourID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setProjecthourID( $projecthourID )
+    {
+        $this->projecthourID = $projecthourID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Projects/RemoveReservation.php b/app/Libraries/Projects/RemoveReservation.php
new file mode 100644
index 0000000..de13dca
--- /dev/null
+++ b/app/Libraries/Projects/RemoveReservation.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 27/12/2017
+ * Time: 17:45
+ */
+
+class RemoveReservation {
+
+    private $reservationID;
+    private $allowDelete = TRUE;
+
+    public function __construct( $reservationID )
+    {
+        $this->setReservationID( $reservationID );
+
+        $this->handle();
+    }
+
+    public function getAllowDelete()
+    {
+        return $this->allowDelete;
+    }
+
+    private function setReservationID( $reservationID )
+    {
+        $this->reservationID = $reservationID;
+    }
+
+    private function handle()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Reports/Invoice/Excel/InvoiceForecastSheet.php b/app/Libraries/Reports/Invoice/Excel/InvoiceForecastSheet.php
new file mode 100644
index 0000000..97cc44c
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Excel/InvoiceForecastSheet.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 30/07/2018
+ * Time: 10:48
+ */
+
+class InvoiceForecastSheet {
+
+    const HEADERS = [
+        'A' => 'project',
+        'B' => 'klant',
+        'C' => 'Nog te factureren incl. btw',
+        'D' => 'Nog te factureren incl. btw lopend boekjaar incl. btw',
+        'E' => 'Nog te factureren na lopend boekjaar inc. btw',
+        'F' => 'Nog te prognotiseren inc. btw'
+    ];
+
+    private $invoiceForecast;
+    private $sheet;
+    private $row;
+
+    public function __construct( $invoiceForecast, $sheet )
+    {
+        $this->invoiceForecast = $invoiceForecast;
+        $this->sheet = $sheet;
+
+        $this->handle();
+    }
+
+    private function handle()
+    {
+        $this->setHeader();
+
+        $this->setBody();
+
+        $this->setTotals();
+    }
+
+    private function setHeader()
+    {
+        foreach ( self::HEADERS as $cell => $header )
+        {
+            $this->sheet->setCellValue( $cell . '1', $header );
+            $this->sheet->getColumnDimension( $cell )->setAutoSize( TRUE );
+        }
+    }
+
+    private function setBody()
+    {
+        $this->row = 2;
+        foreach ( $this->invoiceForecast AS $project )
+        {
+            $this->sheet->setCellValue( 'A' . $this->row, $project['projectname'] );
+            $this->sheet->setCellValue( 'B' . $this->row, $project['customer'] );
+            $this->sheet->setCellValue( 'C' . $this->row, str_replace( '.', '', $project['needInvoice'] ?? '' ) );
+            $this->sheet->setCellValue( 'D' . $this->row, str_replace( '.', '', $project['forecastThisYear'] ?? '' ) );
+            $this->sheet->setCellValue( 'E' . $this->row, str_replace( '.', '', $project['forecastOtherYears'] ?? '' ) );
+            $this->sheet->setCellValue( 'F' . $this->row, str_replace( '.', '', $project['forecastRemaining'] ?? '' ) );
+
+            $this->row ++;
+        }
+    }
+
+    private function setTotals()
+    {
+        $lastRow = $this->row - 1;
+        $this->sheet->setCellValue( 'C' . $this->row, '=SUM(C2:C' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'D' . $this->row, '=SUM(D2:D' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'E' . $this->row, '=SUM(E2:E' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'F' . $this->row, '=SUM(F2:F' . $lastRow . ')' );
+    }
+
+}
diff --git a/app/Libraries/Reports/Invoice/Excel/InvoiceOverviewSheet.php b/app/Libraries/Reports/Invoice/Excel/InvoiceOverviewSheet.php
new file mode 100644
index 0000000..704a69a
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Excel/InvoiceOverviewSheet.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 20:40
+ */
+
+class InvoiceOverviewSheet {
+
+    const HEADERS = [
+        'A' => 'project',
+        'B' => 'klant',
+        'C' => 'Totaal te factureren excl. btw',
+        'D' => 'Totaal te factureren incl. btw',
+        'E' => 'Gefactureerd overige jaren incl. btw',
+        'F' => 'Gefactureerd lopende boekjaar incl. btw',
+        'G' => 'Gefactureerd totaal incl. btw',
+        'H' => 'Nog te factureren incl. btw'
+    ];
+
+    private $invoiceOverview;
+    private $sheet;
+    private $row;
+
+    public function __construct( $invoiceOverview, $sheet )
+    {
+        $this->invoiceOverview = $invoiceOverview;
+        $this->sheet = $sheet;
+
+        $this->handle();
+    }
+
+    private function handle()
+    {
+        $this->setHeader();
+
+        $this->setBody();
+
+        $this->setTotals();
+    }
+
+    private function setHeader()
+    {
+        foreach ( self::HEADERS as $cell => $header )
+        {
+            $this->sheet->setCellValue( $cell . '1', $header );
+            $this->sheet->getColumnDimension( $cell )->setAutoSize( TRUE );
+        }
+    }
+
+    private function setBody()
+    {
+        $this->row = 2;
+        foreach ( $this->invoiceOverview AS $project )
+        {
+            $this->sheet->setCellValue( 'A' . $this->row, $project['projectname'] );
+            $this->sheet->setCellValue( 'B' . $this->row, $project['customer'] );
+            $this->sheet->setCellValue( 'C' . $this->row, str_replace( '.', '', $project['totalToInvoicingExcl'] ?? '' ) );
+            $this->sheet->setCellValue( 'D' . $this->row, str_replace( '.', '', $project['totalToInvoicingIncl'] ?? '' ) );
+            $this->sheet->setCellValue( 'E' . $this->row, str_replace( '.', '', $project['totalInvoicedOtherYears'] ?? '' ) );
+            $this->sheet->setCellValue( 'F' . $this->row, str_replace( '.', '', $project['totalInvoicedThisYear'] ?? '' ) );
+            $this->sheet->setCellValue( 'G' . $this->row, str_replace( '.', '', $project['invoicesTotal'] ?? '' ) );
+            $this->sheet->setCellValue( 'H' . $this->row, str_replace( '.', '', $project['needInvoice'] ?? '' ) );
+
+            $this->row ++;
+        }
+    }
+
+    private function setTotals()
+    {
+        $lastRow = $this->row - 1;
+        $this->sheet->setCellValue( 'C' . $this->row, '=SUM(C2:C' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'D' . $this->row, '=SUM(D2:D' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'E' . $this->row, '=SUM(E2:E' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'F' . $this->row, '=SUM(F2:F' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'G' . $this->row, '=SUM(G2:G' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'H' . $this->row, '=SUM(H2:H' . $lastRow . ')' );
+    }
+}
diff --git a/app/Libraries/Reports/Invoice/Excel/InvoiceSpreadsheet.php b/app/Libraries/Reports/Invoice/Excel/InvoiceSpreadsheet.php
new file mode 100644
index 0000000..4adf92d
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Excel/InvoiceSpreadsheet.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 20:04
+ */
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+class InvoiceSpreadsheet {
+
+    private $invoiceReport;
+    private $spreadsheet;
+    private $invoiceSheet;
+    private $fullpathname;
+    private $filename;
+    private $ci;
+
+    public function __construct( $invoiceReport )
+    {
+        $this->ci =& get_instance();
+
+        $this->invoiceReport = $invoiceReport;
+
+        $this->ci->load->helper( 'download' );
+
+        $this->handle();
+    }
+
+    private function handle()
+    {
+        $this->setSpreadsheet();
+
+        $this->setInvoiceOverviewSheet();
+
+        $this->setInvoiceForecast();
+
+        $this->setMonthForecast();
+
+		$this->setMonthPayment();
+
+		$this->setInvoiced();
+
+        $this->setFilename();
+
+        $this->setFullPathname();
+
+        $this->createFile();
+
+        $this->downloadSpreadsheet();
+    }
+
+    private function setSpreadsheet()
+    {
+        $this->spreadsheet = new Spreadsheet();
+    }
+
+    private function setInvoiceOverviewSheet()
+    {
+        $invoiceSheet = new Worksheet( $this->spreadsheet, 'Facturen' );
+
+        $this->invoiceSheet =
+            $this->spreadsheet->addSheet( $invoiceSheet );
+
+        new InvoiceOverviewSheet( $this->invoiceReport['invoiceOverview'], $this->invoiceSheet );
+    }
+
+    private function setInvoiceForecast()
+    {
+        $invoiceSheet = new Worksheet( $this->spreadsheet, 'prognose' );
+
+        $this->invoiceSheet =
+            $this->spreadsheet->addSheet( $invoiceSheet );
+
+        new InvoiceForecastSheet( $this->invoiceReport['forecasts'], $this->invoiceSheet );
+    }
+
+    private function setMonthForecast()
+    {
+        $invoiceSheet = new Worksheet( $this->spreadsheet, 'maandprognose' );
+
+        $this->invoiceSheet =
+            $this->spreadsheet->addSheet( $invoiceSheet );
+
+        new MonthForecastSheet( $this->invoiceReport['monthForecasts'], $this->invoiceSheet );
+    }
+
+	private function setMonthPayment()
+	{
+		$invoiceSheet = new Worksheet( $this->spreadsheet, 'maand betalingen' );
+
+		$this->invoiceSheet =
+			$this->spreadsheet->addSheet( $invoiceSheet );
+
+		new MonthPaymentSheet( $this->invoiceReport['monthPayments'], $this->invoiceSheet );
+	}
+
+	private function setInvoiced()
+	{
+		$invoiceSheet = new Worksheet( $this->spreadsheet, 'verstuurde facturen' );
+
+		$this->invoiceSheet =
+			$this->spreadsheet->addSheet( $invoiceSheet );
+
+		new InvoicedSheet( $this->invoiceReport['invoiced'], $this->invoiceSheet );
+	}
+
+    private function setFilename()
+    {
+        $this->filename = 'facturen' . date( 'YmdHis' ) . '.xlsx';
+    }
+
+    private function setFullPathname()
+    {
+        $this->fullpathname = MYROOTPATH . 'documents/spreadsheets/' . $this->filename;
+    }
+
+    private function createFile()
+    {
+        $writer = new Xlsx( $this->spreadsheet );
+
+        $writer->save( $this->fullpathname );
+    }
+
+    private function downloadSpreadsheet()
+    {
+        $data = file_get_contents( $this->fullpathname );
+
+        force_download( $this->filename, $data );
+    }
+
+
+}
diff --git a/app/Libraries/Reports/Invoice/Excel/InvoicedSheet.php b/app/Libraries/Reports/Invoice/Excel/InvoicedSheet.php
new file mode 100644
index 0000000..d0de687
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Excel/InvoicedSheet.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 30/07/2018
+ * Time: 10:48
+ */
+
+class InvoicedSheet {
+
+    const HEADERS = [
+        'A' => 'factuurnummer',
+        'B' => 'project',
+        'C' => 'klant',
+        'D' => 'factuurdatum',
+        'E' => 'exc btw',
+        'F' => 'btw',
+        'G' => 'incl btw'
+    ];
+
+    private $invoiced;
+    private $sheet;
+    private $row;
+
+    public function __construct( $invoiced, $sheet )
+    {
+        $this->invoiced = $invoiced;
+        $this->sheet = $sheet;
+
+        $this->handle();
+    }
+
+    private function handle()
+    {
+        $this->setHeader();
+
+        $this->setBody();
+    }
+
+    private function setHeader()
+    {
+        foreach ( self::HEADERS as $cell => $header )
+        {
+            $this->sheet->setCellValue( $cell . '1', $header );
+            $this->sheet->getColumnDimension( $cell )->setAutoSize( TRUE );
+        }
+    }
+
+    private function setBody()
+    {
+        $this->row = 2;
+        foreach ( $this->invoiced AS $invoice )
+        {
+			$vat = ROUND($invoice->invoiceamount * 0.21, 2);
+            $this->sheet->setCellValue( 'A' . $this->row, $invoice->invoicenumber );
+            $this->sheet->setCellValue( 'B' . $this->row, ($invoice->projectnumber . ' ' . $invoice['projectname']));
+			$this->sheet->setCellValue( 'C' . $this->row, $invoice->name );
+			$this->sheet->setCellValue( 'D' . $this->row, $invoice->invoicenumber );
+			$this->sheet->setCellValue( 'E' . $this->row, $invoice->invoiceamount );
+			$this->sheet->setCellValue( 'F' . $this->row, $vat );
+			$this->sheet->setCellValue( 'G' . $this->row, $invoice->invoiceamount + $vat );
+
+            $this->row ++;
+        }
+    }
+
+}
diff --git a/app/Libraries/Reports/Invoice/Excel/MonthForecastSheet.php b/app/Libraries/Reports/Invoice/Excel/MonthForecastSheet.php
new file mode 100644
index 0000000..6b38844
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Excel/MonthForecastSheet.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 30/07/2018
+ * Time: 10:48
+ */
+
+class MonthForecastSheet {
+
+    const HEADERS = [
+        'A' => 'project',
+        'B' => 'klant',
+        'C' => 'Nog te factureren incl. btw',
+        'D' => 'januari',
+        'E' => 'februari',
+        'F' => 'maart',
+        'G' => 'april',
+        'H' => 'mei',
+        'I' => 'juni',
+        'J' => 'juli',
+        'K' => 'augustus',
+        'L' => 'september',
+        'M' => 'oktober',
+        'N' => 'november',
+        'O' => 'december',
+        'P' => 'Nog te factureren na lopend boekjaar inc. btw',
+        'Q' => 'Nog te prognotiseren inc. btw'
+    ];
+
+    const MONTH_COLUMNS = ['D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O'];
+
+    private $invoiceForecast;
+    private $sheet;
+    private $row;
+
+    public function __construct( $invoiceForecast, $sheet )
+    {
+        $this->invoiceForecast = $invoiceForecast;
+        $this->sheet = $sheet;
+
+        $this->handle();
+    }
+
+    private function handle()
+    {
+        $this->setHeader();
+
+        $this->setBody();
+
+        $this->setTotals();
+    }
+
+    private function setHeader()
+    {
+        foreach ( self::HEADERS as $cell => $header )
+        {
+            $this->sheet->setCellValue( $cell . '1', $header );
+            $this->sheet->getColumnDimension( $cell )->setAutoSize( TRUE );
+        }
+    }
+
+    private function setBody()
+    {
+        $this->row = 2;
+        foreach ( $this->invoiceForecast AS $project )
+        {
+            $this->sheet->setCellValue( 'A' . $this->row, $project['projectname'] );
+            $this->sheet->setCellValue( 'B' . $this->row, $project['customer'] );
+            $this->sheet->setCellValue( 'C' . $this->row, str_replace( '.', '', $project['needInvoice'] ?? '' ) );
+
+            $columnCount = 0;
+            foreach ( $project['forecastMonths'] as $month )
+            {
+                $column = self::MONTH_COLUMNS[ $columnCount ];
+                $forecast = $month['forecastamount'];
+                $this->sheet->setCellValue( $column . $this->row, $forecast );
+                $columnCount ++;
+            }
+
+            $this->sheet->setCellValue( 'P' . $this->row, str_replace( '.', '', $project['forecastOtherYears'] ?? '' ) );
+            $this->sheet->setCellValue( 'Q' . $this->row, str_replace( '.', '', $project['forecastRemaining'] ?? '' ) );
+
+            $this->row ++;
+        }
+    }
+
+    private function setTotals()
+    {
+        $lastRow = $this->row - 1;
+        $this->sheet->setCellValue( 'C' . $this->row, '=SUM(C2:C' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'D' . $this->row, '=SUM(D2:D' . $lastRow . ')' );
+        foreach ( self::MONTH_COLUMNS as $column )
+        {
+            $this->sheet->setCellValue( $column . $this->row, '=SUM(' . $column . '2:' . $column . $lastRow . ')' );
+        }
+        $this->sheet->setCellValue( 'P' . $this->row, '=SUM(P2:P' . $lastRow . ')' );
+        $this->sheet->setCellValue( 'Q' . $this->row, '=SUM(Q2:Q' . $lastRow . ')' );
+    }
+
+}
diff --git a/app/Libraries/Reports/Invoice/Excel/MonthPaymentSheet.php b/app/Libraries/Reports/Invoice/Excel/MonthPaymentSheet.php
new file mode 100644
index 0000000..d51bd0d
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Excel/MonthPaymentSheet.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 30/07/2018
+ * Time: 10:48
+ */
+
+class MonthPaymentSheet {
+
+    const HEADERS = [
+        'A' => 'project',
+        'B' => 'klant',
+        'C' => 'januari',
+        'D' => 'februari',
+        'E' => 'maart',
+        'F' => 'april',
+        'G' => 'mei',
+        'H' => 'juni',
+        'I' => 'juli',
+        'J' => 'augustus',
+        'K' => 'september',
+        'L' => 'oktober',
+        'M' => 'november',
+        'N' => 'december',
+        'O' => 'Totaal betaald lopend boekjaar inc. btw'
+    ];
+
+    const MONTH_COLUMNS = ['C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'];
+
+    private $invoiceForecast;
+    private $sheet;
+    private $row;
+
+    public function __construct( $invoiceForecast, $sheet )
+    {
+        $this->invoiceForecast = $invoiceForecast;
+        $this->sheet = $sheet;
+
+        $this->handle();
+    }
+
+    private function handle()
+    {
+        $this->setHeader();
+
+        $this->setBody();
+
+        $this->setTotals();
+    }
+
+    private function setHeader()
+    {
+        foreach ( self::HEADERS as $cell => $header )
+        {
+            $this->sheet->setCellValue( $cell . '1', $header );
+            $this->sheet->getColumnDimension( $cell )->setAutoSize( TRUE );
+        }
+    }
+
+    private function setBody()
+    {
+        $this->row = 2;
+        foreach ( $this->invoiceForecast AS $project )
+        {
+            $this->sheet->setCellValue( 'A' . $this->row, $project['projectname'] );
+            $this->sheet->setCellValue( 'B' . $this->row, $project['customer'] );
+
+            $columnCount = 0;
+            foreach ( $project['monthPayments'] as $month )
+            {
+                $column = self::MONTH_COLUMNS[ $columnCount ];
+                $forecast = $month['paymentamount'];
+                $this->sheet->setCellValue( $column . $this->row, $forecast );
+                $columnCount ++;
+            }
+
+            $formula = '=SUM(C'.$this->row.':N'.$this->row.')';
+            $this->sheet->setCellValue( 'O' . $this->row, $formula);
+
+            $this->row ++;
+        }
+    }
+
+    private function setTotals()
+    {
+        $lastRow = $this->row - 1;
+        foreach ( self::MONTH_COLUMNS as $column )
+        {
+            $this->sheet->setCellValue( $column . $this->row, '=SUM(' . $column . '2:' . $column . $lastRow . ')' );
+        }
+        $this->sheet->setCellValue( 'O' . $this->row, '=SUM(O2:O' . $lastRow . ')' );
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Reports/Invoice/InvoiceForecast.php b/app/Libraries/Reports/Invoice/InvoiceForecast.php
new file mode 100644
index 0000000..9a0a9f6
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/InvoiceForecast.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 13:14
+ */
+
+class InvoiceForecast {
+
+    private $year;
+    private $project;
+    private $customer;
+    private $forecast;
+    private $currentYear;
+    private $projectname;
+    private $needInvoice;
+    private $projectDetails;
+    private $forecastThisYear   = 0;
+    private $forecastRemaining;
+    private $forecastOtherYears = 0;
+
+    public function __construct( $project, $needInvoice, $year )
+    {
+        $this->project = $project;
+        $this->needInvoice = $needInvoice;
+        $this->year = $year;
+
+        $this->handle();
+    }
+
+    public function getProjectDetails()
+    {
+        return $this->projectDetails;
+    }
+
+    public function getNeedInvoice()
+    {
+        return $this->needInvoice;
+    }
+
+    public function getForecastOtherYear()
+    {
+        return $this->forecastOtherYears;
+    }
+
+    public function getForecastRemaining()
+    {
+        return $this->forecastRemaining;
+    }
+
+    private function handle()
+    {
+        $this->setCurrentyear();
+
+        $this->setProjectname();
+
+        $this->setCustomer();
+
+        $this->loopForecasts();
+
+        $this->setForecastRemaining();
+
+        $this->setProjectDetails();
+    }
+
+    private function setCurrentyear()
+    {
+        $this->currentYear = date( 'Y' );
+    }
+
+    private function setProjectname()
+    {
+        $this->projectname = $this->project->projectname . '(' . $this->project->projectnumber . ')';
+    }
+
+    private function setCustomer()
+    {
+        $this->customer = $this->project->customer->name;
+    }
+
+    private function loopForecasts()
+    {
+        if ( is_null( $this->project->forecasts ) ) return $this->forecastThisYear = 0;
+
+        foreach ( $this->project->forecasts as $this->forecast )
+        {
+            $this->setForecastThisYear();
+
+            $this->setForecastOtherYears();
+        }
+    }
+
+    private function setForecastThisYear()
+    {
+        if ( $this->forecast->year == $this->year )
+            $this->forecastThisYear += $this->forecast->forecastamount;
+    }
+
+    private function setForecastOtherYears()
+    {
+        if ( $this->forecast->year != $this->year )
+            $this->forecastOtherYears += $this->forecast->forecastamount;
+    }
+
+    private function setForecastRemaining()
+    {
+        $this->forecastRemaining =
+            $this->needInvoice - $this->forecastThisYear - $this->forecastOtherYears;
+    }
+
+    private function setProjectDetails()
+    {
+        $this->projectDetails = [
+        	'projectnumber'		   => $this->project->projectnumber,
+            'projectname'          => $this->projectname,
+            'customer'             => $this->customer,
+            'needInvoice'          => number_format( $this->needInvoice, 0, ',', '.' ),
+            'forecastThisYear'     => number_format( $this->forecastThisYear, 0, ',', '.' ),
+            'forecastOtherYears'   => number_format( $this->forecastOtherYears, 0, ',', '.' ),
+            'forecastRemaining'    => number_format( $this->forecastRemaining, 0, ',', '.' ),
+        ];
+    }
+
+}
diff --git a/app/Libraries/Reports/Invoice/InvoiceOverview.php b/app/Libraries/Reports/Invoice/InvoiceOverview.php
new file mode 100644
index 0000000..f806a08
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/InvoiceOverview.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 10:29
+ */
+
+class InvoiceOverview {
+
+	private $project;
+	private $year;
+	private $projectname;
+	private $customer;
+	private $totalToInvoicingExcl;
+	private $totalToInvoicingIncl;
+	private $totalInvoicedOtherYears;
+	private $totalInvoicedThisYear;
+	private $invoicesTotal;
+	private $needInvoice;
+	private $projectDetails;
+	private $projectnumber;
+	private $projectPayment;
+	private $invoicesToPay;
+
+	public function __construct( $project, $year )
+	{
+		$this->project = $project;
+
+		$this->year = $year;
+
+		$this->handle();
+	}
+
+	public function getProjectDetails()
+	{
+		return $this->projectDetails;
+	}
+
+	public function getNeedinvoice()
+	{
+		return $this->needInvoice;
+	}
+
+	private function handle()
+	{
+		$this->setProjectnumber();
+
+		$this->setProjectname();
+
+		$this->setCustomer();
+
+		$this->setTotalToInvoicingExcl();
+
+		$this->setTotalToInvoicingIncl();
+
+		$this->setTotalInvoicedOtherYears();
+
+		$this->setTotalInvoicedThisYear();
+
+		$this->setPaymentPerProject();
+
+		$this->setInvoicesTotal();
+
+		$this->setInvoicesToPay();
+
+		$this->setNeedInvoice();
+
+		$this->setProjectDetails();
+	}
+
+	private function setProjectnumber()
+	{
+		$this->projectnumber = $this->project->projectnumber;
+	}
+
+	private function setProjectname()
+	{
+		$this->projectname = $this->project->projectname;
+	}
+
+	private function setCustomer()
+	{
+		$this->customer = $this->project->customer->name;
+	}
+
+	private function setTotalToInvoicingExcl()
+	{
+		$offer = $this->project->offer;
+
+		$this->totalToInvoicingExcl =
+			$offer->own_revenue + $offer->other_revenue + $offer->costs;
+	}
+
+	private function setTotalToInvoicingIncl()
+	{
+		$this->totalToInvoicingIncl =
+			$this->totalToInvoicingExcl * ( 1 + ( $this->project->vat->vatrate / 100 ) );
+	}
+
+	private function setTotalInvoicedOtherYears()
+	{
+		$this->totalInvoicedOtherYears =
+			Invoice::invoicePerYear( $this->project->id, $this->year, FALSE );
+	}
+
+	private function setTotalInvoicedThisYear()
+	{
+		$this->totalInvoicedThisYear =
+			Invoice::invoicePerYear( $this->project->id, $this->year, TRUE );
+	}
+
+	private function setPaymentPerProject()
+	{
+		$this->projectPayment = Payment::getPaymentPerProject( $this->project->id );
+	}
+
+	private function setInvoicesTotal()
+	{
+		$this->invoicesTotal =
+			$this->totalInvoicedOtherYears + $this->totalInvoicedThisYear;
+	}
+
+	private function setInvoicesToPay()
+	{
+		$this->invoicesToPay = $this->invoicesTotal - $this->projectPayment;
+	}
+
+	private function setNeedInvoice()
+	{
+		$this->needInvoice =
+			$this->totalToInvoicingIncl - $this->invoicesTotal;
+	}
+
+	private function setProjectDetails()
+	{
+		$this->projectDetails = [
+			'projectnumber'           => $this->projectnumber,
+			'projectname'             => $this->projectname,
+			'customer'                => $this->customer,
+			'totalToInvoicingExcl'    => number_format( $this->totalToInvoicingExcl ?? 0, 0, ',', '.' ),
+			'totalToInvoicingIncl'    => number_format( $this->totalToInvoicingIncl ?? 0, 0, ',', '.' ),
+			'totalInvoicedOtherYears' => number_format( $this->totalInvoicedOtherYears ?? 0, 0, ',', '.' ),
+			'totalInvoicedThisYear'   => number_format( $this->totalInvoicedThisYear ?? 0, 0, ',', '.' ),
+			'invoicesTotal'           => number_format( $this->invoicesTotal ?? 0, 0, ',', '.' ),
+			'projectPayment'          => number_format( $this->projectPayment ?? 0, 0, ',', '.' ),
+			'invoiceToPay'            => number_format( $this->invoicesToPay ?? 0, 0, ',', '.' ),
+			'needInvoice'             => number_format( $this->needInvoice ?? 0, 0, ',', '.' )
+		];
+	}
+}
diff --git a/app/Libraries/Reports/Invoice/Invoices.php b/app/Libraries/Reports/Invoice/Invoices.php
new file mode 100644
index 0000000..9740376
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/Invoices.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 10:19
+ */
+
+class Invoices {
+
+	private $year;
+	private $project;
+	private $projects;
+	private $monthPayment;
+	private $monthPayments;
+	private $monthForecast;
+	private $monthForecasts;
+	private $invoiceOverview;
+	private $invoiceForecast;
+	private $invoiceForecasts;
+	private $invoiceOverviews = [];
+	private $invoiceReport    = [];
+	private $orderType;
+	private $orderDirection;
+	private $archive;
+	private $invoicedYears;
+	private $invoiced;
+
+	public function __construct( $year, $orderType, $orderDirection, $archive )
+	{
+		$this->year = $year;
+		$this->orderType = $orderType;
+		$this->orderDirection = $orderDirection;
+		$this->archive = $archive;
+
+		$this->handle();
+	}
+
+	public function getInvoiceReport()
+	{
+		return $this->invoiceReport;
+	}
+
+	private function handle()
+	{
+		$this->setProjects();
+
+		$this->loopProjects();
+
+		//only projects with payments also archived projects
+		$this->setMonthPayments();
+
+		$this->setInvoicedyears();
+
+		$this->setInvoiced();
+
+		$this->setInvoiceReport();
+	}
+
+	private function setProjects()
+	{
+		$this->projects =
+			Project::getProjectsForReport( $this->orderType, $this->orderDirection, $this->archive );
+	}
+
+	private function loopProjects()
+	{
+		foreach ( $this->projects as $this->project )
+		{
+			$this->setInvoiceOverview();
+
+			$this->setInvoiceForecasts();
+
+			$this->setMonthForecasts();
+		}
+	}
+
+	private function setInvoiceOverview()
+	{
+		$this->invoiceOverview = new InvoiceOverview( $this->project, $this->year );
+
+		$this->invoiceOverviews[] = $this->invoiceOverview->getProjectDetails();
+	}
+
+	private function setInvoiceForecasts()
+	{
+		$this->invoiceForecast =
+			new InvoiceForecast( $this->project, $this->invoiceOverview->getNeedinvoice(), $this->year );
+
+		$this->invoiceForecasts[] = $this->invoiceForecast->getProjectDetails();
+	}
+
+	public function setMonthForecasts()
+	{
+		$this->monthForecast =
+			new MonthForecast( $this->invoiceForecast, $this->project, $this->year );
+
+		$this->monthForecasts[] = $this->monthForecast->getProjectDetails();
+	}
+
+	public function setMonthPayments()
+	{
+		$monthPayment = new MonthPayments(
+			$this->year, $this->orderType, $this->orderDirection );
+
+		$this->monthPayments = $monthPayment->getProjectDetails();
+	}
+
+	private function setInvoiced()
+	{
+		$this->invoiced = Invoice::getInvoiced( $this->year, $this->orderType, $this->orderDirection );
+	}
+
+	private function setInvoicedYears()
+	{
+		$this->invoicedYears = Invoice::selectRaw( 'DATE_FORMAT(invoicedate, "%Y") AS years' )
+			->distinct()
+			->orderBy( 'invoicedate' )
+			->pluck( 'years' );
+	}
+
+	private function setInvoiceReport()
+	{
+		$this->invoiceReport = [
+			'invoiceOverview' => $this->invoiceOverviews,
+			'forecasts'       => $this->invoiceForecasts,
+			'monthForecasts'  => $this->monthForecasts,
+			'monthPayments'   => $this->monthPayments,
+			'invoicedYears'   => $this->invoicedYears,
+			'invoiced'		  => $this->invoiced
+		];
+	}
+}
diff --git a/app/Libraries/Reports/Invoice/MonthForecast.php b/app/Libraries/Reports/Invoice/MonthForecast.php
new file mode 100644
index 0000000..c2fb537
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/MonthForecast.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 14:23
+ */
+
+class MonthForecast {
+
+    private $year;
+    private $project;
+    private $forecast;
+    private $customer;
+    private $projectname;
+    private $forecastMonths;
+    private $projectDetails;
+    private $invoiceForecast;
+
+    public function __construct( InvoiceForecast $invoiceForecast, $project, $year )
+    {
+        $this->project = $project;
+        $this->invoiceForecast = $invoiceForecast;
+        $this->year = $year;
+
+        $this->handle();
+    }
+
+    public function getProjectDetails()
+    {
+        return $this->projectDetails;
+    }
+
+    private function handle()
+    {
+        $this->setProjectname();
+
+        $this->setCustomer();
+
+        $this->setInitialsForecastMonths();
+
+        $this->loopForecasts();
+
+        $this->setProjectDetails();
+    }
+
+    private function setProjectname()
+    {
+        $this->projectname = $this->project->projectname . '(' . $this->project->projectnumber . ')';
+    }
+
+    private function setCustomer()
+    {
+        $this->customer = $this->project->customer->name;
+    }
+
+    private function setInitialsForecastMonths()
+    {
+        for ( $i = 0; $i < 12; $i ++ )
+        {
+            $this->forecastMonths[ $i ] = ['forecastamount' => 0];
+        }
+    }
+
+    private function loopForecasts()
+    {
+        foreach ( $this->project->forecasts as $this->forecast )
+        {
+            $this->setMonthForecast();
+        }
+    }
+
+    private function setMonthForecast()
+    {
+        if ( $this->forecast->year == $this->year )
+            $this->forecastMonths[ $this->forecast->month_id ]['forecastamount'] += $this->forecast->forecastamount;
+    }
+
+    private function setProjectDetails()
+    {
+        $this->projectDetails = [
+        	'projectnumber'		 => $this->project->projectnumber,
+            'projectname'        => $this->projectname,
+            'customer'           => $this->customer,
+            'needInvoice'        => number_format( $this->invoiceForecast->getNeedInvoice(), 0, ',', '.' ),
+            'forecastOtherYears' => number_format( $this->invoiceForecast->getForecastOtherYear(), 0, ',', '.' ),
+            'forecastRemaining'  => number_format( $this->invoiceForecast->getForecastRemaining(), 0, ',', '.' ),
+            'forecastMonths'     => $this->forecastMonths
+        ];
+    }
+
+}
diff --git a/app/Libraries/Reports/Invoice/MonthPayments.php b/app/Libraries/Reports/Invoice/MonthPayments.php
new file mode 100644
index 0000000..0508e8f
--- /dev/null
+++ b/app/Libraries/Reports/Invoice/MonthPayments.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 14:23
+ */
+
+class MonthPayments {
+
+	private $year;
+	private $project;
+	private $payment;
+	private $customer;
+	private $projectname;
+	private $monthPayments;
+	private $projectDetails;
+	private $projectsWithPayments;
+	private $totalProjectPayments;
+	private $orderType;
+	private $orderDirection;
+
+	public function __construct( $year, $orderType, $orderDirection )
+	{
+		$this->year = $year;
+		$this->orderType = $orderType;
+		$this->orderDirection = $orderDirection;
+
+		$this->handle();
+	}
+
+	public function getProjectDetails()
+	{
+		return $this->projectDetails;
+	}
+
+	private function handle()
+	{
+		$this->setProjectsWithPayments();
+
+		$this->loopProjectsWithPayments();
+	}
+
+	private function setProjectsWithPayments()
+	{
+		$projectsArray = Payment::getProjectsWithPayments( $this->year );
+
+		$this->projectsWithPayments =
+			Project::getProjectsForReport(
+				$this->orderType, $this->orderDirection, FALSE, $projectsArray );
+	}
+
+	private function loopProjectsWithPayments()
+	{
+		foreach ( $this->projectsWithPayments as $this->project )
+		{
+			$this->setProjectname();
+
+			$this->setCustomer();
+
+			$this->setInitialsMonthPayments();
+
+			$this->loopPayments();
+
+			$this->setProjectDetails();
+		}
+	}
+
+	private function setProjectname()
+	{
+		$this->projectname = $this->project->projectname . '(' . $this->project->projectnumber . ')';
+	}
+
+	private function setCustomer()
+	{
+		$this->customer = $this->project->customer->name;
+	}
+
+	private function setInitialsMonthPayments()
+	{
+		for ( $i = 1; $i <= 12; $i ++ )
+		{
+			$this->monthPayments[ $i ] = ['paymentamount' => 0];
+		}
+	}
+
+	private function loopPayments()
+	{
+		$this->totalProjectPayments = 0;
+		foreach ( $this->project->invoices as $invoice )
+		{
+			foreach ( $invoice->payments as $this->payment )
+			{
+				$this->setMonthPayments();
+
+				$this->setTotalProjectPayments();
+			}
+		}
+	}
+
+	private function setMonthPayments()
+	{
+		$paymentYear = date( 'Y', strtotime( $this->payment->paymentdate ) );
+		$paymentMonth = date( 'n', strtotime( $this->payment->paymentdate ) );
+
+		if ( $paymentYear == $this->year )
+			$this->monthPayments[ $paymentMonth ]['paymentamount'] += $this->payment->paymentamount;
+	}
+
+	private function setTotalProjectPayments()
+	{
+		$paymentYear = date( 'Y', strtotime( $this->payment->paymentdate ) );
+
+		if ( $paymentYear == $this->year )
+			$this->totalProjectPayments += $this->payment->paymentamount;
+	}
+
+	private function setProjectDetails()
+	{
+		$this->projectDetails[] = [
+			'projectnumber'		   => $this->project->projectnumber,
+			'projectname'          => $this->projectname,
+			'customer'             => $this->customer,
+			'monthPayments'        => $this->monthPayments,
+			'totalProjectPayments' => number_format( $this->totalProjectPayments, 0, ',', '.' )
+		];
+	}
+}
diff --git a/app/Libraries/Reports/Recapprojects.php b/app/Libraries/Reports/Recapprojects.php
new file mode 100644
index 0000000..4752213
--- /dev/null
+++ b/app/Libraries/Reports/Recapprojects.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 20/02/2018
+ * Time: 16:49
+ */
+
+class Recapprojects {
+
+    private $index;
+	private $field;
+    private $archive;
+    private $project;
+    private $projects;
+	private $direction;
+    private $employeeHours;
+    private $invoicedYears = [];
+    private $projectTotals;
+    private $employeeBudget;
+    private $uniqueEmployee;
+    private $uniqueEmployees;
+    private $currentFinancialYear;
+    private $projectEmployeeDetail;
+    private $projectEmployeeDetails;
+
+    public function __construct( $archive, $field, $direction )
+    {
+        $this->archive = $archive;
+		$this->field = $field;
+		$this->direction = $direction;
+
+        $this->handle();
+    }
+
+    public function getProjects()
+    {
+        return $this->projects;
+    }
+
+    private function handle()
+    {
+        $this->setProjects();
+
+        $this->setUniqueEmployees();
+
+        $this->loopProjects();
+
+        $this->setInvoicedYears();
+
+        $this->loopProjectsForInvoicedYears();
+    }
+
+    private function setProjects()
+    {
+        $this->projects = Project::getActiveProjects(
+        	$this->archive, $this->field, $this->direction )->toArray();
+    }
+
+    private function setUniqueEmployees()
+    {
+        $this->uniqueEmployees =
+			Projectemployee::getUniqueEmployeesWithActivity();
+    }
+
+    private function loopProjects()
+    {
+        $this->index = 0;
+        foreach ( $this->projects as $this->project )
+        {
+            $this->projectTotals = 0;
+
+            $this->setProjectEmployeeDetails();
+
+            $this->loopUniqueEmployees();
+
+            $this->setBudget();
+
+            $this->setProjectCosts();
+
+            $this->setBudgetAvailable();
+
+            $this->setSaldo();
+
+            $this->setInvoiced();
+
+            $this->setWorkInProgress();
+
+            $this->setCurrentFinancialYear();
+
+            $this->index ++;
+        }
+    }
+
+    private function setProjectEmployeeDetails()
+    {
+        $this->projectEmployeeDetails =
+            Projectemployee::getProjectemployeeDetailsPerProject( $this->project['id'] );
+    }
+
+    private function loopUniqueEmployees()
+    {
+        foreach ( $this->uniqueEmployees as $this->uniqueEmployee )
+        {
+            $this->setProjectEmployeeDetail();
+
+            $this->setEmployeeBudget();
+
+            $this->setEmployeeHours();
+
+            $this->setEmployeeDetails();
+
+            $this->setProjectTotals();
+        }
+    }
+
+    private function setProjectEmployeeDetail()
+    {
+        foreach ( $this->projectEmployeeDetails as $this->projectEmployeeDetail )
+        {
+            if ( $this->uniqueEmployee->id == $this->projectEmployeeDetail->id ) return;
+        }
+
+        $this->projectEmployeeDetail = FALSE;
+    }
+
+    private function setEmployeeBudget()
+    {
+		if( property_exists($this, 'uniqueEmployee') ) return $this->employeeBudget = 0;
+
+		if( is_null($this->projectEmployeeDetail)) return $this->employeeBudget = 0;
+
+        $this->employeeBudget =
+            is_null( $this->projectEmployeeDetail['budget'] ) ? 0 : $this->projectEmployeeDetail['budget'];
+    }
+
+    private function setEmployeeHours()
+    {
+        $this->employeeHours =
+            $this->projectEmployeeDetail ? $this->projectEmployeeDetail->hours : 0;
+    }
+
+    private function setEmployeeDetails()
+    {
+        $this->projects[ $this->index ]['employees'][] = [
+            'id'             => $this->uniqueEmployee->id,
+            'fullname'       => $this->uniqueEmployee->fullname,
+            'hours'          => $this->employeeHours,
+            'revenues'       => $this->projectEmployeeDetail ? $this->projectEmployeeDetail->revenues : 0,
+            'budget'         => $this->employeeBudget,
+            'availableHours' => $this->employeeBudget - $this->employeeHours
+        ];
+    }
+
+    private function setProjectTotals()
+    {
+        if ( ! isset( $this->projects[ $this->index ]['projectHours'] ) )
+            $this->projects[ $this->index ]['projectHours'] = 0;
+        if ( ! isset( $this->projects[ $this->index ]['projectEuros'] ) )
+            $this->projects[ $this->index ]['projectEuros'] = 0;
+        if ( ! isset( $this->projects[ $this->index ]['hoursAvailable'] ) )
+            $this->projects[ $this->index ]['hoursAvailable'] = 0;
+
+        $this->projects[ $this->index ]['projectHours'] +=
+            $this->projectEmployeeDetail ? $this->projectEmployeeDetail->hours : 0;
+        $this->projects[ $this->index ]['projectEuros'] +=
+            $this->projectEmployeeDetail ? $this->projectEmployeeDetail->revenues : 0;
+        $this->projects[ $this->index ]['hoursAvailable'] +=
+            $this->employeeBudget - $this->employeeHours;
+    }
+
+    private function setBudget()
+    {
+        $this->projects[ $this->index ]['budget'] =
+            round( ( $this->projects[ $this->index ]['own_revenue'] + $this->projects[ $this->index ]['other_revenue'] ), 0 );
+    }
+
+    private function setProjectCosts()
+    {
+        $this->projects[ $this->index ]['projectcosts'] =
+            Projectcost::getCostsPerPerProject( $this->projects[ $this->index ]['id'] );
+    }
+
+    private function setBudgetAvailable()
+    {
+        $this->projects[ $this->index ]['budgetAvailable'] =
+            $this->projects[ $this->index ]['budget'] - $this->projects[ $this->index ]['projectcosts'];
+    }
+
+    private function setSaldo()
+    {
+        $this->projects[ $this->index ]['saldo'] =
+            $this->projects[ $this->index ]['budgetAvailable'] - $this->projects[ $this->index ]['projectEuros'];
+    }
+
+    private function setInvoiced()
+    {
+        $invoiced = \Invoice::getInvoicedPerYearPerProject( $this->projects[ $this->index ]['id'] );
+
+        foreach ( $invoiced ? $invoiced : [] as $invoice )
+        {
+            $this->projects[ $this->index ]['invoiced'][] = [
+                'year'     => $invoice->invoiceyear,
+                'invoiced' => $invoice->invoiced
+            ];
+
+            $this->setTotalInvoiced( $invoice->invoiced );
+        }
+
+        if ( ! isset( $this->projects[ $this->index ]['invoiced'] ) )
+        {
+            $this->projects[ $this->index ]['invoiced'] = [];
+            $this->projects[ $this->index ]['totalInvoiced'] = 0;
+        }
+    }
+
+    private function setTotalInvoiced( $invoiced )
+    {
+        if ( ! isset( $this->projects[ $this->index ]['totalInvoiced'] ) )
+            $this->projects[ $this->index ]['totalInvoiced'] = 0;
+
+        $this->projects[ $this->index ]['totalInvoiced'] += $invoiced;
+    }
+
+    private function setWorkInProgress()
+    {
+        $this->projects[ $this->index ]['workInProgress'] =
+            $this->projects[ $this->index ]['projectEuros'] +
+            $this->projects[ $this->index ]['projectcosts'] -
+            $this->projects[ $this->index ]['totalInvoiced'];
+
+        if ( $this->projects[ $this->index ]['workInProgress'] < 0 )
+            $this->projects[ $this->index ]['workInProgress'] = 0;
+    }
+
+    private function setCurrentFinancialYear()
+    {
+        $this->currentFinancialYear = $this->project['current_financial_year'];
+    }
+
+    private function setInvoicedYears()
+    {
+        foreach ( $this->projects as $this->project )
+        {
+            foreach ( $this->project['invoiced'] as $year )
+            {
+                if ( in_array( $year['year'], $this->invoicedYears ) ) continue;
+
+                array_push( $this->invoicedYears, $year['year'] );
+            }
+        }
+    }
+
+    private function loopProjectsForInvoicedYears()
+    {
+        $this->index = 0;
+
+        foreach ( $this->projects as $this->project )
+        {
+            foreach ( $this->invoicedYears as $invoiceYear )
+            {
+                $hasYear = FALSE;
+                foreach ( $this->project['invoiced'] as $year )
+                {
+                    if ( $invoiceYear == $year['year'] ) $hasYear = TRUE;
+                }
+
+                if ( ! $hasYear ) $this->projects[ $this->index ]['invoiced'][] = [
+                    'year'     => $invoiceYear,
+                    'invoiced' => 0
+                ];
+            }
+            usort( $this->projects[ $this->index ]['invoiced'], function ( $a, $b ) {
+                return $a['year'] - $b['year'];
+            } );
+            $this->index ++;
+        }
+    }
+}
diff --git a/app/Libraries/TwoFactorAuth.php b/app/Libraries/TwoFactorAuth.php
new file mode 100644
index 0000000..e885106
--- /dev/null
+++ b/app/Libraries/TwoFactorAuth.php
@@ -0,0 +1,181 @@
+<?php
+
+namespace App\Libraries;
+
+/**
+ * Two-Factor Authentication Library
+ * Implements TOTP (Time-based One-Time Password) for Google Authenticator
+ * Based on RFC 6238
+ */
+class TwoFactorAuth
+{
+    protected int $codeLength = 6;
+    protected int $period = 30; // 30 seconds validity window
+
+    public function __construct()
+    {
+        // No CI instance needed
+    }
+
+    /**
+     * Generate a new secret key for TOTP
+     * @return string Base32 encoded secret
+     */
+    public function generateSecret(int $length = 16): string
+    {
+        $secret = '';
+        $validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567'; // Base32 alphabet
+
+        for ($i = 0; $i < $length; $i++) {
+            $secret .= $validChars[random_int(0, 31)];
+        }
+
+        return $secret;
+    }
+
+    /**
+     * Generate QR code URL for Google Authenticator
+     * @param string $secret The user's TOTP secret
+     * @param string $username The username
+     * @param string $issuer The application name
+     * @return string QR code URL
+     */
+    public function getQRCodeUrl(string $secret, string $username, string $issuer = 'DBOIS'): string
+    {
+        $encodedIssuer = rawurlencode($issuer);
+        $encodedUsername = rawurlencode($username);
+
+        $otpauthUrl = "otpauth://totp/{$encodedIssuer}:{$encodedUsername}?secret={$secret}&issuer={$encodedIssuer}";
+
+        // Using Google Charts API for QR code generation
+        return "https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl=" . urlencode($otpauthUrl);
+    }
+
+    /**
+     * Verify a TOTP code
+     * @param string $secret The user's secret
+     * @param string $code The code to verify
+     * @param int $discrepancy Time window (default 1 = +/- 30 seconds)
+     * @return bool True if code is valid
+     */
+    public function verifyCode(string $secret, string $code, int $discrepancy = 1): bool
+    {
+        $currentTimeSlice = floor(time() / $this->period);
+
+        for ($i = -$discrepancy; $i <= $discrepancy; $i++) {
+            $calculatedCode = $this->getCode($secret, (int)($currentTimeSlice + $i));
+            if ($this->timingSafeEquals($calculatedCode, $code)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Generate TOTP code for a given time slice
+     * @param string $secret The secret key
+     * @param int|null $timeSlice The time slice (defaults to current)
+     * @return string The generated code
+     */
+    public function getCode(string $secret, ?int $timeSlice = null): string
+    {
+        if ($timeSlice === null) {
+            $timeSlice = (int)floor(time() / $this->period);
+        }
+
+        $secretKey = $this->base32Decode($secret);
+
+        // Pack time into binary string
+        $time = chr(0) . chr(0) . chr(0) . chr(0) . pack('N*', $timeSlice);
+
+        // Hash with secret
+        $hash = hash_hmac('sha1', $time, $secretKey, true);
+
+        // Use last 4 bits as offset
+        $offset = ord(substr($hash, -1)) & 0x0F;
+
+        // Get 4 bytes from offset
+        $hashPart = substr($hash, $offset, 4);
+
+        // Unpack binary value
+        $value = unpack('N', $hashPart);
+        $value = $value[1];
+
+        // Only 32 bits
+        $value = $value & 0x7FFFFFFF;
+
+        // Get the required digits
+        $modulo = pow(10, $this->codeLength);
+
+        return str_pad($value % $modulo, $this->codeLength, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * Decode Base32 string
+     * @param string $secret Base32 encoded string
+     * @return string Binary string
+     */
+    protected function base32Decode(string $secret): string
+    {
+        if (empty($secret)) {
+            return '';
+        }
+
+        $base32chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+        $base32charsFlipped = array_flip(str_split($base32chars));
+
+        $paddingCharCount = substr_count($secret, '=');
+        $allowedValues = [6, 4, 3, 1, 0];
+
+        if (!in_array($paddingCharCount, $allowedValues)) {
+            return '';
+        }
+
+        for ($i = 0; $i < 4; $i++) {
+            if (
+                $paddingCharCount == $allowedValues[$i] &&
+                substr($secret, -($allowedValues[$i])) != str_repeat('=', $allowedValues[$i])
+            ) {
+                return '';
+            }
+        }
+
+        $secret = str_replace('=', '', $secret);
+        $secret = str_split($secret);
+        $binaryString = '';
+
+        for ($i = 0; $i < count($secret); $i = $i + 8) {
+            $x = '';
+            if (!isset($base32charsFlipped[$secret[$i]])) {
+                return '';
+            }
+
+            for ($j = 0; $j < 8; $j++) {
+                $char = $secret[$i + $j] ?? '';
+                $charValue = $base32charsFlipped[$char] ?? 0;
+                $x .= str_pad(base_convert((string)$charValue, 10, 2), 5, '0', STR_PAD_LEFT);
+            }
+
+            $eightBits = str_split($x, 8);
+
+            for ($z = 0; $z < count($eightBits); $z++) {
+                $y = chr((int)base_convert($eightBits[$z], 2, 10));
+                $binaryString .= ($y || ord($y) == 48) ? $y : '';
+            }
+        }
+
+        return $binaryString;
+    }
+
+    /**
+     * Timing-safe string comparison
+     * @param string $safeString Known string
+     * @param string $userString User provided string
+     * @return bool True if strings match
+     */
+    protected function timingSafeEquals(string $safeString, string $userString): bool
+    {
+        return hash_equals($safeString, $userString);
+    }
+}
diff --git a/app/Libraries/Validation/InputValidations/BaseValidation.php b/app/Libraries/Validation/InputValidations/BaseValidation.php
new file mode 100644
index 0000000..b8b5334
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/BaseValidation.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: imac-3
+ * Date: 26/06/16
+ * Time: 21:17
+ */
+
+require_once( APPPATH . 'Libraries/Validation/Validation.php' );
+
+use App\Libraries\Validation\Validation;
+
+class BaseValidation {
+
+    protected $validationField;
+    protected $key;
+    protected $fieldValue;
+    protected $errorMessages = [];
+    protected $validation;
+    protected $fieldname;
+    protected $validationResult;
+    protected $request;
+
+    public function __construct()
+    {
+        $this->request = \Config\Services::request();
+        $this->validateInput();
+    }
+
+    public function getValidationResult()
+    {
+        return $this->validationResult;
+    }
+
+    public function validateInput()
+    {
+        $this->loopFields();
+    }
+
+    public function getErrorMessages()
+    {
+        return $this->errorMessages;
+    }
+
+    private function loopFields()
+    {
+        foreach ( $this->validationFields as $this->key => $this->validationField )
+        {
+            $this->validation = new Validation();
+
+            $this->setInputfield();
+
+            $this->validateFieldvalue();
+
+            $this->setFieldname();
+
+            $this->setValidationResult();
+
+            $this->setErrorMesagges();
+        }
+    }
+
+    private function setInputfield()
+    {
+        $this->fieldValue = $this->request->getPost($this->key);
+    }
+
+    private function validateFieldvalue()
+    {
+        $this->validation->validate( $this->fieldValue, $this->validationField );
+    }
+
+    private function setFieldname()
+    {
+        $this->fieldname = $this->validationField['fieldname'];
+    }
+
+    private function setErrorMesagges()
+    {
+        $this->errorMessages[ $this->fieldname ] = $this->validation->getErrorMessages();
+    }
+
+    private function setValidationResult()
+    {
+        if( $this->validationResult === FALSE ) return;
+
+        $this->validationResult = $this->validation->getValidationResult();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/CustomerValidation.php b/app/Libraries/Validation/InputValidations/CustomerValidation.php
new file mode 100644
index 0000000..0cb4688
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/CustomerValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class CustomerValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'name'      => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'name'
+        ],
+        'email' => [
+            'validations' => 'email',
+            'fieldname'   => 'email'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/EmployeeTargetValidation.php b/app/Libraries/Validation/InputValidations/EmployeeTargetValidation.php
new file mode 100644
index 0000000..30a4675
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/EmployeeTargetValidation.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class EmployeeTargetValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'user_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'gebruiker'
+        ],
+        'startmonth'      => [
+            'validations' => 'integer',
+            'fieldname'   => 'startmaand'
+        ],
+        'startyear' => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'startjaar'
+        ],
+        'target' =>[
+            'validations' => 'integer',
+            'fieldname'   => 'uren target'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ExternalValidation.php b/app/Libraries/Validation/InputValidations/ExternalValidation.php
new file mode 100644
index 0000000..9da400d
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ExternalValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ExternalValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'contactperson' => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'contact'
+        ],
+        'email'         => [
+            'validations' => 'email',
+            'fieldname'   => 'email'
+        ],
+        'rate'          => [
+            'validations' => 'numeric',
+            'fieldname'   => 'tarief'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ForecastValidation.php b/app/Libraries/Validation/InputValidations/ForecastValidation.php
new file mode 100644
index 0000000..1c5b55c
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ForecastValidation.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ForecastValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'project_id'     => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'project'
+        ],
+        'year'           => [
+            'validations' => 'integer',
+            'fieldname'   => 'jaar'
+        ],
+        'month_id'       => [
+            'validations' => 'integer',
+            'fieldname'   => 'maand'
+        ],
+        'forecastamount' => [
+            'validations' => 'number',
+            'fieldname'   => 'bedrag'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/InvoiceValidation.php b/app/Libraries/Validation/InputValidations/InvoiceValidation.php
new file mode 100644
index 0000000..91955ce
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/InvoiceValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class InvoiceValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'project_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'project'
+        ],
+        'invoicedate'   => [
+            'validations' => 'date',
+            'fieldname'   => 'factuurdatum'
+        ],
+        'forecastdate'   => [
+            'validations' => 'date',
+            'fieldname'   => 'prognosedatum'
+        ],
+        'invoiceamount' => [
+            'validations' => 'number',
+            'fieldname'   => 'factuurbedrag'
+        ],
+        'forecastamount' => [
+            'validations' => 'number',
+            'fieldname'   => 'prognosebedrag'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/LoginValidation.php b/app/Libraries/Validation/InputValidations/LoginValidation.php
new file mode 100644
index 0000000..ae08794
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/LoginValidation.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: imac-3
+ * Date: 26/06/16
+ * Time: 21:13
+ */
+
+class LoginValidation extends BaseValidation {
+
+    protected $validationFields = [
+        'username' => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'gebruikersnaam'
+        ],
+        'password'    => [
+            'validations' => 'required',
+            'fieldname'   => 'wachtwoord'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/OfferValidation.php b/app/Libraries/Validation/InputValidations/OfferValidation.php
new file mode 100644
index 0000000..d166e08
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/OfferValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class OfferValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'customer_id'      => [
+            'validations' => 'required|numeric',
+            'fieldname'   => 'klant'
+        ],
+        'startdate' => [
+            'validations' => 'required|date',
+            'fieldname'   => 'offertedatum'
+        ],
+        'acceptdate' => [
+            'validations' => 'date',
+            'fieldname'   => 'acceptatiedatum'
+        ],
+        'rejectdate' => [
+            'validations' => 'date',
+            'fieldname'   => 'afwijsdatum'
+        ],
+        'acceptance_chance' => [
+            'validations' => 'numeric',
+            'fieldname'   => 'afwijsdatum|minvalue-0|maxvalue-100'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/OrganisationValidation.php b/app/Libraries/Validation/InputValidations/OrganisationValidation.php
new file mode 100644
index 0000000..e47cf7d
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/OrganisationValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Created by Pensare Software
+ * User: Theo Weijmer
+ * Date: 26/06/16
+ * Time: 20:39
+ */
+
+class OrganisationValidation extends BaseValidation {
+
+    protected $validationFields = [
+        'brin'      => [
+            'validations' => 'required|alphaNumeric',
+            'fieldname'   => 'brinnummer'
+        ],
+        'naam' => [
+            'validations' => 'required',
+            'fieldname'   => 'Organisatienaam'
+        ],
+        'naamkort' => [
+            'validations' => 'required',
+            'fieldname'   => 'Organisatienaam (kort)'
+        ],
+        'vestiging' => [
+            'validations' => 'required|alphaNumeric|unique',
+            'fieldname'   => 'vestigingsnummer',
+            'model'       => 'organisations_model',
+            'field'       => 'vestiging'
+        ],
+        'email'     => [
+            'validations' => 'email',
+            'fieldname'   => 'email'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/PasswordRequestValidation.php b/app/Libraries/Validation/InputValidations/PasswordRequestValidation.php
new file mode 100644
index 0000000..cbca75f
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/PasswordRequestValidation.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: imac-3
+ * Date: 26/06/16
+ * Time: 21:13
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class PasswordRequestValidation extends BaseValidation {
+
+    protected $validationFields = [
+        'username' => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'gebruikersnaam'
+        ],
+        'email'    => [
+            'validations' => 'required|email',
+            'fieldname'   => 'email'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/PaymentValidation.php b/app/Libraries/Validation/InputValidations/PaymentValidation.php
new file mode 100644
index 0000000..f86a506
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/PaymentValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class PaymentValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'invoice_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'factuur'
+        ],
+        'paymentdate'   => [
+            'validations' => 'date',
+            'fieldname'   => 'betaaldatum'
+        ],
+        'paymentamount' => [
+            'validations' => 'number',
+            'fieldname'   => 'bedrag'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ProjectValidation.php b/app/Libraries/Validation/InputValidations/ProjectValidation.php
new file mode 100644
index 0000000..9b6d3ef
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ProjectValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ProjectValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'customer_id' => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'klant'
+        ],
+        'startdate'      => [
+            'validations' => 'required|date',
+            'fieldname'   => 'start project'
+        ],
+        'enddate' => [
+            'validations' => 'date',
+            'fieldname' => 'eind project'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ProjectcostValidation.php b/app/Libraries/Validation/InputValidations/ProjectcostValidation.php
new file mode 100644
index 0000000..7c6dc93
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ProjectcostValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ProjectcostValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'project_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'project'
+        ],
+        'external_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'externe'
+        ],
+        'date'   => [
+            'validations' => 'date',
+            'fieldname'   => 'datum'
+        ],
+        'costs' => [
+            'validations' => 'number',
+            'fieldname'   => 'kosten'
+        ],
+        'payed' => [
+            'validations' => 'number',
+            'fieldname'   => 'betaald'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ProjectemployeeValidation.php b/app/Libraries/Validation/InputValidations/ProjectemployeeValidation.php
new file mode 100644
index 0000000..b62a2aa
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ProjectemployeeValidation.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ProjectemployeeValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'user_id' => [
+            'validations' => 'integer',
+            'fieldname'   => 'klant'
+        ],
+        'startdate'      => [
+            'validations' => 'date',
+            'fieldname'   => 'start project'
+        ],
+        'enddate' => [
+            'validations' => 'date',
+            'fieldname' => 'eind project'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->handleSpecificValidations();
+    }
+
+    protected function handleSpecificValidations()
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ProjecthourValidation.php b/app/Libraries/Validation/InputValidations/ProjecthourValidation.php
new file mode 100644
index 0000000..3fb9dee
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ProjecthourValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ProjecthourValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'projectemployee_id'      => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'projectmedewerker'
+        ],
+        'hourdate'   => [
+            'validations' => 'date',
+            'fieldname'   => 'datum'
+        ],
+        'hours' => [
+            'validations' => 'number',
+            'fieldname'   => 'uren'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/ReservationValidation.php b/app/Libraries/Validation/InputValidations/ReservationValidation.php
new file mode 100644
index 0000000..b980735
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/ReservationValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class ReservationValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'project_id'     => [
+            'validations' => 'required|integer',
+            'fieldname'   => 'project'
+        ],
+        'external_id' =>[
+            'validations' => 'required|integer',
+            'fieldname'   => 'onderaannemer'
+        ],
+        'reservationamount' => [
+            'validations' => 'number',
+            'fieldname'   => 'bedrag'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/InputValidations/UserValidation.php b/app/Libraries/Validation/InputValidations/UserValidation.php
new file mode 100644
index 0000000..1abf3cd
--- /dev/null
+++ b/app/Libraries/Validation/InputValidations/UserValidation.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/07/16
+ * Time: 13:35
+ */
+
+require_once( APPPATH . 'Libraries/Validation/InputValidations/BaseValidation.php' );
+
+class UserValidation extends BaseValidation {
+
+
+    protected $validationFields = [
+        'firstname'      => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'firstname'
+        ],
+        'lastname' => [
+            'validations' => 'required|alphaNumericSpaces',
+            'fieldname'   => 'lastname'
+        ],
+        'email' => [
+            'validations' => 'required|email|unique',
+            'fieldname'   => 'email',
+            'model'       => 'User_model',
+            'field'       => 'email'
+        ],
+        'username'     => [
+            'validations' => 'required|alphanumeric|minlength-4|unique',
+            'fieldname'   => 'username',
+            'model'       => 'User_model',
+            'field'       => 'username'
+        ],
+        'hourlyrate' =>[
+            'validations' => 'decimal',
+            'fieldname'   => 'uurtarief'
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}
\ No newline at end of file
diff --git a/app/Libraries/Validation/Validation.php b/app/Libraries/Validation/Validation.php
new file mode 100644
index 0000000..d9c8ab1
--- /dev/null
+++ b/app/Libraries/Validation/Validation.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace App\Libraries\Validation;
+
+use CodeIgniter\HTTP\IncomingRequest;
+
+/**
+ * Custom Validation Library
+ * Migrated from CodeIgniter 3 to CodeIgniter 4
+ */
+class Validation
+{
+    private $fieldValue;
+    private $validations;
+    private $validation;
+    private $validationResult;
+    private array $errorMessages = [];
+    private $validationField;
+    protected IncomingRequest $request;
+
+    public function __construct()
+    {
+        $this->request = \Config\Services::request();
+    }
+
+    public function validate($fieldValue, $validationField = false): void
+    {
+        $this->setValidationField($validationField);
+        $this->setFieldValue($fieldValue);
+        $this->handle();
+    }
+
+    public function setValidationField($validationfield): void
+    {
+        $this->validationField = $validationfield;
+    }
+
+    public function getErrorMessages(): array
+    {
+        return $this->errorMessages;
+    }
+
+    public function getValidationResult(): bool
+    {
+        return $this->validationResult;
+    }
+
+    private function handle(): void
+    {
+        $this->setValidations();
+        $this->checkValidations();
+        $this->setValidationResult();
+    }
+
+    private function setValidations(): void
+    {
+        $this->validations = explode('|', $this->validationField['validations']);
+    }
+
+    private function setFieldValue($fieldValue): void
+    {
+        $this->fieldValue = $fieldValue;
+    }
+
+    private function setValidationResult(): void
+    {
+        if (count($this->errorMessages) == 0) {
+            $this->validationResult = true;
+            return;
+        }
+
+        $this->validationResult = false;
+    }
+
+    private function checkValidations(): void
+    {
+        foreach ($this->validations as $this->validation) {
+            if ($this->validation == 'required') $this->checkRequired();
+            if ($this->validation == 'alpha') $this->checkAlfa();
+            if ($this->validation == 'alphaNumeric') $this->checkAlfanumeric();
+            if ($this->validation == 'alphaNumericSpaces') $this->checkAlphaNumericSpaces();
+            if ($this->validation == 'alphaDash') $this->checkAlphaDash();
+            if ($this->validation == 'numeric') $this->checkNumeric();
+            if ($this->validation == 'integer') $this->checkInteger();
+            if ($this->validation == 'decimal') $this->checkDecimal();
+            if ($this->validation == 'email') $this->checkEmail();
+            if ($this->validation == 'unique') $this->checkUnique();
+            if ($this->validation == 'date') $this->checkDate();
+            if (substr($this->validation, 0, 9) == 'minlength') $this->checkMinlength();
+            if (substr($this->validation, 0, 9) == 'maxlength') $this->checkMaxlength();
+            if (substr($this->validation, 0, 8) == 'minvalue') $this->checkMinvalue();
+            if (substr($this->validation, 0, 8) == 'maxvalue') $this->checkMaxvalue();
+        }
+    }
+
+    public function checkRequired(): void
+    {
+        if (!$this->fieldValue || empty($this->fieldValue) || strlen($this->fieldValue) == 0)
+            $this->errorMessages[] = 'veld is verplicht';
+    }
+
+    public function checkAlfa(): void
+    {
+        $value = ctype_alpha($this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen letters toegestaan';
+    }
+
+    public function checkAlfaNumeric(): bool
+    {
+        $value = ctype_alnum((string)$this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen letters en cijfers toegestaan';
+        return $value;
+    }
+
+    public function checkAlphaNumericSpaces(): void
+    {
+        $value = (bool)preg_match('/^[A-Z0-9 ]+$/i', $this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen letters, cijfers en spaties toegestaan';
+    }
+
+    public function checkAlphaDash(): void
+    {
+        $value = (bool)preg_match('/^[a-z0-9_-]+$/i', $this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen letters, cijfers en streepjes toegestaan';
+    }
+
+    public function checkNumeric(): void
+    {
+        $value = (bool)preg_match('/^[\-+]?[0-9]*\.?[0-9]+$/', $this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen getallen toegestaan';
+    }
+
+    public function checkInteger(): void
+    {
+        $value = (bool)preg_match('/^[\-+]?[0-9]+$/', $this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen gehele getallen toegestaan';
+    }
+
+    public function checkDecimal(): void
+    {
+        $value = is_numeric($this->fieldValue);
+        if (!$value) $this->errorMessages[] = 'alleen getallen toegestaan';
+    }
+
+    public function checkEmail(): void
+    {
+        if (!$this->fieldValue || empty($this->fieldValue) || strlen($this->fieldValue) == 0) return;
+
+        $value = (bool)filter_var($this->fieldValue, FILTER_VALIDATE_EMAIL);
+        if (!$value) $this->errorMessages[] = 'ongeldig emailadres';
+    }
+
+    public function checkUnique(): void
+    {
+        $recordID = $this->request->getPost('id');
+        $model = $this->validationField['model'];
+        $field = $this->validationField['field'];
+
+        // For Eloquent models, we can call the static method directly
+        $value = $model::checkUnique($recordID, $field, $this->fieldValue);
+
+        if (!$value) $this->errorMessages[] = 'invoer moet uniek zijn';
+    }
+
+    public function checkDate(): void
+    {
+        if (empty($this->fieldValue)) return;
+
+        $dateParts = explode('-', $this->fieldValue);
+
+        if (count($dateParts) != 3) $dateParts = explode('/', $this->fieldValue);
+
+        if (count($dateParts) != 3) {
+            $this->errorMessages[] = 'invoer is geen datum';
+            return;
+        }
+
+        if (!checkdate((int)$dateParts[1], (int)$dateParts[0], (int)$dateParts[2]))
+            $this->errorMessages[] = 'invoer is geen datum';
+    }
+
+    private function checkMinlength(): void
+    {
+        $length = explode('-', $this->validation);
+        if (strlen($this->fieldValue) < (int)$length[1])
+            $this->errorMessages[] = 'moet minimaal uit ' . $length[1] . ' karakters bestaan';
+    }
+
+    private function checkMaxlength(): void
+    {
+        $length = explode('-', $this->validation);
+        if (strlen($this->fieldValue) > (int)$length[1])
+            $this->errorMessages[] = 'mag maximaal uit ' . $length[1] . ' karakters bestaan';
+    }
+
+    private function checkMinValue(): void
+    {
+        $value = explode('-', $this->validation);
+        if ($this->fieldValue < (float)$value[1])
+            $this->errorMessages[] = 'moet minimaal ' . $value[1] . ' zijn';
+    }
+
+    private function checkMaxValue(): void
+    {
+        $value = explode('-', $this->validation);
+        if ($this->fieldValue > (float)$value[1])
+            $this->errorMessages[] = 'mag maximaal ' . $value[1] . ' zijn';
+    }
+}
diff --git a/app/Models/Eloquent/BaseModel.php b/app/Models/Eloquent/BaseModel.php
new file mode 100644
index 0000000..807689d
--- /dev/null
+++ b/app/Models/Eloquent/BaseModel.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 25/12/2017
+ * Time: 10:20
+ */
+
+use \Illuminate\Database\Eloquent\Model as Eloquent;
+
+class BaseModel extends Eloquent {
+
+
+    /**
+     * The name of the "created at" column.
+     *
+     * @var string
+     */
+    const CREATED_AT = 'created_by';
+
+    /**
+     * The name of the "updated at" column.
+     *
+     * @var string
+     */
+    const UPDATED_AT = 'last_update_date';
+
+    protected $guarded = [];
+
+    protected $hidden = ['creation_date', 'last_update_date', 'created_by', 'updated_by', 'password', 'salt'];
+
+    protected static $oldValue;
+
+    public static function boot()
+    {
+        parent::boot();
+
+        static::creating( function ( $model ) {
+            static::$oldValue = '';
+
+            if ( AUTHENTICATED )
+            {
+                $user = User::find(USERID);
+                $model->created_by = $user->username;
+                $model->updated_by = $user->username;
+            }
+        } );
+        static::updating( function ( $model ) {
+            static::$oldValue = json_encode($model->original);
+
+            if ( AUTHENTICATED )
+            {
+                $user = User::find(USERID);
+                $model->updated_by = $user->username;
+            }
+        } );
+
+    }
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Comment.php b/app/Models/Eloquent/Comment.php
new file mode 100644
index 0000000..f608412
--- /dev/null
+++ b/app/Models/Eloquent/Comment.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/01/2018
+ * Time: 14:22
+ */
+
+class Comment extends BaseModel {
+
+    protected $table = "comments";
+
+    public function user()
+    {
+        return $this->belongsTo( 'User' );
+    }
+
+    public static function getComments( $foreignID, $tablename )
+    {
+        $comments = Comment::orderBy( 'comment_date', 'desc' )
+            ->with( [
+                'user' => function ( $q ) {
+                    $q->selectRaw( "CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname, id" );
+                }] )
+            ->whereForeignId( $foreignID )
+            ->whereForeignTable( $tablename )
+            ->get();
+
+        foreach ( $comments as $comment )
+        {
+            $comment->comment = base64_decode( $comment->comment );
+        }
+
+        return $comments;
+    }
+
+    public static function addComment( $foreignID, $tablename )
+    {
+        $data = [
+            'foreign_id'    => $foreignID,
+            'foreign_table' => $tablename,
+            'user_id'       => USERID,
+            'comment_date'  => date( 'Y-m-d H:i:s' )
+        ];
+
+        $comment = Comment::create( $data );
+
+        return $comment['id'];
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Customer.php b/app/Models/Eloquent/Customer.php
new file mode 100644
index 0000000..6fbeab1
--- /dev/null
+++ b/app/Models/Eloquent/Customer.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * Customer: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:04
+ */
+
+
+class Customer extends BaseModel {
+
+    protected $table = "customers";
+
+    public static function getAllCustomers( $archive )
+    {
+        $customers = Customer::orderBy( 'name' );
+
+        if ( $archive == 'F' ) $customers = $customers->whereArchive( 'F' );
+
+        $customers = $customers->get();
+
+        return $customers;
+    }
+
+    public static function saveCustomer( $customerID, $customer )
+    {
+        $customer = (array)$customer;
+
+        if( $customerID == 0)
+        {
+            $customer = Customer::create($customer);
+            $customerID = $customer['id'];
+        }
+        else
+        {
+            Customer::whereId($customerID)->update($customer);
+        }
+
+        return $customerID;
+    }
+
+    public static function removeCustomer($customerID)
+    {
+        Customer::whereId($customerID)->delete();
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Document.php b/app/Models/Eloquent/Document.php
new file mode 100644
index 0000000..5339564
--- /dev/null
+++ b/app/Models/Eloquent/Document.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 10/01/2018
+ * Time: 20:02
+ */
+
+class Document  extends BaseModel {
+
+    protected $table = "documents";
+
+    public function user()
+    {
+        return $this->belongsTo( 'User' );
+    }
+
+    public static function getDocuments( $foreignID)
+    {
+        $documents = Document::orderBy( 'uploaddate', 'desc' )
+            ->with( [
+                'user' => function ( $q ) {
+                    $q->selectRaw( "CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname, id" );
+                }] )
+            ->whereForeignId( $foreignID )
+            ->get();
+
+        return $documents;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Employeehour.php b/app/Models/Eloquent/Employeehour.php
new file mode 100644
index 0000000..a78c509
--- /dev/null
+++ b/app/Models/Eloquent/Employeehour.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:05
+ */
+
+
+class Employeehour extends BaseModel {
+
+    protected $table = "employeehours";
+
+    public function user()
+    {
+        return $this->belongsTo( 'User', 'employee_id' );
+    }
+
+    public function hourtype()
+    {
+        return $this->belongsTo( 'Hourtype' );
+    }
+
+    public static function getEmployeehours( $month, $year )
+    {
+        $employeehours = Employeehour::whereRaw( "MONTH(hourdate) = " . ( $month + 1 ) . " AND YEAR(hourdate) = {$year}" )
+            ->with( [
+                'user' => function ( $q ) {
+                    $q->selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" );
+                }] )
+            ->with( 'hourtype' );
+
+        $projecthours = Employeehour::whereRaw("MONTH(hourdate) = " . ( $month + 1 ) . " AND YEAR(hourdate) = {$year}" )->with( [
+            'user' => function ( $q ) {
+                $q->selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" );
+            }] )
+            ->with( 'hourtype' );
+
+        $results = $employeehours->union($projecthours)->get();
+
+        return $results;
+    }
+
+    public static function saveEmployeehour( $data )
+    {
+		$record = Employeehour::whereUuid( $data['uuid'])->first();
+        if ( ! $record )
+        {
+            $employeehour = Employeehour::create( $data );
+            $employeehourID = $employeehour->id;
+        }
+        else
+        {
+            Employeehour::whereUuid( $data['uuid'] )->update( $data );
+			$employeehourID = FALSE;
+        }
+
+        return $employeehourID;
+    }
+}
diff --git a/app/Models/Eloquent/Employeetarget.php b/app/Models/Eloquent/Employeetarget.php
new file mode 100644
index 0000000..b507a61
--- /dev/null
+++ b/app/Models/Eloquent/Employeetarget.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/04/2018
+ * Time: 19:55
+ */
+
+class Employeetarget extends BaseModel {
+
+    protected $table = 'employeetargets';
+
+    public function user()
+    {
+        return $this->belongsTo( 'User' );
+    }
+
+    public static function saveTarget( $targetID, $target )
+    {
+        $target = (array) $target;
+
+        if ( $targetID == 0 )
+        {
+            $target = self::create( $target );
+            $targetID = $target['id'];
+        }
+        else
+        {
+            self::whereId( $targetID )->update( $target );
+        }
+
+        return $targetID;
+    }
+
+    public static function getTargetHoursPerEmployee( $employeeID, $year, $monthID )
+    {
+        $months = $monthID == 0 ? [1,2,3,4,5,6,7,8,9,10,11,12] : [$monthID];
+
+        $targetHours = 0;
+
+        foreach($months as $month)
+        {
+            $targetHours += self::getCurrentMonthTarget( $employeeID, $year, $month);
+        }
+
+        return $targetHours;
+    }
+
+    public static function getCurrentMonthTarget( $employeeID, $year, $month )
+    {
+        $monthTarget = Self::whereUserId($employeeID)
+            ->where('startyear', '<=', $year)
+            ->where('startmonth', '<=', $month)
+            ->orderBy('startyear', 'DESC')
+            ->orderBy('startmonth', 'DESC');
+
+        if( $monthTarget->count() == 0 ) return 0;
+
+        $monthtarget =  $monthTarget->first();
+
+        return $monthtarget->target;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/External.php b/app/Models/Eloquent/External.php
new file mode 100644
index 0000000..d5ed07e
--- /dev/null
+++ b/app/Models/Eloquent/External.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * External: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:04
+ */
+
+
+class External extends BaseModel {
+
+    protected $table = "externals";
+
+    public function reservations()
+    {
+        return $this->hasMany( 'Reservation' );
+    }
+
+    public static function getAllExternals( $archive )
+    {
+        $externals = External::orderBy( 'name' );
+
+        if ( $archive == 'F' ) $externals = $externals->whereArchive( 'F' );
+
+        $externals = $externals->get();
+
+        return $externals;
+    }
+
+    public static function saveExternal( $externalID, $external )
+    {
+        $external = (array) $external;
+
+        if ( $externalID == 0 )
+        {
+            $external = External::create( $external );
+            $externalID = $external['id'];
+        }
+        else
+        {
+            External::whereId( $externalID )->update( $external );
+        }
+
+        return $externalID;
+    }
+
+    public static function removeExternal( $externalID )
+    {
+        External::whereId( $externalID )->delete();
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Forecast.php b/app/Models/Eloquent/Forecast.php
new file mode 100644
index 0000000..ec3e733
--- /dev/null
+++ b/app/Models/Eloquent/Forecast.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 07/03/2018
+ * Time: 09:24
+ */
+
+class Forecast extends BaseModel {
+
+    public function project()
+    {
+        return $this->belongsTo( 'Project' );
+    }
+
+    public static function saveForecast( $forecastID, $forecast )
+    {
+        $forecast = (array) $forecast;
+
+        if ( $forecastID == 0 )
+        {
+            $forecast = self::create( $forecast );
+            $forecastID = $forecast['id'];
+        }
+        else
+        {
+            self::whereId( $forecastID )->update( $forecast );
+        }
+
+        return $forecastID;
+    }
+
+    public static function removeForecast( $forecastID )
+    {
+        Forecast::whereId( $forecastID )->delete();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Hourtype.php b/app/Models/Eloquent/Hourtype.php
new file mode 100644
index 0000000..7f45af2
--- /dev/null
+++ b/app/Models/Eloquent/Hourtype.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:05
+ */
+
+
+class Hourtype extends BaseModel {
+
+    protected $table = "hourtypes";
+
+    public function employeehours()
+    {
+        return $this->hasMany( 'Employeehour' );
+    }
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Invoice.php b/app/Models/Eloquent/Invoice.php
new file mode 100644
index 0000000..f595f17
--- /dev/null
+++ b/app/Models/Eloquent/Invoice.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 23/01/2018
+ * Time: 15:58
+ */
+
+
+class Invoice extends BaseModel {
+
+    public function project()
+    {
+        return $this->belongsTo( 'Project' );
+    }
+
+    public function payments()
+    {
+        return $this->hasMany( 'Payment' );
+    }
+
+    public function vat()
+    {
+        return $this->belongsTo( 'Vat' );
+    }
+
+    public static function invoicePerYear( $projectID, $year, $thatYear = TRUE )
+    {
+        $invoices = Invoice::selectRAW( 'SUM(invoiceamount * ( 1 +(vatrate / 100))) AS invoicetotal' )
+            ->join( 'vats', 'vats.id', '=', 'invoices.vat_id' )
+            ->whereProjectId( $projectID );
+
+        if ( $thatYear )
+        {
+            $invoices = $invoices->whereRaw( "YEAR(invoicedate) = {$year}" );
+        }
+        else
+        {
+            $invoices = $invoices->whereRaw( "YEAR(invoicedate) != {$year}" );
+        }
+
+        if ( $invoices->count() == 0 ) return 0;
+
+        $invoices = $invoices->first();
+
+        return $invoices->invoicetotal;
+    }
+
+    public static function saveInvoice( $invoiceID, $invoice )
+    {
+        $invoice = (array) $invoice;
+
+        if ( $invoiceID == 0 )
+        {
+            $invoice = Invoice::create( $invoice );
+            $invoiceID = $invoice['id'];
+        }
+        else
+        {
+            Invoice::whereId( $invoiceID )->update( $invoice );
+        }
+
+        return $invoiceID;
+    }
+
+	public static function getInvoiced( $year, $orderType='invoicedate', $orderDirection='DESC' )
+	{
+		$invoiced = Invoice::selectRaw('invoicenumber, PRJ.projectname, projectnumber, CUS.name, invoicedate, CUS.name, ROUND(invoiceamount, 0) AS invoiceamount')
+			->join('projects AS PRJ', 'PRJ.id', '=', 'invoices.project_id')
+			->join('customers AS CUS', 'CUS.id', '=', 'PRJ.customer_id')
+			->whereRaw("DATE_FORMAT(invoicedate, '%Y') = {$year}")
+			->orderBy($orderType, $orderDirection)
+			->get();
+
+		return $invoiced;
+    }
+
+    public static function getInvoicedPerYearPerProject($projectID)
+    {
+        $invoiced = Invoice::selectRaw('ROUND(COALESCE(SUM(invoiceamount), 0), 0) AS invoiced, YEAR(invoicedate) AS invoiceyear')
+            ->where('project_id', $projectID)
+            ->groupByRaw('YEAR(invoicedate)')
+            ->orderByRaw('YEAR(invoicedate)')
+            ->get();
+
+        return $invoiced;
+    }
+
+    public static function getTotalsOutstandingPerProject($archive = true)
+    {
+        $sql = "
+            SELECT
+                PRJ.id,
+                projectnumber,
+                projectname,
+                SUM(invoiced) AS invoiced,
+                SUM(payment) AS payment,
+                revenues,
+                costs,
+                COALESCE(payedcosts, 0) AS payedcosts
+            FROM (
+                SELECT
+                    project_id,
+                    ROUND(SUM(invoiceamount * (1 + (vatrate / 100))), 0) AS invoiced,
+                    payment
+                FROM
+                    invoices INV
+                    JOIN vats VAT ON VAT.id = INV.vat_id
+                    LEFT JOIN (
+                        SELECT
+                            ROUND(COALESCE(SUM(paymentamount), 0), 0) AS payment,
+                            invoice_id
+                        FROM
+                            payments
+                        GROUP BY
+                            invoice_id) AS Q1 ON INV.id = Q1.invoice_id
+                    GROUP BY
+                        INV.id) Q2
+                JOIN projects PRJ ON PRJ.id = Q2.project_id
+                JOIN (
+                    SELECT
+                        ROUND((own_revenue + other_revenue + costs) * (1 + (vatrate / 100)), 0) revenues,
+                        ROUND(costs * (1 + (vatrate / 100)), 0) costs,
+                        OFF.project_id
+                    FROM
+                        offers OFF
+                        JOIN projects PRJ ON PRJ.id = OFF.project_id
+                        JOIN vats VAT ON VAT.id = PRJ.vat_id) Q3 ON Q3.project_id = PRJ.id
+                LEFT JOIN (
+                    SELECT
+                        SUM(costs) AS payedcosts,
+                        project_id
+                    FROM
+                        projectcosts
+                    GROUP BY
+                        project_id) Q4 ON Q4.project_id = PRJ.id ";
+
+        if ($archive === false) {
+            $sql .= "WHERE PRJ.archive = 'F' ";
+        }
+
+        $sql .= "GROUP BY PRJ.id";
+
+        $db = \Config\Database::connect();
+        return $db->query($sql)->getResult();
+    }
+}
diff --git a/app/Models/Eloquent/Offer.php b/app/Models/Eloquent/Offer.php
new file mode 100644
index 0000000..fe1b1ef
--- /dev/null
+++ b/app/Models/Eloquent/Offer.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:05
+ */
+
+
+class Offer extends BaseModel {
+
+	protected $table = "offers";
+
+	public function payments()
+	{
+		return $this->hasMany( 'Payment' );
+	}
+
+	public function project()
+	{
+		return $this->belongsTo( 'Project' );
+	}
+
+	public function customer()
+	{
+		return $this->belongsTo( 'Customer' );
+	}
+
+	public static function getAllOffers( $projectID, $archive = 'F', $search, $order, $direction )
+	{
+		$offers = Offer::selectRAW( 'offers.*' )
+			->join( 'customers AS CUS', 'CUS.id', '=', 'offers.customer_id' )
+			->with( 'customer' )
+			->with( 'project' )
+			->where( 'offernumber', 'LIKE', "%{$search}%" )
+			->orderBy( $order, $direction );
+
+		if ( $projectID ) $offers = $offers->whereProjectId( $projectID );
+
+		if ( $archive == 'F' ) $offers = $offers->where( 'offers.archive', '=', 'F' );
+
+		$offers = $offers->get();
+
+		return $offers;
+	}
+
+	public static function getOffersWithoutProject()
+	{
+		$offersWithoutProject = Offer::selectRAW('offers.*, CONCAT(offernumber, " ", offername) AS fulloffer')
+			->orderBy( 'startdate' )
+//            ->whereNull('rejectdate')
+//            ->whereNull('project_id')
+			->whereArchive( 'F' )
+			->get();
+
+		return $offersWithoutProject;
+	}
+
+	public static function saveOffer( $offerID, $offer )
+	{
+		$offer = (array) $offer;
+
+		$offer['startdate'] = date2mysql( $offer['startdate'] );
+		$offer['accepteddate'] = date2mysql( $offer['accepteddate'] );
+		$offer['rejectdate'] = date2mysql( $offer['rejectdate'] );
+		$offer['deadline'] = date2mysql( $offer['deadline'] );
+
+		if ( $offerID == 0 )
+		{
+			$offer = Offer::create( $offer );
+
+			$offerID = $offer['id'];
+		}
+		else
+		{
+			Offer::whereId( $offerID )->update( $offer );
+
+			$offer = self::find( $offerID );
+
+			if ( ! is_null( $offer->project_id ) ) Project::syncOffername( $offer );
+		}
+
+		return $offerID;
+	}
+
+	public static function syncProjectname( $projectID )
+	{
+		$project = Project::find( $projectID );
+
+		$offer = self::find( $projectID );
+
+		$offer->offername = $project->projectname;
+		$offer->save();
+	}
+
+	public static function removeOffer( $offerID )
+	{
+		Offer::whereId( $offerID )->delete();
+	}
+}
diff --git a/app/Models/Eloquent/Page.php b/app/Models/Eloquent/Page.php
new file mode 100644
index 0000000..d0e6fbf
--- /dev/null
+++ b/app/Models/Eloquent/Page.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:05
+ */
+
+use \Illuminate\Database\Eloquent\Model as Eloquent;
+
+class Page extends BaseModel {
+
+    protected $table = "pages";
+
+    public function subpages()
+    {
+        return $this->hasMany( 'Page' );
+    }
+
+
+    public static function getPages( $user )
+    {
+        $pages = Page::whereRaw( "id = page_id AND ((SELECT {$user->role} & pagelevel) != 0 OR pagelevel = 0)" )
+            ->with( [
+                'subpages' => function ( $q ) use ( $user ) {
+                    $q->whereRaw(
+                        "id != page_id AND ((SELECT {$user->role} & pagelevel) != 0 OR pagelevel = 0)" )
+                        ->orderBy( 'pageorder' );
+                }] )
+            ->orderBy( 'pageorder' )
+            ->get();
+
+        return $pages;
+    }
+
+    public static function getAppPages( $user )
+    {
+        $appPages = Page::select( 'id', 'pageurl' )
+            ->whereAppPage( 'T' )
+            ->whereRaw(
+                "((SELECT {$user->role} & pagelevel) != 0 OR pagelevel = 0)" )
+            ->get();
+
+        return $appPages;
+    }
+
+    public static function getPageAccessByRoleLevel( $roleLevel )
+    {
+        $rolePages = self::selectRaw( "
+            id,
+            {$roleLevel} AS rolelevel,
+            IF(id = page_id, 'MAIN', 'SUB') AS typepage,
+            pagename,
+            IF((SELECT {$roleLevel} & pagelevel ) = 0, 'F', 'T') AS pageaccess" )
+            ->orderByRaw( "page_id, IF(id = page_id, 0, 1)" )
+            ->get();
+
+        return $rolePages;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Payment.php b/app/Models/Eloquent/Payment.php
new file mode 100644
index 0000000..c5f7a96
--- /dev/null
+++ b/app/Models/Eloquent/Payment.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 16/01/2018
+ * Time: 10:27
+ */
+
+class Payment extends BaseModel {
+
+	protected $table = "payments";
+
+	public function invoice()
+	{
+		return $this->belongsTo( 'Invoice' );
+	}
+
+	public static function getPaymentPerProject( $projectID )
+	{
+		$projectPayment = self::selectRAW( 'id, invoice_id, SUM(paymentamount) as payment' )
+			->whereHas( 'invoice', function ( $q ) use ( $projectID ) {
+				$q->whereProjectId( $projectID );
+			} )
+			->first();
+
+		if ( ! $projectPayment ) return 0;
+
+		return $projectPayment->payment;
+	}
+
+	public static function getPaymentsPerCustomerMonth( $year )
+	{
+		$projects = self::selectRaw( 'PRJ.id, projectname, CUS.name, SUM(paymentamount) AS totalProjectPayments' )
+			->join( 'invoices AS INV', 'INV.id', '=', 'payments.invoice_id' )
+			->join( 'projects AS PRJ', 'PRJ.id', '=', 'INV.project_id' )
+			->join( 'customers AS CUS', 'CUS.id', '=', 'PRJ.customer_id' )
+			->groupBy( 'PRJ.id' )
+			->whereRaw( 'DATE_FORMAT(paymentdate, "%Y") = ' . $year )
+			->get()
+			->toArray();
+
+		for ( $x = 0; $x < count( $projects ); $x ++ )
+		{
+			$projects[ $x ]['monthPayments'] = [];
+			$monthPayments = self::getMonthPaymentPerProject( $projects[ $x ]['id'], $year );
+			for ( $i = 1; $i <= 12; $i ++ )
+			{
+				$projects[ $x ]['monthPayment'][ $i ] = 0;
+				foreach ( $monthPayments as $monthPayment )
+				{
+					if ( $monthPayment->month == $i )
+						$projects[ $x ]['monthPayment'][ $i ] = $monthPayment->paymentamount;
+				}
+			}
+		}
+
+		return $projects;
+	}
+
+	public static function getMonthPaymentPerProject( $projectID, $year )
+	{
+		return self::selectRaw( 'SUM(paymentamount) AS paymentamount, DATE_FORMAT(paymentdate, "%m") AS month' )
+			->join( 'invoices AS INV', 'INV.id', '=', 'payments.invoice_id' )
+			->whereRaw( 'DATE_FORMAT(paymentdate, "%Y") = ' . $year )
+			->whereProjectId( $projectID )
+			->groupBy( \DB::raw( 'DATE_FORMAT(paymentdate, "%m")' ) )
+			->get();
+	}
+
+	public static function getProjectsWithPayments( $year )
+	{
+		$projects = self::selectRaw( 'INV.project_id' )
+			->distinct()
+			->join( 'invoices AS INV', 'INV.id', '=', 'payments.invoice_id' )
+			->whereRaw( 'DATE_FORMAT(paymentdate, "%Y") = "' . $year . '"' )
+			->pluck( 'project_id' );
+
+		return $projects->toArray();
+	}
+
+	public static function getPaymentInYear( $year )
+	{
+		$payments = self::selectRAW( 'SUM(paymentamount) AS totalpayment' )
+			->whereRaw( "DATE_FORMAT(paymentdate, '%Y') = '{$year}'" )
+			->first();
+
+		return $payments->totalpayment;
+	}
+
+	public static function savePayment( $paymentID, $payment )
+	{
+		$payment = (array) $payment;
+
+		if ( $paymentID == 0 )
+		{
+			$payment = Payment::create( $payment );
+			$paymentID = $payment['id'];
+		}
+		else
+		{
+			Payment::whereId( $paymentID )->update( $payment );
+		}
+
+		return $paymentID;
+	}
+
+	public static function removePayment( $paymentID )
+	{
+		Payment::whereId( $paymentID )->delete();
+	}
+
+}
diff --git a/app/Models/Eloquent/Project.php b/app/Models/Eloquent/Project.php
new file mode 100644
index 0000000..4191a51
--- /dev/null
+++ b/app/Models/Eloquent/Project.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:05
+ */
+
+
+class Project extends BaseModel {
+
+	protected $table = "projects";
+
+	public function offers()
+	{
+		return $this->hasMany( 'Offer' );
+	}
+
+	public function offer()
+	{
+		return $this->hasOne( 'Offer' );
+	}
+
+	public function projectemployees()
+	{
+		return $this->hasMany( 'Projectemployee' );
+	}
+
+	public function projectcosts()
+	{
+		return $this->hasMany( 'Projectcost' );
+	}
+
+	public function invoices()
+	{
+		return $this->hasMany( 'Invoice' );
+	}
+
+	public function forecasts()
+	{
+		return $this->hasMany( 'Forecast' );
+	}
+
+	public function reservations()
+	{
+		return $this->hasMany( 'Reservation' );
+	}
+
+	public function vat()
+	{
+		return $this->belongsTo( 'Vat' );
+	}
+
+	public function projectleader()
+	{
+		return $this->belongsTo( 'User', 'projectleader_id' );
+	}
+
+	public function customer()
+	{
+		return $this->belongsTo( 'Customer' );
+	}
+
+	public static function getAllProjects( $archive, $search, $order, $direction )
+	{
+		$projects = Project::getBaseProject();
+
+		$projects = $projects->selectRaw( 'projects.*' )
+			->join( 'customers AS CUS', 'CUS.id', '=', 'projects.customer_id' )
+			->join( 'users AS USR', 'USR.id', '=', 'projects.projectleader_id' )
+			->where( 'projects.projectnumber', 'LIKE', "%{$search}%" )
+			->orderBy( $order, $direction );
+
+		if ( $archive == 'F' ) $projects = $projects->where( 'projects.archive', '=', 'F' );
+
+		$projects = $projects->get();
+
+		return $projects;
+	}
+
+	public static function getProject( $projectID )
+	{
+		$project = Project::getBaseProject();
+
+		$project = $project->whereId( $projectID )
+//			->whereArchive( 'F' )
+			->first();
+
+		return $project;
+	}
+
+	public static function removeProject( $projectID )
+	{
+		Offer::whereProjectId( $projectID )->update( ['project_id' => NULL] );
+
+		Project::whereId( $projectID )->delete();
+	}
+
+	public static function getActiveProjects( $archive = 'T', $sortField = FALSE, $direction = FALSE )
+	{
+		$projects = Project::selectRaw( "projects.id, YEAR(projects.startdate) AS instroom, YEAR(projects.enddate) AS uitstroom, projectnumber, current_financial_year,
+            projectname, CUS.name, OFF.own_revenue, OFF.other_revenue" )
+			->join( 'customers AS CUS', 'CUS.id', '=', 'projects.customer_id' )
+			->join( 'offers AS OFF', 'OFF.project_id', '=', 'projects.id' )
+			->groupBy( 'projects.id' )
+			->groupBy( 'OFF.own_revenue' )
+			->groupBy( 'OFF.other_revenue' );
+
+		if ( $sortField ) $projects = $projects->orderBy( $sortField, $direction );
+
+		if ( $archive == 'F' ) $projects = $projects->where( 'projects.archive', '=', 'F' );
+
+		$projects = $projects->get();
+
+		return $projects;
+	}
+
+	public static function getProjectsForReport( $orderType, $orderDirection, $archive = 'F', $projectsArray = FALSE )
+	{
+		$projects = self::getBaseProject();
+
+		if ( $archive == 'F' ) $projects = $projects->whereArchive( 'F' );
+
+		if ( is_array( $projectsArray ) ) $projects = $projects->whereIn( 'id', $projectsArray );
+
+		$projects = $projects->orderBy( $orderType, $orderDirection )->get();
+
+		return $projects;
+	}
+
+	public static function getBaseProject()
+	{
+		$project = Project::with( [
+			'projectleader' => function ( $q ) {
+				$q->selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" );
+			}] )
+			->with( 'offer' )
+			->with( [
+				'projectemployees.user' => function ( $q ) {
+					$q->selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" );
+				}] )
+			->with( 'vat' )
+			->with( ['forecasts'] )
+			->with( ['reservations'] )
+			->with( 'projectemployees.projecthours' )
+			->with( 'projectcosts.external' )
+			->with( 'invoices.payments' )
+			->with( 'invoices.vat' )
+			->with( 'vat' )
+			->with( 'customer' );
+
+		return $project;
+	}
+
+	public static function createProject()
+	{
+		$data = ['startdate' => date( 'Y-m-d' )];
+
+		$project = Project::create( $data );
+
+		return $project->id;
+	}
+
+	public static function saveProject( $projectID, $project )
+	{
+		$project = (array) $project;
+
+		if ( $projectID == 0 )
+		{
+			$project = Project::create( $project );
+			$projectID = $project['id'];;
+		}
+		else
+		{
+			Project::whereId( $projectID )->update( $project );
+		}
+
+		return $projectID;
+	}
+
+	public static function syncOffername( $offer )
+	{
+		self::whereId( $offer->project_id )
+			->update( ['projectname' => $offer->offername] );
+	}
+
+	public static function getProjectsWithExternalCosts( $projects )
+	{
+		$projectCosts = self::selectRAW( 'projects.id, OFF.costs' )
+			->join( 'offers AS OFF', 'OFF.project_id', '=', 'projects.id' )
+			->whereNotIn( 'projects.id', $projects )
+			->where( 'OFF.costs', '>', 0 )
+			->get();
+
+		return $projectCosts;
+	}
+}
diff --git a/app/Models/Eloquent/Projectcost.php b/app/Models/Eloquent/Projectcost.php
new file mode 100644
index 0000000..29d959d
--- /dev/null
+++ b/app/Models/Eloquent/Projectcost.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 23/01/2018
+ * Time: 11:37
+ */
+
+class Projectcost extends BaseModel {
+
+    public function project()
+    {
+        return $this->belongsTo( 'Project' );
+    }
+
+    public function external()
+    {
+        return $this->belongsTo( 'External' );
+    }
+
+    public static function saveProjectcost( $projectID, $project )
+    {
+        $project = (array) $project;
+
+        if ( $projectID == 0 )
+        {
+            $project = Self::create( $project );
+            $projectID = $project['id'];
+        }
+        else
+        {
+            Self::whereId( $projectID )->update( $project );
+        }
+
+        return $projectID;
+    }
+
+    public static function getCostsPerPerProject( $projectID )
+    {
+        $projectCosts = Projectcost::selectraw( 'ROUND(COALESCE(SUM(costs), 0), 0) AS costs')
+            ->whereProjectId($projectID)
+            ->first();
+
+        return $projectCosts->costs;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Projectemployee.php b/app/Models/Eloquent/Projectemployee.php
new file mode 100644
index 0000000..0dfb76e
--- /dev/null
+++ b/app/Models/Eloquent/Projectemployee.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 17/01/2018
+ * Time: 10:25
+ */
+
+class Projectemployee extends BaseModel {
+
+	public function project()
+	{
+		return $this->belongsTo( 'Project' );
+	}
+
+	public function user()
+	{
+		return $this->belongsTo( 'User' );
+	}
+
+	public function projecthours()
+	{
+		return $this->hasMany( 'Projecthour' );
+	}
+
+	public static function getAvailableEmployees( $projectID )
+	{
+		$currentEmployees = Self::whereProjectId( $projectID )
+			->pluck( 'user_id' );
+
+		$availableEmployees = User::selectRaw( "id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" )
+			->whereNotIn( 'id', $currentEmployees )
+			->whereArchive( 'F' )
+			->get();
+
+		return $availableEmployees;
+	}
+
+	public static function getUniqueProjectEmployees()
+	{
+		$projectemployees = Projectemployee::selectRaw( "USR.id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" )
+			->distinct()
+			->join( 'users AS USR', 'USR.id', '=', 'projectemployees.user_id' )
+			->get();
+
+		return $projectemployees;
+	}
+
+	public static function getUniqueEmployeesWithActivity( $archive = 'F' )
+	{
+		$projectemployees = Projectemployee::selectRaw( "USR.id, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" )
+			->distinct()
+			->join( 'users AS USR', 'USR.id', '=', 'projectemployees.user_id' )
+			->join( 'projectemployees AS PRE', 'PRE.user_id', '=', 'USR.id' )
+			->join( 'projects AS PRJ', 'PRJ.id', '=', 'PRE.project_id' );
+
+		if ( $archive == 'F' ) $projectemployees = $projectemployees->where( 'PRJ.archive', '=', 'F' );
+
+		$projectemployees = $projectemployees->get();
+
+		return $projectemployees;
+	}
+
+	public static function getProjectemployeeDetailsPerProject( $projectID )
+	{
+		$details = Projectemployee::selectRaw( '
+			USR.id, budget, project_id, ROUND(SUM(hours), 0) AS hours, ROUND(SUM(hours * tarif), 0) AS revenues, projectemployees.id AS projectemployeeID' )
+			->join( 'users AS USR', 'USR.id', '=', 'projectemployees.user_id' )
+			->join( 'projecthours AS PRH', 'PRH.projectemployee_id', '=', 'projectemployees.id' )
+			->where( 'projectemployees.project_id', '=', $projectID )
+			->where( 'PRH.hourtype_id', '=', 1 )
+//			->where( 'budget', '!=', 0 )
+			->groupBy( 'projectemployees.id' )
+			->havingRaw( 'ROUND(SUM(hours), 0) > 0' );
+		$details = $details->get();
+
+		return $details;
+	}
+
+	public static function firstOrCreateProjectemployee( $userID, $projectID )
+	{
+		$projectemployee = self::whereUserId( $userID )->whereProjectId( $projectID );
+
+		if ( $projectemployee->count() > 0 ) return $projectemployee->first();
+
+		$user = User::find( $userID );
+
+		$tarif = $user ? $user->hourlyrate : 0;
+
+		$projectemployee = Projectemployee::create( [
+			'project_id' => $projectID,
+			'user_id'    => $userID,
+			'tarif'      => $tarif
+		] );
+
+		return $projectemployee;
+	}
+
+	public static function createProjectEmployee( $projectID )
+	{
+		$projectemployee = Projectemployee::create( [
+			'project_id' => $projectID
+		] );
+
+		return $projectemployee->id;
+	}
+
+	public static function saveProjectemployee( $projectemployeeID, $projectemployee )
+	{
+		Projectemployee::whereId( $projectemployeeID )
+			->update( $projectemployee );
+	}
+
+	public static function removeProjectemployee( $projectemployeeID )
+	{
+		Projectemployee::whereId( $projectemployeeID )->delete();
+	}
+
+}
diff --git a/app/Models/Eloquent/Projecthour.php b/app/Models/Eloquent/Projecthour.php
new file mode 100644
index 0000000..f039859
--- /dev/null
+++ b/app/Models/Eloquent/Projecthour.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 19/01/2018
+ * Time: 15:51
+ */
+
+class Projecthour extends BaseModel {
+
+	protected $table = "projecthours";
+
+	public function projectemployee()
+	{
+		$this->belongsTo( 'Projectemployee' );
+	}
+
+	public static function getUsedYears()
+	{
+		$years = Projecthour::selectRaw( "YEAR(hourdate) AS year" )
+			->distinct()
+			->orderByRaw( 'YEAR( hourdate )' )
+			->get();
+
+		return $years;
+	}
+
+	public static function getMonthlyEmployeeHoursPerProject( $employeeID, $year )
+	{
+		$projectHours = ProjecthoursPerEmployeePerMonth::fire( $employeeID, $year );
+
+		return $projectHours;
+	}
+
+	public static function recapProjects()
+	{
+		$recaps = QRecapProjects::fire();
+
+		return $recaps;
+	}
+
+	public static function saveProjecthour( $projecthour )
+	{
+		$projecthour = (array) $projecthour;
+		$record = Projecthour::whereUuid( $projecthour['uuid'] )->first();
+
+		if ( ! $record )
+		{
+			$projecthour = Projecthour::create( $projecthour );
+			$projecthourID = $projecthour['id'];
+		}
+		else
+		{
+			Projecthour::whereUuid( $projecthour['uuid'] )->update( $projecthour );
+			$projecthourID = FALSE;
+		}
+
+		return $projecthourID;
+	}
+
+	public static function removeProjecthour( $projecthourID )
+	{
+		Projecthour::whereId( $projecthourID )->delete();
+	}
+
+	public static function getTotalHoursPerProject( $projectID )
+	{
+		$totalProjecthours =
+			self::selectRaw( "CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                            SUM(IF(hourtype_id = 1, hours, 0)) AS declarable,
+                            SUM(IF(hourtype_id = 1, hours * tarif, 0)) AS revenues,
+                            SUM(IF(hourtype_id != 1, hours, 0)) AS nondeclarable" )
+				->join( 'projectemployees AS PRE', 'PRE.id', '=', 'projecthours.projectemployee_id' )
+				->join( 'users AS USR', 'USR.id', '=', 'PRE.user_id' )
+				->groupBy( 'USR.id' )
+				->where( 'PRE.project_id', '=', $projectID )
+				->get();
+
+		return $totalProjecthours;
+	}
+
+
+}
diff --git a/app/Models/Eloquent/Reservation.php b/app/Models/Eloquent/Reservation.php
new file mode 100644
index 0000000..9fa3481
--- /dev/null
+++ b/app/Models/Eloquent/Reservation.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 07/03/2018
+ * Time: 09:24
+ */
+
+class Reservation extends BaseModel {
+
+    public function project()
+    {
+        return $this->belongsTo( 'Project' );
+    }
+
+    public function external()
+    {
+        return $this->belongsTo( 'External' );
+    }
+
+    public static function saveReservation( $reservationID, $reservation )
+    {
+        $reservation = (array) $reservation;
+
+        if ( $reservationID == 0 )
+        {
+            $reservation = self::create( $reservation );
+            $reservationID = $reservation['id'];
+        }
+        else
+        {
+            self::whereId( $reservationID )->update( $reservation );
+        }
+
+        return $reservationID;
+    }
+
+    public static function removeReservation( $reservationID )
+    {
+        Reservation::whereId( $reservationID )->delete();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/Role.php b/app/Models/Eloquent/Role.php
new file mode 100644
index 0000000..b75fcc5
--- /dev/null
+++ b/app/Models/Eloquent/Role.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 25/12/2017
+ * Time: 17:07
+ */
+
+class Role extends BaseModel {
+
+    protected $table = "roles";
+
+    public function user()
+    {
+        return $this->hasOne( 'User', 'role', 'rolelevel' );
+    }
+
+    public static function getAllRoles( $archive )
+    {
+        $roleHierarchy = Role::getUserroleHierachy();
+
+        $roles = Role::orderBy( 'rolehierarchy' )
+            ->where( 'rolehierarchy', '>=', $roleHierarchy );
+
+        if ( $archive == 'F' ) $roles = $roles->whereArchive( 'F' );
+
+        $roles = $roles->get();
+
+        return $roles;
+    }
+
+    public static function getUserroleHierachy()
+    {
+        $userrole = User::getUserRoleHierarchy();
+
+        if( $userrole == 0 ) return 0;
+
+        $roleHierarchy = Role::whereRolelevel($userrole)
+            ->first()
+            ->rolehierarchy;
+
+        return $roleHierarchy;
+    }
+
+    public static function getPagesAccessByRole()
+    {
+        $roles = self::all();
+
+        $pageroles=[];
+        foreach ( $roles as $role )
+        {
+            $pageroles[ $role->id ]['rolelevel'] = $role->rolelevel;
+            $pageroles[ $role->id ]['rolename'] = $role->rolename;
+
+            $pageroles[ $role->id ]['pagesAccess'] =
+                Page::getPageAccessByRoleLevel( $role->rolelevel );
+        }
+
+        return $pageroles;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/User.php b/app/Models/Eloquent/User.php
new file mode 100644
index 0000000..29ab410
--- /dev/null
+++ b/app/Models/Eloquent/User.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 21/12/2017
+ * Time: 18:04
+ */
+
+
+class User extends BaseModel {
+
+	protected $table = "users";
+
+	public function projectemployees()
+	{
+		return $this->hasMany( 'Projectemployee' );
+	}
+
+	public function employeetargets()
+	{
+		return $this->hasMany( 'Employeetarget' );
+	}
+
+	public function projectemployee()
+	{
+		return $this->hasOne( 'Projectemployee' );
+	}
+
+	public function role()
+	{
+		return $this->belongsTo( 'Role', 'level', 'rolelevel' );
+	}
+
+	public static function getAllUsers( $archive )
+	{
+		$users = User::selectRaw( "*, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname" )
+			->orderBy( 'lastname' );
+
+		if ( $archive == 'F' ) $users = $users->whereArchive( 'F' );
+
+		$users = $users->get();
+
+		return $users;
+	}
+
+	public static function getUserRoleHierarchy()
+	{
+		$userrole = User::find( USERID )->role;
+
+		return $userrole;
+	}
+
+	public static function getUserWithprojects()
+	{
+		$usersWithProjects =
+			User::selectRaw( "users.id, CONCAT(users.firstname, ' ', users.middlename, ' ', users.lastname) AS fullname" )
+				->with( [
+					'projectemployees.project' => function ( $q ) {
+						$q->whereArchive( 'F' );
+					}] )
+				->get();
+
+		return $usersWithProjects;
+	}
+
+	public static function getUserActiveProjects( $userID )
+	{
+		$usersActiveProjects =
+			User::selectRaw( "PRJ.id AS projectID, projectname, projectnumber, CONCAT(projectnumber, '-', projectname) AS projectFull" )
+				->join( 'projectemployees AS PRE', 'PRE.user_id', '=', 'users.id' )
+				->join( 'projects AS PRJ', 'PRJ.id', '=', 'PRE.project_id' )
+				->where( 'PRJ.archive', '=', 'F' )
+				->where( 'users.id', '=', $userID )
+				->orderBy('projectnumber')
+				->get();
+
+		return $usersActiveProjects;
+	}
+
+	public static function checkUsername( $username )
+	{
+		$username = strtoupper( $username );
+
+		$user = User::whereRaw( "UCASE(username) = {$username}" );
+
+		if ( $user->count() == 0 ) return FALSE;
+
+		return TRUE;
+	}
+
+	public static function saveUser( $userID, $user )
+	{
+		$user = (array) $user;
+
+		if ( $userID == 0 )
+		{
+			$user = User::create( $user );
+			$userID = $user['id'];
+		}
+		else
+		{
+			User::whereId( $userID )->update( $user );
+		}
+
+		return $userID;
+	}
+
+	public static function removeUser( $userID )
+	{
+		User::whereId( $userID )->delete();
+	}
+
+	public static function getUniqueProjectUsers()
+	{
+		//TODO: date range
+		$projectusers = User::selectRaw( " 
+                users.id,  
+                CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                SUBSTR(MD5(users.id), 1, 6) AS slug" )
+			->join( 'projectemployees AS PEM', 'PEM.user_id', '=', 'users.id' )
+			->with( [
+				'projectemployee.project' => function ( $q ) {
+					$q->selectRaw( "id, YEAR(startdate) AS instroom, COALESCE(YEAR(enddate), '') AS uitstroom" );
+				}] )
+			->distinct()
+			->get();
+
+		return $projectusers;
+	}
+
+	public static function getSaltedPassword( $password, $salt )
+	{
+		$saltedpassword = sha1( sha1( $password ) . $salt );
+
+		return $saltedpassword;
+	}
+
+	public static function generateSalt()
+	{
+		$alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+		$alphaLength = strlen( $alphabet ) - 1;
+		$randomString = '';
+
+		for ( $i = 0; $i < 18; $i++ )
+		{
+			$n = rand( 0, $alphaLength );
+			$randomString .= $alphabet[ $n ];
+		}
+
+		return sha1( $randomString );
+	}
+
+
+}
diff --git a/app/Models/Eloquent/UserOtp_model.php b/app/Models/Eloquent/UserOtp_model.php
new file mode 100644
index 0000000..23fc4df
--- /dev/null
+++ b/app/Models/Eloquent/UserOtp_model.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * User OTP Model
+ * Manages email-based one-time passwords for two-factor authentication
+ */
+class UserOtp_model
+{
+    protected static string $tablename = "user_otp_codes";
+
+    /**
+     * Generate and store a new OTP code for a user
+     * @param int $userId User ID
+     * @param int $expiryMinutes Expiry time in minutes (default 10)
+     * @return string The generated OTP code
+     */
+    public static function generateOTP($userId, $expiryMinutes = 10)
+    {
+        $db = \Config\Database::connect();
+
+        // Generate 6-digit OTP
+        $otpCode = str_pad(random_int(0, 999999), 6, '0', STR_PAD_LEFT);
+
+        // Calculate expiry time
+        $expiresAt = date('Y-m-d H:i:s', strtotime("+{$expiryMinutes} minutes"));
+
+        // Store OTP in database
+        $data = [
+            'user_id' => $userId,
+            'otp_code' => $otpCode,
+            'expires_at' => $expiresAt,
+            'used' => 'F',
+            'created_at' => date('Y-m-d H:i:s')
+        ];
+
+        $db->table(self::$tablename)->insert($data);
+
+        return $otpCode;
+    }
+
+    /**
+     * Verify an OTP code for a user
+     * @param int $userId User ID
+     * @param string $otpCode The OTP code to verify
+     * @return bool True if valid, false otherwise
+     */
+    public static function verifyOTP($userId, $otpCode)
+    {
+        $db = \Config\Database::connect();
+
+        // Get the most recent unused OTP for this user
+        $result = $db->table(self::$tablename)
+            ->where('user_id', $userId)
+            ->where('otp_code', $otpCode)
+            ->where('used', 'F')
+            ->where('expires_at >', date('Y-m-d H:i:s'))
+            ->orderBy('created_at', 'DESC')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        if (!$result) {
+            return false;
+        }
+
+        // Mark OTP as used
+        $db->table(self::$tablename)
+            ->where('id', $result->id)
+            ->update(['used' => 'T']);
+
+        return true;
+    }
+
+    /**
+     * Clean up expired OTP codes
+     * @return int Number of deleted records
+     */
+    public static function cleanupExpiredOTPs()
+    {
+        $db = \Config\Database::connect();
+
+        $db->table(self::$tablename)
+            ->where('expires_at <', date('Y-m-d H:i:s'))
+            ->orWhere('used', 'T')
+            ->delete();
+
+        return $db->affectedRows();
+    }
+
+    /**
+     * Delete all OTP codes for a user
+     * @param int $userId User ID
+     */
+    public static function deleteUserOTPs($userId)
+    {
+        $db = \Config\Database::connect();
+
+        $db->table(self::$tablename)
+            ->where('user_id', $userId)
+            ->delete();
+    }
+}
diff --git a/app/Models/Eloquent/Vat.php b/app/Models/Eloquent/Vat.php
new file mode 100644
index 0000000..57340af
--- /dev/null
+++ b/app/Models/Eloquent/Vat.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 23/01/2018
+ * Time: 19:37
+ */
+
+class Vat extends BaseModel {
+
+    public function invoices()
+    {
+        return $this->hasMany( 'Invoice' );
+    }
+
+    public static function getVats( $archive )
+    {
+        if ( $archive == 'F' )
+        {
+            $vats = vat::whereArchive( 'F' )->get();
+        }
+        else
+        {
+            $vats = Vat::get();
+        }
+
+        return $vats;
+    }
+
+    public static function getCurrentVat()
+    {
+        $currentVat = Vat::whereActive('T')->whereArchive('F')->first();
+
+        if( ! $currentVat) return 0;
+
+        return $currentVat->vatrate;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/queries/EmployeehoursMonthly.php b/app/Models/Eloquent/queries/EmployeehoursMonthly.php
new file mode 100644
index 0000000..3dc1fa9
--- /dev/null
+++ b/app/Models/Eloquent/queries/EmployeehoursMonthly.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 15/03/2018
+ * Time: 10:47
+ */
+
+class EmployeehoursMonthly {
+
+    public static function fire($month, $year, $employeeID)
+    {
+        $month = $month + 1;
+        $sql = "
+        SELECT 		*
+        FROM 		(
+                    SELECT 		CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                                hourtype_id,
+                                EMH.id,
+                           		EMH.uuid,
+                                USR.id AS employee_id,
+                                hours,
+                                DATE_FORMAT(hourdate, '%d-%m-%Y') AS hourdate,
+                                NULL AS project_id,
+                                NULL AS projectname,
+                                'F' AS archive,
+                                'OVERHEAD' AS type
+                    FROM 		employeehours	EMH
+                        JOIN 	users 			USR
+                        ON 		USR.id = EMH.employee_id
+                    WHERE 		MONTH(hourdate) = {$month}
+                        AND 	YEAR(hourdate) = {$year}  ";
+        if( $employeeID != 0 ) $sql.="AND     USR.id = {$employeeID} ";
+        $sql.="      
+                    UNION		
+                    SELECT 		CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                                (hourtype_id + 8) AS hourtype_id,
+                                PRH.id,
+                                PRH.uuid,
+                                USR.id AS employee_id,
+                                hours,
+                                DATE_FORMAT(hourdate, '%d-%m-%Y') AS hourdate,
+						        PEM.project_id,
+						      	CONCAT( projectnumber, '-',PRJ.projectname),
+						      	PRJ.archive,
+						      	'PROJECTS' AS type
+                    FROM 		projecthours 		PRH
+                        JOIN 	projectemployees	PEM
+                        ON 		PEM.id = PRH.projectemployee_id
+                        JOIN 	projects			PRJ
+                        ON 		PRJ.id = PEM.project_id
+                        JOIN	users 			USR
+                        ON 		USR.id = PEM.user_id  
+                    WHERE 		MONTH(hourdate) = {$month}
+                        AND 	YEAR(hourdate) = {$year} 
+                        AND 	offer_id IS NULL ";
+        if( $employeeID != 0 ) $sql.="AND     USR.id = {$employeeID} ";
+        $sql.=" 
+        			UNION
+                    SELECT 		CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                                (hourtype_id + 8) AS hourtype_id,
+                                PRH.id,
+                                PRH.uuid,
+                                USR.id AS employee_id,
+                                hours,
+                                DATE_FORMAT(hourdate, '%d-%m-%Y') AS hourdate,
+						        offer_id,
+						      	CONCAT(OFF.offernumber, '-',OFF.offername),
+						      	OFF.archive,
+						      	'OFFERS' AS type
+                    FROM 		projecthours 		PRH
+                        JOIN 	offers				OFF
+                        ON 		OFF.id = PRH.offer_id
+                        JOIN	users 			USR
+                        ON 		USR.id = PRH.projectemployee_id
+                    WHERE 		MONTH(hourdate) = {$month}
+                        AND 	YEAR(hourdate) = {$year}    
+                        AND 	offer_id IS NOT NULL ";
+        if( $employeeID != 0 ) $sql.="AND     USR.id = {$employeeID} ";
+		$sql.="             ) Q1
+        ORDER BY 	fullname, hourdate ";
+
+        return $sql;
+    }
+}
diff --git a/app/Models/Eloquent/queries/ProjecthoursPerEmployeePerMonth.php b/app/Models/Eloquent/queries/ProjecthoursPerEmployeePerMonth.php
new file mode 100644
index 0000000..2304d68
--- /dev/null
+++ b/app/Models/Eloquent/queries/ProjecthoursPerEmployeePerMonth.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 20/02/2018
+ * Time: 09:36
+ */
+
+class ProjecthoursPerEmployeePerMonth extends BaseModel {
+
+    public static function fire($employeeID, $year)
+    {
+        $projectHours = Projecthour::selectRaw( "
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-1', projecthours.hours, 0)) AS januari,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-2', projecthours.hours, 0)) AS februari,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-3', projecthours.hours, 0)) AS maart,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-4', projecthours.hours, 0)) AS april,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-5', projecthours.hours, 0)) AS mei,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-6', projecthours.hours, 0)) AS juni,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-7', projecthours.hours, 0)) AS juli,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-8', projecthours.hours, 0)) AS augustus,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-9', projecthours.hours, 0)) AS september,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-10', projecthours.hours, 0)) AS oktober,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-11', projecthours.hours, 0)) AS november,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-12', projecthours.hours, 0)) AS december,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-1', projecthours.hours * tarif, 0)) AS januariRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-2', projecthours.hours * tarif, 0)) AS februariRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-3', projecthours.hours * tarif, 0)) AS maartRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-4', projecthours.hours * tarif, 0)) AS aprilRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-5', projecthours.hours * tarif, 0)) AS meiRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-6', projecthours.hours * tarif, 0)) AS juniRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-7', projecthours.hours * tarif, 0)) AS juliRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-8', projecthours.hours * tarif, 0)) AS augustusRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-9', projecthours.hours * tarif, 0)) AS septemberRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-10', projecthours.hours * tarif, 0)) AS oktoberRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-11', projecthours.hours * tarif, 0)) AS novemberRevenue,
+            SUM(IF(CONCAT(YEAR(hourdate), '-', MONTH(hourdate))  = '{$year}-12', projecthours.hours * tarif, 0)) AS decemberRevenue,
+            SUM(IF(YEAR(hourdate) = {$year},projecthours.hours, 0)) AS totalyear,
+            SUM(IF(YEAR(hourdate) != {$year},projecthours.hours, 0)) AS totalotheryears,
+            SUM(IF(YEAR(hourdate) = {$year},projecthours.hours * tarif, 0)) AS totalyearRevenue,
+            SUM(IF(YEAR(hourdate) != {$year},projecthours.hours * tarif, 0)) AS totalotheryearsRevenue,
+            SUM(projecthours.hours) AS totalhours,
+            SUM(projecthours.hours * tarif) AS totalhoursRevenue,
+            PEM.tarif,
+            PRJ.projectname" )
+            ->join( 'projectemployees AS PEM', 'PEM.id', '=', 'projecthours.projectemployee_id' )
+            ->join( 'projects AS PRJ', 'PRJ.id', '=', 'PEM.project_id' )
+            ->where( 'PEM.user_id', '=', $employeeID )
+            ->where( 'projecthours.hourtype_id', '=', 1)
+            ->groupBy('PRJ.id')
+            ->groupBy('PEM.tarif')
+            ->groupBy('PRJ.projectname')
+            ->get();
+
+        return $projectHours;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/queries/QEmployeeHours.php b/app/Models/Eloquent/queries/QEmployeeHours.php
new file mode 100644
index 0000000..afd9d2a
--- /dev/null
+++ b/app/Models/Eloquent/queries/QEmployeeHours.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 01/03/2018
+ * Time: 12:03
+ */
+
+class QEmployeeHours {
+
+    public static function fire( $month, $year )
+    {
+        $sql = " 
+        SELECT		monthID,
+                    user_id,
+                    CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                    ROUND(SUM(projecthours), 0) AS projecthours,
+                    ROUND(SUM(profitablehours), 0) AS profitablehours,
+                    ROUND(SUM(nonprofitablehours), 0) AS nonprofitablehours,
+                    ROUND(SUM(revenues), 0) AS revenues,
+                    ROUND(SUM(nonprojecthours), 0) AS nonprojecthours,
+                    ROUND(SUM(projecthours + nonprojecthours), 0) AS totalhours,
+                    targethours
+        FROM 		(
+                    SELECT 			employee_id AS user_id, 
+                                    MONTH(hourdate) monthID, 
+                                    0 AS projecthours, 
+                                    0 AS profitablehours,
+                                    0 AS nonprofitablehours, 
+                                    0 AS revenues, 
+                                    SUM(hours) AS nonprojecthours
+                    FROM 			employeehours       EMH
+                        JOIN        hourtypes           HTY
+                        ON          HTY.id = EMH.hourtype_id
+                    WHERE 			YEAR(hourdate) = '{$year}' 
+                        AND         reportable = 'T' ";
+            if( $month != 0 ) $sql .= "AND           MONTH(hourdate) = '$month' ";
+        $sql .= "
+                    GROUP BY 		employee_id, MONTH(hourdate)
+                    UNION			
+                    SELECT 			PEM.user_id, 
+                                    MONTH(hourdate) monthID,
+                                    SUM(hours) AS projecthours, 
+                                    SUM(IF(hourtype_id = 1, hours, 0)) AS profitablehours,
+                                    SUM(IF(hourtype_id = 2, hours, 0)) AS nonprofitablehours,
+                                    ROUND(SUM( IF(hourtype_id = 1, (hours * PEM.tarif), 0) ), 0) AS revenues,
+                                    0 AS nonprojecthours
+                    FROM			projecthours 		PH
+                        JOIN 		projectemployees 	PEM
+                        ON			PEM.id = PH.projectemployee_id
+                    WHERE 			YEAR(hourdate) = '{$year}' 
+                        AND 		hourtype_id <= 2 ";
+            if( $month != 0 ) $sql .= "AND           MONTH(hourdate) = '$month' ";
+        $sql .= "
+                    GROUP BY 		PEM.user_id, MONTH(hourdate)
+                    UNION	
+                    SELECT 			PH.projectemployee_id AS user_id, 
+                                    MONTH(hourdate) monthID,
+                                    SUM(hours) AS projecthours,
+                                    0 AS profitablehours,
+                                    SUM(IF(hourtype_id = 3, hours, 0)) AS nonprofitablehours,
+                                    0 AS revenues,
+                                    0 AS nonprojecthours
+                    FROM			projecthours 		PH
+                    WHERE 			YEAR(hourdate) = '{$year}'  
+                    	AND 		hourtype_id = 3     ";
+            if( $month != 0 ) $sql .= "AND           MONTH(hourdate) = '$month' ";
+        $sql .= "            
+                    GROUP BY 		PH.projectemployee_id, MONTH(hourdate)
+                    ) AS Q1
+            
+            JOIN 	users AS USR
+            ON 		USR.id = Q1.user_id
+        GROUP BY 	user_id ";
+
+        return $sql;
+    }
+
+
+}
diff --git a/app/Models/Eloquent/queries/QRecapProjects.php b/app/Models/Eloquent/queries/QRecapProjects.php
new file mode 100644
index 0000000..f5f16e9
--- /dev/null
+++ b/app/Models/Eloquent/queries/QRecapProjects.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 20/02/2018
+ * Time: 09:45
+ */
+
+class QRecapProjects {
+
+}
+
diff --git a/app/Models/Eloquent/queries/QinvoiceMonthOverview.php b/app/Models/Eloquent/queries/QinvoiceMonthOverview.php
new file mode 100644
index 0000000..fbeaa5e
--- /dev/null
+++ b/app/Models/Eloquent/queries/QinvoiceMonthOverview.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 07/03/2018
+ * Time: 15:31
+ */
+
+class QinvoiceMonthOverview {
+
+    public static function fire( $projectID, $year )
+    {
+        $sql = "SELECT				MNT.id,
+                                    month,
+                                    COALESCE(forecastamount, 0) AS forecastamount,
+                                    COALESCE(paymentamount, 0) AS paymentamount
+                FROM 				months     	MNT
+                    LEFT JOIN 		(
+                                    SELECT 		SUM(forecastamount) AS forecastamount, month_id
+                                    FROM 		forecasts
+                                    WHERE 		project_id = {$projectID}
+                                        AND 	`year` = {$year}
+                                    GROUP BY    month_id
+                                    ) AS FCT
+                    ON 				MNT.id = FCT.month_id + 1
+                    LEFT JOIN		(
+                                    SELECT 		SUM(paymentamount) AS paymentamount, MONTH(paymentdate) AS month_id
+                                    FROM		payments	PAY
+                                        JOIN 	invoices	INV
+                                        ON 		INV.id = PAY.invoice_id
+                                    WHERE 		INV.project_id = {$projectID}
+                                        AND 	YEAR(paymentdate) = {$year}
+                                    GROUP BY    month_id
+                                    ) AS PAY
+                    ON 				MNT.id = PAY.month_id
+                    LEFT JOIN 		projects   PRJ
+                GROUP BY 			MNT.id
+                ORDER BY            MNT.id ";
+
+        return $sql;
+    }
+
+}
diff --git a/app/Models/Eloquent/queries/Qinvoiceoverview.php b/app/Models/Eloquent/queries/Qinvoiceoverview.php
new file mode 100644
index 0000000..7146534
--- /dev/null
+++ b/app/Models/Eloquent/queries/Qinvoiceoverview.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 02/03/2018
+ * Time: 15:56
+ */
+
+class Qinvoiceoverview {
+
+
+    public static function fire( $year )
+    {
+        $sql = "
+          SELECT			PRJ.id, PRJ.projectnumber, 
+                            PRJ.projectname, 
+                            (own_revenue + other_revenue + OFF.costs ) AS revenues,
+                            CUS.name AS customername,
+                            SUM(IF( YEAR(invoicedate) =   {$year}, invoiceamount* ((100 + VTS.vatrate)/100), 0)) AS currentyear, 
+                            SUM(IF( YEAR(invoicedate) != {$year}, invoiceamount * ((100 + VTS.vatrate)/100), 0)) AS otheryear,  
+                            SUM(COALESCE(Q1.currentyearpayed, 0)) AS currentyearpayed,
+                            SUM(COALESCE(Q1.otheryearpayed, 0)) AS otheryearpayed,
+                            CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
+                            ( SELECT vatrate FROM vats WHERE archive = 'F' LIMIT 1 ) AS vatrate,
+                            COALESCE(reserved, 0 ) AS reserved,
+                            COALESCE(currentforecast, 0) AS currentforecast,
+                            COALESCE(otherforecast, 0) AS otherforecast
+            FROM 			invoices		INV
+                RIGHT JOIN 	projects		PRJ
+                ON 			PRJ.id = INV.project_id
+                JOIN 		offers			OFF
+                ON 			PRJ.id = OFF.project_id
+                JOIN 		customers		CUS
+                ON 			CUS.id = PRJ.customer_id
+                JOIN        users           USR
+                ON          USR.id = PRJ.projectleader_id
+                JOIN        vats            VTS
+                ON          VTS.id = INV.vat_id
+                LEFT JOIN  (
+                            SELECT 		invoice_id, 
+                                        SUM(IF(YEAR(paymentdate) = {$year},paymentamount, 0)) AS currentyearpayed,
+                                        SUM(IF(YEAR(paymentdate) != {$year},paymentamount, 0)) AS otheryearpayed
+                            FROM 		payments
+                            GROUP BY	invoice_id
+                            ) AS Q1
+                ON 			INV.id = Q1.invoice_id
+                LEFT JOIN   (
+                            SELECT      project_id,
+                                        SUM( reservationamount) reserved
+                            FROM        reservations
+                            GROUP BY    project_id
+                            ) AS Q2
+                ON          PRJ.id = Q2.project_id
+                LEFT JOIN   (
+                            SELECT      project_id,
+                                        SUM(IF(year = {$year}, IF(month_id >= MONTH(NOW()) -1, forecastamount, 0), 0)) AS currentforecast,
+                                        SUM(IF(year > {$year}, forecastamount, 0)) AS otherforecast
+                            FROM        forecasts
+                            GROUP BY    project_id
+                            ) AS Q3
+                ON          PRJ.id = Q3.project_id
+            GROUP BY 		PRJ.projectnumber, PRJ.projectname ";
+
+        return $sql;
+    }
+}
\ No newline at end of file
diff --git a/app/Models/Eloquent/queries/ReservationTotals.php b/app/Models/Eloquent/queries/ReservationTotals.php
new file mode 100644
index 0000000..d5b9edb
--- /dev/null
+++ b/app/Models/Eloquent/queries/ReservationTotals.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 13/04/2018
+ * Time: 14:27
+ */
+
+class ReservationTotals {
+
+    public static function fire()
+    {
+        // UNION ALL wordt gebruikt voor een full outer join
+        $sql = "SELECT		PRJ.id AS projectID, external_id AS externalID, 
+							PRJ.projectname,
+                            COALESCE(fromreservation, 0) AS fromreservation,
+                            COALESCE(Q5.costs, 0) AS costs, COALESCE(reservation, 0) AS reservation, 
+                            COALESCE(payed, 0) AS payed, (COALESCE(reservation, 0) - COALESCE(fromreservation, 0)) AS saldo, 
+                            (COALESCE(Q5.costs, 0) - COALESCE(payed, 0)) AS saldoToPay, PRJ.projectnumber, EXT.contactperson,
+                            ROUND(( (OFF.costs * (100 + (SELECT      vatrate 
+														  FROM        vats          VTS
+															JOIN      projects      P
+															ON        VTS.id = P.vat_id
+														  WHERE       P.id = PRJ.id  LIMIT 1))) / 100 ), 0) other_revenue
+                FROM		(
+                            SELECT 		COALESCE(reservation, 0) AS reservation, costs, payed, Q2.external_id, Q2.project_id, 
+                                        IF(from_reservation = 'T', payed, 0) fromreservation
+                            FROM		(
+                                        SELECT 		SUM(reservationamount) AS reservation, external_id, project_id
+                                        FROM 		reservations
+                                        GROUP BY 	external_id, project_id
+                                        ) Q1
+                                RIGHT JOIN 	
+                                        (
+                                        SELECT 		SUM(costs) AS costs, SUM(payed) AS payed, external_id, project_id, from_reservation
+                                        FROM 		projectcosts
+                                        GROUP BY	external_id, project_id
+                                        ) Q2
+                                ON 		Q1.external_id = Q2.external_id AND Q1.project_id = Q2.project_id
+                            UNION ALL
+                            SELECT 		reservation, COALESCE(costs, 0), COALESCE(payed, 0), Q3.external_id, Q3.project_id, 
+                                        IF(from_reservation = 'T', payed, 0) fromreservation
+                            FROM		(
+                                        SELECT 		SUM(reservationamount) AS reservation, external_id, project_id
+                                        FROM 		reservations
+                                        GROUP BY 	external_id, project_id
+                                        ) Q3
+                                LEFT JOIN 	
+                                        (
+                                        SELECT 		SUM(costs) AS costs, SUM(payed) AS payed, external_id, project_id, id, from_reservation
+                                        FROM 		projectcosts
+                                        GROUP BY	external_id, project_id
+                                        ) Q4
+                                ON 		Q3.external_id = Q4.external_id AND Q3.project_id = Q4.project_id
+                            WHERE 		Q4.id IS NULL
+                            ) Q5
+                    RIGHT JOIN 	projects		PRJ
+                    ON 		PRJ.id = Q5.project_id
+                    LEFT JOIN    offers          OFF
+                    ON      PRJ.id = OFF.project_id 
+                    LEFT JOIN 	externals		EXT
+                    ON 		EXT.id = Q5.external_id
+             WHERE 	OFF.costs > 0
+             	AND PRJ.archive = 'F'";
+
+        return $sql;
+    }
+
+}
diff --git a/app/Views/emails/requestpassword_email.php b/app/Views/emails/requestpassword_email.php
new file mode 100644
index 0000000..a141a26
--- /dev/null
+++ b/app/Views/emails/requestpassword_email.php
@@ -0,0 +1,366 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta name="viewport" content="width=device-width"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>wachtwoord DBOIS</title>
+    <link href="styles.css" media="all" rel="stylesheet" type="text/css"/>
+</head>
+<style>
+
+    /* -------------------------------------
+        GLOBAL
+    ------------------------------------- */
+    * {
+        margin: 0;
+        padding: 0;
+        font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+    }
+
+    img {
+        max-width: 100%;
+    }
+
+    body {
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-size-adjust: none;
+        width: 100% !important;
+        height: 100%;
+        line-height: 1.6;
+    }
+
+    /* Let's make sure all tables have defaults */
+    table td {
+        vertical-align: top;
+    }
+
+    /* -------------------------------------
+        BODY & CONTAINER
+    ------------------------------------- */
+    body {
+        background-color: #f6f6f6;
+    }
+
+    .body-wrap {
+        background-color: #f6f6f6;
+        width: 100%;
+    }
+
+    .container {
+        display: block !important;
+        max-width: 600px !important;
+        margin: 0 auto !important;
+        /* makes it centered */
+        clear: both !important;
+    }
+
+    .content {
+        max-width: 600px;
+        margin: 0 auto;
+        display: block;
+        padding: 20px;
+    }
+
+    /* -------------------------------------
+        HEADER, FOOTER, MAIN
+    ------------------------------------- */
+    .main {
+        background: #fff;
+        border: 1px solid #e9e9e9;
+        border-radius: 3px;
+    }
+
+    .content-wrap {
+        padding: 20px;
+    }
+
+    .content-block {
+        padding: 0 0 20px;
+    }
+
+    .header {
+        width: 100%;
+        margin-bottom: 20px;
+    }
+
+    .footer {
+        width: 100%;
+        clear: both;
+        color: #999;
+        padding: 20px;
+    }
+
+    .footer a {
+        color: #999;
+    }
+
+    .footer p, .footer a, .footer unsubscribe, .footer td {
+        font-size: 12px;
+    }
+
+    /* -------------------------------------
+        GRID AND COLUMNS
+    ------------------------------------- */
+    .column-left {
+        float: left;
+        width: 50%;
+    }
+
+    .column-right {
+        float: left;
+        width: 50%;
+    }
+
+    /* -------------------------------------
+        TYPOGRAPHY
+    ------------------------------------- */
+    h1, h2, h3 {
+        font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+        color: #000;
+        margin: 40px 0 0;
+        line-height: 1.2;
+        font-weight: 400;
+    }
+
+    h1 {
+        font-size: 32px;
+        font-weight: 500;
+    }
+
+    h2 {
+        font-size: 24px;
+    }
+
+    h3 {
+        font-size: 18px;
+    }
+
+    h4 {
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    p, ul, ol {
+        margin-bottom: 10px;
+        font-weight: normal;
+    }
+
+    p li, ul li, ol li {
+        margin-left: 5px;
+        list-style-position: inside;
+    }
+
+    /* -------------------------------------
+        LINKS & BUTTONS
+    ------------------------------------- */
+    a {
+        color: #348eda;
+        text-decoration: underline;
+    }
+
+    .btn-primary {
+        text-decoration: none;
+        color: #FFF;
+        background-color: #348eda;
+        border: solid #348eda;
+        border-width: 10px 20px;
+        line-height: 2;
+        font-weight: bold;
+        text-align: center;
+        cursor: pointer;
+        display: inline-block;
+        border-radius: 5px;
+        text-transform: capitalize;
+    }
+
+    /* -------------------------------------
+        OTHER STYLES THAT MIGHT BE USEFUL
+    ------------------------------------- */
+    .last {
+        margin-bottom: 0;
+    }
+
+    .first {
+        margin-top: 0;
+    }
+
+    .padding {
+        padding: 10px 0;
+    }
+
+    .aligncenter {
+        text-align: center;
+    }
+
+    .alignright {
+        text-align: right;
+    }
+
+    .alignleft {
+        text-align: left;
+    }
+
+    .clear {
+        clear: both;
+    }
+
+    /* -------------------------------------
+        Alerts
+    ------------------------------------- */
+    .alert {
+        font-size: 16px;
+        color: #fff;
+        font-weight: 500;
+        padding: 20px;
+        text-align: center;
+        border-radius: 3px 3px 0 0;
+    }
+
+    .alert a {
+        color: #fff;
+        text-decoration: none;
+        font-weight: 500;
+        font-size: 16px;
+    }
+
+    .alert.alert-warning {
+        background: #ff9f00;
+    }
+
+    .alert.alert-bad {
+        background: #d0021b;
+    }
+
+    .alert.alert-good {
+        background: #68b90f;
+    }
+
+    /* -------------------------------------
+        INVOICE
+    ------------------------------------- */
+    .invoice {
+        margin: 40px auto;
+        text-align: left;
+        width: 80%;
+    }
+
+    .invoice td {
+        padding: 5px 0;
+    }
+
+    .invoice .invoice-items {
+        width: 100%;
+    }
+
+    .invoice .invoice-items td {
+        border-top: #eee 1px solid;
+    }
+
+    .invoice .invoice-items .total td {
+        border-top: 2px solid #333;
+        border-bottom: 2px solid #333;
+        font-weight: 700;
+    }
+
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 640px) {
+        h1, h2, h3, h4 {
+            font-weight: 600 !important;
+            margin: 20px 0 5px !important;
+        }
+
+        h1 {
+            font-size: 22px !important;
+        }
+
+        h2 {
+            font-size: 18px !important;
+        }
+
+        h3 {
+            font-size: 16px !important;
+        }
+
+        .container {
+            width: 100% !important;
+        }
+
+        .content, .content-wrapper {
+            padding: 10px !important;
+        }
+
+        .invoice {
+            width: 100% !important;
+        }
+    }
+
+</style>
+
+<body>
+
+<table class="body-wrap">
+    <tr>
+        <td></td>
+        <td class="container" width="600">
+            <div class="content">
+                <table class="main" width="100%" cellpadding="0" cellspacing="0">
+                    <tr>
+                        <td class="alert alert-warning">
+                            Nieuw wachtwoord DBOIS De Beleidsonderzoekers
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="content-wrap">
+                            <table width="100%" cellpadding="0" cellspacing="0">
+                                <tr>
+                                    <td class="content-block">
+                                        <p>
+                                            Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
+                                        </p>
+                                        <p>
+                                            U heeft een wachtwoord aangevraagd voor DBOIS, hieronder vindt u uw gebruikersnaam en uw nieuwe wachtwoord waarmee u kunt inloggen in het systeem.
+                                        </p>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <table class="invoice">
+                                            <tr>
+                                                <td>
+                                                    <table class="invoice-items" cellpadding="0" cellspacing="0">
+                                                        <tr>
+                                                            <td>gebruikersnaam</td>
+                                                            <td class="alignright"><?= $user['username'] ?></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>wacthwoord</td>
+                                                            <td class="alignright"><?= $user['password'] ?></td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <a href="<?php echo getenv('APP_URL'); ?>" class="btn-primary">
+                                            Ga naar het informatiesysteem
+                                        </a>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+        </td>
+        <td></td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/app/Views/emails/twofactor_otp_email.php b/app/Views/emails/twofactor_otp_email.php
new file mode 100644
index 0000000..b7c18dd
--- /dev/null
+++ b/app/Views/emails/twofactor_otp_email.php
@@ -0,0 +1,172 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta name="viewport" content="width=device-width"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>Verificatiecode DBOIS</title>
+    <link href="styles.css" media="all" rel="stylesheet" type="text/css"/>
+</head>
+<style>
+    /* Same styles as requestpassword_email.php */
+    * {
+        margin: 0;
+        padding: 0;
+        font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+    }
+
+    img {
+        max-width: 100%;
+    }
+
+    body {
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-size-adjust: none;
+        width: 100% !important;
+        height: 100%;
+        line-height: 1.6;
+        background-color: #f6f6f6;
+    }
+
+    table td {
+        vertical-align: top;
+    }
+
+    .body-wrap {
+        background-color: #f6f6f6;
+        width: 100%;
+    }
+
+    .container {
+        display: block !important;
+        max-width: 600px !important;
+        margin: 0 auto !important;
+        clear: both !important;
+    }
+
+    .content {
+        max-width: 600px;
+        margin: 0 auto;
+        display: block;
+        padding: 20px;
+    }
+
+    .main {
+        background: #fff;
+        border: 1px solid #e9e9e9;
+        border-radius: 3px;
+    }
+
+    .content-wrap {
+        padding: 20px;
+    }
+
+    .content-block {
+        padding: 0 0 20px;
+    }
+
+    .alert {
+        font-size: 16px;
+        color: #fff;
+        font-weight: 500;
+        padding: 20px;
+        text-align: center;
+        border-radius: 3px 3px 0 0;
+    }
+
+    .alert.alert-warning {
+        background: #ff9f00;
+    }
+
+    .alert.alert-good {
+        background: #68b90f;
+    }
+
+    .otp-code {
+        font-size: 32px;
+        font-weight: bold;
+        letter-spacing: 8px;
+        text-align: center;
+        padding: 20px;
+        background-color: #f0f0f0;
+        border: 2px dashed #348eda;
+        border-radius: 5px;
+        margin: 20px 0;
+    }
+
+    p {
+        margin-bottom: 10px;
+        font-weight: normal;
+    }
+
+    @media only screen and (max-width: 640px) {
+        .container {
+            width: 100% !important;
+        }
+
+        .content {
+            padding: 10px !important;
+        }
+
+        .otp-code {
+            font-size: 24px;
+            letter-spacing: 4px;
+        }
+    }
+</style>
+
+<body>
+
+<table class="body-wrap">
+    <tr>
+        <td></td>
+        <td class="container" width="600">
+            <div class="content">
+                <table class="main" width="100%" cellpadding="0" cellspacing="0">
+                    <tr>
+                        <td class="alert alert-good">
+                            Tweefactorauthenticatie - DBOIS
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="content-wrap">
+                            <table width="100%" cellpadding="0" cellspacing="0">
+                                <tr>
+                                    <td class="content-block">
+                                        <p>
+                                            Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
+                                        </p>
+                                        <p>
+                                            U probeert in te loggen in DBOIS. Gebruik de onderstaande verificatiecode om uw login te voltooien.
+                                        </p>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <div class="otp-code">
+                                            <?= $user['otp_code'] ?>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <p>
+                                            Deze code is 10 minuten geldig.
+                                        </p>
+                                        <p>
+                                            Als u niet heeft geprobeerd in te loggen, negeer dan deze e-mail.
+                                        </p>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+        </td>
+        <td></td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/app/Views/emails/welcome_email.php b/app/Views/emails/welcome_email.php
new file mode 100644
index 0000000..4dd69e4
--- /dev/null
+++ b/app/Views/emails/welcome_email.php
@@ -0,0 +1,372 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta name="viewport" content="width=device-width"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>wachtwoord DBOIS</title>
+    <link href="styles.css" media="all" rel="stylesheet" type="text/css"/>
+</head>
+<style>
+
+    /* -------------------------------------
+        GLOBAL
+    ------------------------------------- */
+    * {
+        margin: 0;
+        padding: 0;
+        font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+    }
+
+    img {
+        max-width: 100%;
+    }
+
+    body {
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-size-adjust: none;
+        width: 100% !important;
+        height: 100%;
+        line-height: 1.6;
+    }
+
+    /* Let's make sure all tables have defaults */
+    table td {
+        vertical-align: top;
+    }
+
+    /* -------------------------------------
+        BODY & CONTAINER
+    ------------------------------------- */
+    body {
+        background-color: #f6f6f6;
+    }
+
+    .body-wrap {
+        background-color: #f6f6f6;
+        width: 100%;
+    }
+
+    .container {
+        display: block !important;
+        max-width: 600px !important;
+        margin: 0 auto !important;
+        /* makes it centered */
+        clear: both !important;
+    }
+
+    .content {
+        max-width: 600px;
+        margin: 0 auto;
+        display: block;
+        padding: 20px;
+    }
+
+    /* -------------------------------------
+        HEADER, FOOTER, MAIN
+    ------------------------------------- */
+    .main {
+        background: #fff;
+        border: 1px solid #e9e9e9;
+        border-radius: 3px;
+    }
+
+    .content-wrap {
+        padding: 20px;
+    }
+
+    .content-block {
+        padding: 0 0 20px;
+    }
+
+    .header {
+        width: 100%;
+        margin-bottom: 20px;
+    }
+
+    .footer {
+        width: 100%;
+        clear: both;
+        color: #999;
+        padding: 20px;
+    }
+
+    .footer a {
+        color: #999;
+    }
+
+    .footer p, .footer a, .footer unsubscribe, .footer td {
+        font-size: 12px;
+    }
+
+    /* -------------------------------------
+        GRID AND COLUMNS
+    ------------------------------------- */
+    .column-left {
+        float: left;
+        width: 50%;
+    }
+
+    .column-right {
+        float: left;
+        width: 50%;
+    }
+
+    /* -------------------------------------
+        TYPOGRAPHY
+    ------------------------------------- */
+    h1, h2, h3 {
+        font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+        color: #000;
+        margin: 40px 0 0;
+        line-height: 1.2;
+        font-weight: 400;
+    }
+
+    h1 {
+        font-size: 32px;
+        font-weight: 500;
+    }
+
+    h2 {
+        font-size: 24px;
+    }
+
+    h3 {
+        font-size: 18px;
+    }
+
+    h4 {
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    p, ul, ol {
+        margin-bottom: 10px;
+        font-weight: normal;
+    }
+
+    p li, ul li, ol li {
+        margin-left: 5px;
+        list-style-position: inside;
+    }
+
+    /* -------------------------------------
+        LINKS & BUTTONS
+    ------------------------------------- */
+    a {
+        color: #348eda;
+        text-decoration: underline;
+    }
+
+    .btn-primary {
+        text-decoration: none;
+        color: #FFF;
+        background-color: #348eda;
+        border: solid #348eda;
+        border-width: 10px 20px;
+        line-height: 2;
+        font-weight: bold;
+        text-align: center;
+        cursor: pointer;
+        display: inline-block;
+        border-radius: 5px;
+        text-transform: capitalize;
+    }
+
+    /* -------------------------------------
+        OTHER STYLES THAT MIGHT BE USEFUL
+    ------------------------------------- */
+    .last {
+        margin-bottom: 0;
+    }
+
+    .first {
+        margin-top: 0;
+    }
+
+    .padding {
+        padding: 10px 0;
+    }
+
+    .aligncenter {
+        text-align: center;
+    }
+
+    .alignright {
+        text-align: right;
+    }
+
+    .alignleft {
+        text-align: left;
+    }
+
+    .clear {
+        clear: both;
+    }
+
+    /* -------------------------------------
+        Alerts
+    ------------------------------------- */
+    .alert {
+        font-size: 16px;
+        color: #fff;
+        font-weight: 500;
+        padding: 20px;
+        text-align: center;
+        border-radius: 3px 3px 0 0;
+    }
+
+    .alert a {
+        color: #fff;
+        text-decoration: none;
+        font-weight: 500;
+        font-size: 16px;
+    }
+
+    .alert.alert-warning {
+        background: #ff9f00;
+    }
+
+    .alert.alert-bad {
+        background: #d0021b;
+    }
+
+    .alert.alert-good {
+        background: #68b90f;
+    }
+
+    /* -------------------------------------
+        INVOICE
+    ------------------------------------- */
+    .invoice {
+        margin: 40px auto;
+        text-align: left;
+        width: 80%;
+    }
+
+    .invoice td {
+        padding: 5px 0;
+    }
+
+    .invoice .invoice-items {
+        width: 100%;
+    }
+
+    .invoice .invoice-items td {
+        border-top: #eee 1px solid;
+    }
+
+    .invoice .invoice-items .total td {
+        border-top: 2px solid #333;
+        border-bottom: 2px solid #333;
+        font-weight: 700;
+    }
+
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 640px) {
+        h1, h2, h3, h4 {
+            font-weight: 600 !important;
+            margin: 20px 0 5px !important;
+        }
+
+        h1 {
+            font-size: 22px !important;
+        }
+
+        h2 {
+            font-size: 18px !important;
+        }
+
+        h3 {
+            font-size: 16px !important;
+        }
+
+        .container {
+            width: 100% !important;
+        }
+
+        .content, .content-wrapper {
+            padding: 10px !important;
+        }
+
+        .invoice {
+            width: 100% !important;
+        }
+    }
+
+</style>
+
+<body>
+
+<table class="body-wrap">
+    <tr>
+        <td></td>
+        <td class="container" width="600">
+            <div class="content">
+                <table class="main" width="100%" cellpadding="0" cellspacing="0">
+                    <tr>
+                        <td class="alert alert-warning">
+                            Wachtwoord De Beleidsonderzoekers
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="content-wrap">
+                            <table width="100%" cellpadding="0" cellspacing="0">
+                                <tr>
+                                    <td class="content-block">
+                                        <p>
+                                            Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
+                                        </p>
+                                        <p>
+                                            Er is voor u een account aangemaakt is het informatiesysteem van de Beleidsonderzoekers, hieronder vindt u uw gebruikersnaam en wachtwoord waarmee u kunt inloggen in het systeem.
+                                        </p>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        Hieronder vindt u uw gebruikersnaam wachtwoord om in te loggen op het
+                                        informatiesysteem van De Beleidsonderzoekers
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <table class="invoice">
+                                            <tr>
+                                                <td>
+                                                    <table class="invoice-items" cellpadding="0" cellspacing="0">
+                                                        <tr>
+                                                            <td>gebruikersnaam</td>
+                                                            <td class="alignright"><?= $user['username'] ?></td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>wacthwoord</td>
+                                                            <td class="alignright"><?= $password ?></td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="content-block">
+                                        <a href="<?php echo getenv('APP_URL'); ?>" class="btn-primary">
+                                            Ga naar het informatiesysteem
+                                        </a>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+        </td>
+        <td></td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/app/Views/errors/cli/error_404.php b/app/Views/errors/cli/error_404.php
new file mode 100755
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_db.php b/app/Views/errors/cli/error_db.php
new file mode 100755
index 0000000..a8599d4
--- /dev/null
+++ b/app/Views/errors/cli/error_db.php
@@ -0,0 +1,8 @@
+<?php
+
+
+echo "\nDatabase error: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
new file mode 100755
index 0000000..624f3b5
--- /dev/null
+++ b/app/Views/errors/cli/error_exception.php
@@ -0,0 +1,65 @@
+<?php
+
+use CodeIgniter\CLI\CLI;
+
+// The main Exception
+CLI::write('[' . $exception::class . ']', 'light_gray', 'red');
+CLI::write($message);
+CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
+CLI::newLine();
+
+$last = $exception;
+
+while ($prevException = $last->getPrevious()) {
+    $last = $prevException;
+
+    CLI::write('  Caused by:');
+    CLI::write('  [' . $prevException::class . ']', 'red');
+    CLI::write('  ' . $prevException->getMessage());
+    CLI::write('  at ' . CLI::color(clean_path($prevException->getFile()) . ':' . $prevException->getLine(), 'green'));
+    CLI::newLine();
+}
+
+// The backtrace
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
+    $backtraces = $last->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(static fn ($value): string => match (true) {
+            is_object($value) => 'Object(' . $value::class . ')',
+            is_array($value)  => $value !== [] ? '[...]' : '[]',
+            $value === null   => 'null', // return the lowercased version
+            default           => var_export($value, true),
+        }, array_values($error['args'] ?? [])));
+
+        $function .= '(' . $args . ')';
+
+        CLI::write($function);
+        CLI::newLine();
+    }
+}
diff --git a/app/Views/errors/cli/error_general.php b/app/Views/errors/cli/error_general.php
new file mode 100755
index 0000000..3188326
--- /dev/null
+++ b/app/Views/errors/cli/error_general.php
@@ -0,0 +1,8 @@
+<?php
+
+
+echo "\nERROR: ",
+	$heading,
+	"\n\n",
+	$message,
+	"\n\n";
\ No newline at end of file
diff --git a/app/Views/errors/cli/error_php.php b/app/Views/errors/cli/error_php.php
new file mode 100755
index 0000000..9f2249b
--- /dev/null
+++ b/app/Views/errors/cli/error_php.php
@@ -0,0 +1,21 @@
+<?php  ?>
+
+A PHP Error was encountered
+
+Severity:    <?php echo $severity, "\n"; ?>
+Message:     <?php echo $message, "\n"; ?>
+Filename:    <?php echo $filepath, "\n"; ?>
+Line Number: <?php echo $line; ?>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+Backtrace:
+<?php	foreach (debug_backtrace() as $error): ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+	File: <?php echo $error['file'], "\n"; ?>
+	Line: <?php echo $error['line'], "\n"; ?>
+	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		endif ?>
+<?php	endforeach ?>
+
+<?php endif ?>
diff --git a/app/Views/errors/cli/index.html b/app/Views/errors/cli/index.html
new file mode 100755
index 0000000..b702fbc
--- /dev/null
+++ b/app/Views/errors/cli/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/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..b8539a4
--- /dev/null
+++ b/app/Views/errors/html/debug.css
@@ -0,0 +1,194 @@
+:root {
+    --main-bg-color: #fff;
+    --main-text-color: #555;
+    --dark-text-color: #222;
+    --light-text-color: #c7c7c7;
+    --brand-primary-color: #DC4814;
+    --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;
+    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);
+    margin-top: 2.17rem;
+}
+.header .container {
+    padding: 1rem;
+}
+.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;
+}
+
+.environment {
+    background: var(--brand-primary-color);
+    color: var(--main-bg-color);
+    text-align: center;
+    padding: calc(4px + 0.2083vw);
+    width: 100%;
+    top: 0;
+    position: fixed;
+}
+
+.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: 0 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;
+}
+
+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..99199ca
--- /dev/null
+++ b/app/Views/errors/html/debug.js
@@ -0,0 +1,116 @@
+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;
+}
diff --git a/app/Views/errors/html/error_400.php b/app/Views/errors/html/error_400.php
new file mode 100644
index 0000000..555da04
--- /dev/null
+++ b/app/Views/errors/html/error_400.php
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title><?= lang('Errors.badRequest') ?></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: normal;
+            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>400</h1>
+
+    <p>
+        <?php if (ENVIRONMENT !== 'production') : ?>
+            <?= nl2br(esc($message)) ?>
+        <?php else : ?>
+            <?= lang('Errors.sorryBadRequest') ?>
+        <?php endif; ?>
+    </p>
+</div>
+</body>
+</html>
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
new file mode 100755
index 0000000..e506f08
--- /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><?= lang('Errors.pageNotFound') ?></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: normal;
+            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</h1>
+
+        <p>
+            <?php if (ENVIRONMENT !== 'production') : ?>
+                <?= nl2br(esc($message)) ?>
+            <?php else : ?>
+                <?= lang('Errors.sorryCannotFind') ?>
+            <?php endif; ?>
+        </p>
+    </div>
+</body>
+</html>
diff --git a/app/Views/errors/html/error_db.php b/app/Views/errors/html/error_db.php
new file mode 100755
index 0000000..20c1610
--- /dev/null
+++ b/app/Views/errors/html/error_db.php
@@ -0,0 +1,64 @@
+<?php
+
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Database Error</title>
+<style type="text/css">
+
+::selection { background-color: #E13300; color: white; }
+::-moz-selection { background-color: #E13300; color: white; }
+
+body {
+	background-color: #fff;
+	margin: 40px;
+	font: 13px/20px normal Helvetica, Arial, sans-serif;
+	color: #4F5155;
+}
+
+a {
+	color: #003399;
+	background-color: transparent;
+	font-weight: normal;
+}
+
+h1 {
+	color: #444;
+	background-color: transparent;
+	border-bottom: 1px solid #D0D0D0;
+	font-size: 19px;
+	font-weight: normal;
+	margin: 0 0 14px 0;
+	padding: 14px 15px 10px 15px;
+}
+
+code {
+	font-family: Consolas, Monaco, Courier New, Courier, monospace;
+	font-size: 12px;
+	background-color: #f9f9f9;
+	border: 1px solid #D0D0D0;
+	color: #002166;
+	display: block;
+	margin: 14px 0 14px 0;
+	padding: 12px 10px 12px 10px;
+}
+
+#container {
+	margin: 10px;
+	border: 1px solid #D0D0D0;
+	box-shadow: 0 0 8px #D0D0D0;
+}
+
+p {
+	margin: 12px 15px 12px 15px;
+}
+</style>
+</head>
+<body>
+	<div id="container">
+		<h1><?php echo $heading; ?></h1>
+		<?php echo $message; ?>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
new file mode 100755
index 0000000..2c4e009
--- /dev/null
+++ b/app/Views/errors/html/error_exception.php
@@ -0,0 +1,429 @@
+<?php
+use CodeIgniter\HTTP\Header;
+use CodeIgniter\CodeIgniter;
+
+$errorId = uniqid('error', true);
+?>
+<!doctype html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="robots" content="noindex">
+
+    <title><?= esc($title) ?></title>
+    <style>
+        <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+    </style>
+
+    <script>
+        <?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
+    </script>
+</head>
+<body onload="init()">
+
+    <!-- Header -->
+    <div class="header">
+        <div class="environment">
+            Displayed at <?= esc(date('H:i:s')) ?> &mdash;
+            PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+            CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
+            Environment: <?= ENVIRONMENT ?>
+        </div>
+        <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(clean_path($file)) ?></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">
+        <?php
+        $last = $exception;
+
+        while ($prevException = $last->getPrevious()) {
+            $last = $prevException;
+            ?>
+
+    <pre>
+    Caused by:
+    <?= esc($prevException::class), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
+
+    <?= nl2br(esc($prevException->getMessage())) ?>
+    <a href="https://www.duckduckgo.com/?q=<?= urlencode($prevException::class . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
+       rel="noreferrer" target="_blank">search &rarr;</a>
+    <?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
+    </pre>
+
+        <?php
+        }
+        ?>
+    </div>
+
+    <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
+    <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'] . ' ' . clean_path($row['file']));
+                                } else {
+                                    echo esc(clean_path($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 $argsId = $errorId . 'args' . $index ?>
+                                    ( <a href="#" onclick="return toggle('<?= esc($argsId, 'attr') ?>');">arguments</a> )
+                                    <div class="args" id="<?= esc($argsId, 'attr') ?>">
+                                        <table cellspacing="0">
+
+                                        <?php
+                                        $params = null;
+                                        // Reflection by name is not available for closure function
+                                        if (! str_ends_with($row['function'], '}')) {
+                                            $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 = service('request'); ?>
+
+                <table>
+                    <tbody>
+                        <tr>
+                            <td style="width: 10em">Path</td>
+                            <td><?= esc($request->getUri()) ?></td>
+                        </tr>
+                        <tr>
+                            <td>HTTP Method</td>
+                            <td><?= esc($request->getMethod()) ?></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->headers(); ?>
+                <?php if (! empty($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>
+                                <?php
+                                if ($value instanceof Header) {
+                                    echo esc($value->getValueLine(), 'html');
+                                } else {
+                                    foreach ($value as $i => $header) {
+                                        echo ' ('. $i+1 . ') ' . esc($header->getValueLine(), 'html');
+                                    }
+                                }
+                                ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                <?php endif; ?>
+            </div>
+
+            <!-- Response -->
+            <?php
+                $response = service('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->getReasonPhrase()) ?></td>
+                    </tr>
+                </table>
+
+                <?php $headers = $response->headers(); ?>
+                <?php if (! empty($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>
+                                <?php
+                                if ($value instanceof Header) {
+                                    echo esc($response->getHeaderLine($name), 'html');
+                                } else {
+                                    foreach ($value as $i => $header) {
+                                        echo ' ('. $i+1 . ') ' . esc($header->getValueLine(), '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(clean_path($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 -->
+    <?php endif; ?>
+
+</body>
+</html>
diff --git a/app/Views/errors/html/error_general.php b/app/Views/errors/html/error_general.php
new file mode 100755
index 0000000..025aefa
--- /dev/null
+++ b/app/Views/errors/html/error_general.php
@@ -0,0 +1,64 @@
+<?php
+
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Error</title>
+<style type="text/css">
+
+::selection { background-color: #E13300; color: white; }
+::-moz-selection { background-color: #E13300; color: white; }
+
+body {
+	background-color: #fff;
+	margin: 40px;
+	font: 13px/20px normal Helvetica, Arial, sans-serif;
+	color: #4F5155;
+}
+
+a {
+	color: #003399;
+	background-color: transparent;
+	font-weight: normal;
+}
+
+h1 {
+	color: #444;
+	background-color: transparent;
+	border-bottom: 1px solid #D0D0D0;
+	font-size: 19px;
+	font-weight: normal;
+	margin: 0 0 14px 0;
+	padding: 14px 15px 10px 15px;
+}
+
+code {
+	font-family: Consolas, Monaco, Courier New, Courier, monospace;
+	font-size: 12px;
+	background-color: #f9f9f9;
+	border: 1px solid #D0D0D0;
+	color: #002166;
+	display: block;
+	margin: 14px 0 14px 0;
+	padding: 12px 10px 12px 10px;
+}
+
+#container {
+	margin: 10px;
+	border: 1px solid #D0D0D0;
+	box-shadow: 0 0 8px #D0D0D0;
+}
+
+p {
+	margin: 12px 15px 12px 15px;
+}
+</style>
+</head>
+<body>
+	<div id="container">
+		<h1><?php echo $heading; ?></h1>
+		<?php echo $message; ?>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/Views/errors/html/error_php.php b/app/Views/errors/html/error_php.php
new file mode 100755
index 0000000..252142b
--- /dev/null
+++ b/app/Views/errors/html/error_php.php
@@ -0,0 +1,33 @@
+<?php
+
+?>
+
+<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: <?php echo $severity; ?></p>
+<p>Message:  <?php echo $message; ?></p>
+<p>Filename: <?php echo $filepath; ?></p>
+<p>Line Number: <?php echo $line; ?></p>
+
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+
+	<p>Backtrace:</p>
+	<?php foreach (debug_backtrace() as $error): ?>
+
+		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+
+			<p style="margin-left:10px">
+			File: <?php echo $error['file'] ?><br />
+			Line: <?php echo $error['line'] ?><br />
+			Function: <?php echo $error['function'] ?>
+			</p>
+
+		<?php endif ?>
+
+	<?php endforeach ?>
+
+<?php endif ?>
+
+</div>
\ No newline at end of file
diff --git a/app/Views/errors/html/index.html b/app/Views/errors/html/index.html
new file mode 100755
index 0000000..b702fbc
--- /dev/null
+++ b/app/Views/errors/html/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/app/Views/errors/html/production.php b/app/Views/errors/html/production.php
new file mode 100644
index 0000000..2f59a8d
--- /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><?= lang('Errors.whoops') ?></title>
+
+    <style>
+        <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+    </style>
+</head>
+<body>
+
+    <div class="container text-center">
+
+        <h1 class="headline"><?= lang('Errors.whoops') ?></h1>
+
+        <p class="lead"><?= lang('Errors.weHitASnag') ?></p>
+
+    </div>
+
+</body>
+
+</html>
diff --git a/app/Views/errors/index.html b/app/Views/errors/index.html
new file mode 100755
index 0000000..b702fbc
--- /dev/null
+++ b/app/Views/errors/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/app/Views/index.html b/app/Views/index.html
new file mode 100755
index 0000000..b702fbc
--- /dev/null
+++ b/app/Views/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/app/Views/main_view.old b/app/Views/main_view.old
new file mode 100644
index 0000000..b8de45f
--- /dev/null
+++ b/app/Views/main_view.old
@@ -0,0 +1,55 @@
+<!doctype html>
+<html class="no-js css-menubar" lang="en">
+<head>
+
+</head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
+<meta name="description" content="bootstrap admin template">
+<meta name="author" content="">
+
+<link rel="icon" href="css/images/dbo-01-80x80.png" type="image/png">
+
+<title>** De Beleidsonderzoeker **</title>
+
+<?php $this->load->view( 'partials/_css' ); ?>
+
+<?php $this->load->view( 'partials/_fonts' ); ?>
+
+</head>
+<body id="dbois-app">
+<!-- ko stopBinding: true -->
+<?php $this->load->view( 'partials/_modals' ); ?>
+<!-- /ko -->
+<div class="dbois-container">
+    <div class="my-side-bar">
+        <?php $this->load->view( 'partials/_navbar-left' ); ?>
+    </div>
+    <div class="my-main-content">
+        <div id="main-content" data-bind="fadeVisible:initialized" style="display:none">
+            <?php foreach ( $pages as $page ): ?>
+                <?php if ( count( $page->subpages ) == 0 ): ?>
+                    <?php if ( $page->app_page == 'F' ) continue; ?>
+                    <div data-bind="visible: <?= $page->pageurl ?>">
+                        <!-- ko stopBinding: true -->
+                        <?php $this->load->view( 'pages/content', ['pageurl' => $page->pageurl] ); ?>
+                        <!-- /ko -->
+                    </div>
+                <?php else: ?>
+                    <?php foreach ( $page->subpages as $subpage ): ?>
+                        <div data-bind="visible: <?= $subpage->pageurl ?>">
+                            <!-- ko stopBinding: true -->
+                            <?php $this->load->view( 'pages/content', ['pageurl' => $subpage->pageurl] ); ?>
+                            <!-- /ko -->
+                        </div>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            <?php endforeach; ?>
+
+            <?php $this->load->view( 'partials/_js' ); ?>
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/app/Views/main_view.php b/app/Views/main_view.php
new file mode 100644
index 0000000..331efb6
--- /dev/null
+++ b/app/Views/main_view.php
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+	<link href="https://fonts.googleapis.com/css?family=Libre+Franklin&display=swap" rel="stylesheet">
+
+    <link rel="icon" href="css/images/dbo-01-80x80.png" type="image/png">
+
+    <title>** De Beleidsonderzoekers **</title>
+
+    <?= view('partials/_css') ?>
+
+    <?= view('partials/_fonts') ?>
+	<link rel="stylesheet" href="css/menu.css">
+	<link rel="stylesheet" href="css/dashboard.css">
+</head>
+<body id="dbois-app">
+<!-- ko stopBinding: true -->
+<?= view('partials/_modals') ?>
+<!-- /ko -->
+<div class="dbois-header">
+    <div class="menu-button-holder">
+        <div class=menu-button>
+            <div class="navbar-header">
+                <button type="button" id="sidebarCollapse"  
+                        style="background-color:#E0E0E0" 
+                        class="btn btn-default navbar-btn">
+                    <i class="glyphicon glyphicon-menu-hamburger"></i>
+                </button>
+            </div>
+        </div>
+    </div>
+    <div class="col-xs-9 col-xs-offset-3">
+        <a href="#" class="dbois-exit"
+           data-bind="click:logOut">uitloggen</a>
+        <div class="clock"></div>
+        <!-- ko if: hidePasswordinput() -->
+        <label class="change-password"
+               data-bind="click:togglePasswordinput">
+            wachtwoord wijzigen
+        </label>
+        <!-- /ko -->
+        <!-- ko if: ! hidePasswordinput() -->
+        <div class="change-password">
+            <div class="col-xs-5">
+                <input type="password"
+                       data-bind="textinput:newPassword, event:{'keyup':checkPassword}"
+                       class="form-control" placeholder="type hier uw wachtwoord" />
+            </div>
+            <div class="col-xs-2">
+                <button class="btn btn-success"
+                        data-bind="disable:!validPassword(),click:savePassword">wachtwoord aanvragen</button>
+            </div>
+        </div>
+        <!-- /ko -->
+
+    </div>
+</div>
+<div class="wrapper">
+    <?= view('partials/_navbar-left') ?>
+
+    <!-- Page Content Holder -->
+    <div id="content">
+        <?php foreach ( $pages as $page ): ?>
+            <?php if ( count( $page->subpages ) == 0 ): ?>
+                <?php if ( $page->app_page == 'F' ) continue; ?>
+                <div data-bind="visible: <?= $page->pageurl ?>">
+                    <!-- ko stopBinding: true -->
+                    <?= view('pages/content', ['pageurl' => $page->pageurl]) ?>
+                    <!-- /ko -->
+                </div>
+            <?php else: ?>
+                <?php foreach ( $page->subpages as $subpage ): ?>
+                    <div data-bind="visible: <?= $subpage->pageurl ?>">
+                        <!-- ko stopBinding: true -->
+                        <?= view('pages/content', ['pageurl' => $subpage->pageurl]) ?>
+                        <!-- /ko -->
+                    </div>
+                <?php endforeach; ?>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    </div>
+</div>
+
+<?= view('partials/_js') ?>
+<!-- jQuery CDN -->
+<!-- Bootstrap Js CDN -->
+<script type="text/javascript">
+    $(document).ready(function () {
+        $('#sidebarCollapse').on('click', function () {
+            $('#sidebar').toggleClass('active');
+        });
+    });
+</script>
+<p class="footer-version-number">V:<?= APP_VERSION ?? '1.0.81' ?></p>
+</body>
+</html>
diff --git a/app/Views/modals/comment_modal.php b/app/Views/modals/comment_modal.php
new file mode 100644
index 0000000..e2025f7
--- /dev/null
+++ b/app/Views/modals/comment_modal.php
@@ -0,0 +1,26 @@
+<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="comment-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">toevoegen / wijzigen commentaar</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-xl-12">
+                        <textarea data-bind="froala:comment, froalaOptions:options"></textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-success"
+                        data-bind="click:saveComment">opslaan
+                </button>
+                <button type="button" class="btn btn-warning" data-dismiss="modal">annuleren</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/customer_modal.php b/app/Views/modals/customer_modal.php
new file mode 100644
index 0000000..36aaffe
--- /dev/null
+++ b/app/Views/modals/customer_modal.php
@@ -0,0 +1,159 @@
+<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="customer-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">toevoegen / wijzigen opdrachtgever
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                </h5>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div role="form" class="form-horizontal">
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    naam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-institution"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="naam"
+                                               class="form-control"
+                                               data-bind="textInput:name,
+                                                            css:{'is-invalid':nameInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: nameInvalid() ? 'block' : 'none'}">
+                                        voer een naam in
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    adres
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-address-book-o"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="adres"
+                                               class="form-control"
+                                               data-bind="textInput:address">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    postcode
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-address-book-o"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="postcode"
+                                               class="form-control"
+                                               data-bind="textInput:postcode">
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    plaats
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-address-book-o"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="plaats"
+                                               class="form-control"
+                                               data-bind="textInput:place">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    contactpersoon
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-user"></i>
+                                        </span>
+                                        <input type="email"
+                                               placeholder="contactpersoon"
+                                               class="form-control"
+                                               data-bind="textInput:contactperson">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    email
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-envelope"></i>
+                                        </span>
+                                        <input type="email"
+                                               placeholder="email"
+                                               class="form-control"
+                                               data-bind="textInput:email,
+                                                            css:{'is-invalid':emailInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: emailInvalid() ? 'block' : 'none'}">
+                                        email ongeldig<span data-bind="text:emailInvalid"></span>
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    website
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-link"></i>
+                                        </span>
+                                        <input type="email"
+                                               placeholder="email"
+                                               class="form-control"
+                                               data-bind="textInput:website">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    opmerkingen
+                                </label>
+                                <div class="col-md-9">
+                                    <textarea class="form-control" data-bind="textInput:remarks"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-success"
+                        data-bind="visible:formValid(), click:saveCustomer">opslaan
+                </button>
+                <button type="button" class="btn btn-warning" data-dismiss="modal">annuleren</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/employeetarget_modal.php b/app/Views/modals/employeetarget_modal.php
new file mode 100644
index 0000000..4de94d6
--- /dev/null
+++ b/app/Views/modals/employeetarget_modal.php
@@ -0,0 +1,115 @@
+<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="employee-target-modal">
+    <div class="modal-dialog" role="document" style="width:700px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">toevoegen / wijzigen medewerker uren
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </h5>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <table class="table table-condensed">
+                            <thead>
+                            <tr>
+                                <th colspan="2">start</th>
+                                <th colspan="2">eind</th>
+                                <th colspan="2">&nbsp;</th>
+                            </tr>
+                            <tr>
+                                <th width="25%">maand</th>
+                                <th width="17%">jaar</th>
+                                <th width="25%">maand</th>
+                                <th width="17%">jaar</th>
+                                <th width="16%" title="target per maand">target p/m</th>
+                                <th>&nbsp;</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <!-- ko foreach:employeeTargets -->
+                            <tr>
+                                <td data-bind="css:{'red-line': ! saved()}">
+                                    <select data-bind="options:$root.months,
+                                                        optionsText:'month',
+                                                        optionsValue:'monthID',
+                                                        value:startmonth,
+                                                        disable: ! changeable(),
+                                                        event:{change:$root.setUnsaved}"
+                                            class="form-control">
+                                    </select>
+                                </td>
+                                <td data-bind="css:{'red-line': ! saved()}">
+                                    <select data-bind="options:$root.years,
+                                                        optionsText:'year',
+                                                        optionsValue:'year',
+                                                        value:startyear,
+                                                        disable: ! changeable(),
+                                                        event:{change:$root.setUnsaved}"
+                                            class="form-control">
+                                    </select>
+                                </td>
+                                <td data-bind="css:{'red-line': ! saved()}">
+                                    <select data-bind="options:$root.months,
+                                                        optionsText:'month',
+                                                        optionsValue:'monthID',
+                                                        value:endmonth,
+                                                        disable: ! changeable(),
+                                                        optionsCaption:'selecteer...',
+                                                        event:{change:$root.setUnsaved}"
+                                            class="form-control">
+                                    </select>
+                                </td>
+                                <td data-bind="css:{'red-line': ! saved()}">
+                                    <select data-bind="options:$root.years,
+                                                        optionsText:'year',
+                                                        optionsValue:'year',
+                                                        value:endyear,
+                                                        disable: ! changeable(),
+                                                        optionsCaption:'selecteer...',
+                                                        event:{change:$root.setUnsaved}"
+                                            class="form-control">
+                                    </select>
+                                </td>
+                                <td data-bind="css:{'red-line': ! saved()}">
+                                    <input type="text"
+                                           class="form-control"
+                                           data-bind="textInput:target,
+                                                        disable: ! changeable(),
+                                                        event:{keyup:$root.checkNumeric},
+                                                        event:{change:$root.setUnsaved}">
+                                </td>
+                                <td data-bind="css:{'red-line': ! saved()}">
+                                    <button class="btn btn-success"
+                                            data-bind="disable: ! validTarget(),
+                                                        click:$root.saveEmployeeTarget,
+                                                        visible: changeable()">
+                                        opslaan
+                                    </button>
+                                </td>
+                            </tr>
+                            <!-- /ko -->
+                            </tbody>
+                            <tfoot>
+                            <tr>
+                                <th colspan="6">
+                                    <i class="icon fa-plus-square-o pull-right pointer"
+                                       data-bind="click:addEmployeeTarget, visible:newTarget()"></i>
+                                </th>
+                            </tr>
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-warning"
+                        data-dismiss="modal">
+                    sluiten
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/external_modal.php b/app/Views/modals/external_modal.php
new file mode 100644
index 0000000..57de441
--- /dev/null
+++ b/app/Views/modals/external_modal.php
@@ -0,0 +1,207 @@
+<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="external-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">toevoegen / wijzigen onderaannemer
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                </h5>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div role="form" class="form-horizontal">
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    naam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-user"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="contactperson"
+                                               class="form-control"
+                                               data-bind="textInput:contactperson,
+                                                            css:{'is-invalid':contactpersonInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: contactpersonInvalid() ? 'block' : 'none'}">
+                                        voer een naam in
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    bedrijfsnaam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-institution"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="bedrijfsnaam"
+                                               class="form-control"
+                                               data-bind="textInput:name">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    adres
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-address-book-o"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="adres"
+                                               class="form-control"
+                                               data-bind="textInput:address">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    postcode
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-address-book-o"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="postcode"
+                                               class="form-control"
+                                               data-bind="textInput:postcode">
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    plaats
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-address-book-o"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="plaats"
+                                               class="form-control"
+                                               data-bind="textInput:place">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    email
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-envelope"></i>
+                                        </span>
+                                        <input type="email"
+                                               placeholder="email"
+                                               class="form-control"
+                                               data-bind="textInput:email,
+                                                            css:{'is-invalid':emailInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: emailInvalid() ? 'block' : 'none'}">
+                                        email ongeldig<span data-bind="text:emailInvalid"></span>
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    website
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-link"></i>
+                                        </span>
+                                        <input type="email"
+                                               placeholder="email"
+                                               class="form-control"
+                                               data-bind="textInput:website">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    kvk - nummer
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-institution"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="kvk nummer"
+                                               class="form-control"
+                                               data-bind="textInput:kvk_number">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    IBAN
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-institution"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="IBAN"
+                                               class="form-control"
+                                               data-bind="textInput:iban">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    tarief (per uur)
+                                </label>
+                                <div class="col-md-4">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-euro"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="tarief"
+                                               class="form-control align-right"
+                                               data-bind="textInput:rate, event:{keyup:validateNumber}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    opmerkingen
+                                </label>
+                                <div class="col-md-9">
+                                    <textarea class="form-control" data-bind="textInput:remarks"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-success"
+                        data-bind="visible:formValid(), click:saveExternal">opslaan
+                </button>
+                <button type="button" class="btn btn-warning" data-dismiss="modal">annuleren</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/offer_modal.php b/app/Views/modals/offer_modal.php
new file mode 100644
index 0000000..503aa4d
--- /dev/null
+++ b/app/Views/modals/offer_modal.php
@@ -0,0 +1,288 @@
+<div class="modal modal-primary" tabindex="-1" id="offer-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">toevoegen / wijzigen offerte
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                </h5>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div role="form" class="form-horizontal">
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    offerte nummer
+                                </label>
+                                <div class="col-md-5">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-asterisk"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="offerte nummer"
+                                               class="form-control"
+                                               data-bind="textInput:offernumber">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: ! offernumber() ? 'block' : 'none'}">
+                                        voer een offerte nummer in
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    offerte naam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-bookmark"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="offerte naam"
+                                               class="form-control"
+                                               data-bind="textInput:offername">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    offerte leider
+                                </label>
+                                <div class="col-md-8">
+                                    <div class="input-group input-group-icon">
+                                        <select class="form-control"
+                                                data-bind="options:users,
+                                                            optionsValue:'id',
+                                                            optionsText:'fullname',
+                                                            value:offerleader_id,
+                                                            optionsCaption:'selecteer offerteleider'">
+                                        </select>
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: ! offerleader_id() ? 'block' : 'none'}">
+                                        selecteer een offerteleider
+                                    </small>
+                                </div>
+                                <div class="col-md-1">
+                                    <i class="icon fa-plus-square greenish pointer" data-bind="click:addUser"></i>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    klant
+                                </label>
+                                <div class="col-md-8">
+                                    <div class="input-group input-group-icon">
+                                        <select class="form-control"
+                                                data-bind="options:customers,
+                                                            optionsValue:'id',
+                                                            optionsText:'name',
+                                                            value:customer_id,
+                                                            optionsCaption:'selecteer klant',
+                                                            event:{change:getCustomerProjects}"></select>
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: ! customer_id() ? 'block' : 'none'}">
+                                        selecteer een klant
+                                    </small>
+                                </div>
+                                <div class="col-md-1">
+                                    <i class="icon fa-plus-square greenish pointer" data-bind="click:addCustomer"></i>
+                                </div>
+                            </div>
+<!--                            <div class="form-group row">-->
+<!--                                <label class="col-md-3  control-label">-->
+<!--                                    project-->
+<!--                                </label>-->
+<!--                                <div class="col-md-8">-->
+<!--                                    <select class="form-control"-->
+<!--                                            data-bind="options:projects,-->
+<!--                                                        optionsValue: 'id',-->
+<!--                                                        optionsText:'projectnumber',-->
+<!--                                                        disable: ! customer_id(),-->
+<!--                                                        value:project_id"></select>-->
+<!--                                </div>-->
+<!--                            </div>-->
+                            <div class="form-group row">
+
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    datum offerte
+                                </label>
+                                <div class="col-md-5">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-calendar"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="datum offerte"
+                                               class="form-control"
+                                               readonly
+                                               data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:startdate, css:{'is-invalid': ! offerDateValid()}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: ! offerDateValid() ? 'block' : 'none'}">
+                                        voer een offerte datum in
+                                    </small>
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    kans
+                                </label>
+                                <div class="col-md-4">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-percent"></i>
+                                        </span>
+                                        <div>
+                                            <input type="text"
+                                                   placeholder="kans"
+                                                   class="form-control percentage-input"
+                                                   data-bind="textInput:acceptance_chance,
+                                               event:{keyup:validateNumber}">
+                                            <span class="percentage-sign">&#x25;</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    omzet
+                                </label>
+                                <div class="col-md-4">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-euro"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="eigen omzet"
+                                               class="form-control align-right"
+                                               data-bind="textInput:own_revenue,
+                                               event:{keyup:validateNumber}">
+                                    </div>
+                                    <small>
+                                        Eigen tarief omzet (excl btw)
+                                    </small>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-euro"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="overige omzet"
+                                               class="form-control align-right"
+                                               data-bind="textInput:other_revenue,
+                                               event:{keyup:validateNumber}">
+                                    </div>
+                                    <small>
+                                        Overige kosten (excl btw)
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                   &nbsp
+                                </label>
+                                <div class="col-md-4">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-euro"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="eigen omzet"
+                                               class="form-control align-right"
+                                               data-bind="textInput:costs,
+                                               event:{keyup:validateNumber}">
+                                    </div>
+                                    <small>
+                                        kosten derden (excl btw)
+                                    </small>
+                                </div>
+                            </div>
+
+							<div class="form-group row">
+								<label class="col-md-3  control-label">
+									deadline
+								</label>
+								<div class="col-md-5">
+									<div class="input-group input-group-icon">
+										<span class="input-group-addon">
+											<i class="icon fa-calendar"></i>
+										</span>
+										<input type="email"
+											   placeholder="deadline"
+											   class="form-control"
+											   readonly
+											   data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:deadline, disable:accepteddate()">
+									</div>
+								</div>
+								<div class="col-md-1">
+									<span class="icon fa-remove redish pointer"
+										  data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span>
+								</div>
+							</div>
+                            <div class="form-group row">
+                                <label class="col-md-3  control-label">
+                                    acceptatie datum
+                                </label>
+                                <div class="col-md-5">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-calendar"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="acceptatie datum"
+                                               class="form-control"
+                                               readonly
+                                               data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                                        value:accepteddate, disable:rejectdate()">
+                                    </div>
+                                </div>
+                                <div class="col-md-1">
+                                    <span class="icon fa-remove redish pointer"
+                                          data-bind="visible:accepteddate(), click:resetDate.bind($data, 'accepteddate')"></span>
+                                </div>
+                            </div>
+							<div class="form-group row">
+								<label class="col-md-3  control-label">
+									afwijsdatum
+								</label>
+								<div class="col-md-5">
+									<div class="input-group input-group-icon">
+										<span class="input-group-addon">
+											<i class="icon fa-calendar"></i>
+										</span>
+										<input type="email"
+											   placeholder="afwijsdatum"
+											   class="form-control"
+											   readonly
+											   data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:rejectdate, disable:accepteddate()">
+									</div>
+								</div>
+								<div class="col-md-1">
+									<span class="icon fa-remove redish pointer"
+										  data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span>
+								</div>
+							</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-success"
+                        data-bind="visible:formValid(), click:saveOffer">opslaan
+                </button>
+                <button type="button" class="btn btn-warning" data-dismiss="modal">annuleren</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/Views/modals/partials/_dashboard.php b/app/Views/modals/partials/_dashboard.php
new file mode 100644
index 0000000..7a3aab8
--- /dev/null
+++ b/app/Views/modals/partials/_dashboard.php
@@ -0,0 +1,5 @@
+<div class="tab-content">
+    <div class="tab-pane animation-slide-top active" id="dashboard">
+        <?= view('modals/partials/_projectdashboard') ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_financials.php b/app/Views/modals/partials/_financials.php
new file mode 100644
index 0000000..57ba827
--- /dev/null
+++ b/app/Views/modals/partials/_financials.php
@@ -0,0 +1,19 @@
+<div class="row" data-bind="fadeVisible:customerID()">
+    <!--                        <div class="col-md-5">-->
+    <!--                            --><?php //$this->load->view( 'modals/partials/_projectoffers' ); ?>
+    <!--                        </div>-->
+    <div class="col-md-8">
+        <?= view('modals/partials/_projectcosts') ?>
+    </div>
+    <div class="col-md-4">
+        <?= view('modals/partials/_reservations') ?>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-8">
+        <?= view('modals/partials/_invoices') ?>
+    </div>
+    <div class="col-md-4">
+        <?= view('modals/partials/_forecasts') ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_forecasts.php b/app/Views/modals/partials/_forecasts.php
new file mode 100644
index 0000000..e626fac
--- /dev/null
+++ b/app/Views/modals/partials/_forecasts.php
@@ -0,0 +1,104 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            prognoses (incl.btw)
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header" width="25%">
+                jaar
+            </th>
+            <th class="table-cyanish-header" width="25%">
+                maand
+            </th>
+            <th class="table-cyanish-header align-right" width="35%">
+                bedrag
+            </th>
+            <th class="table-cyanish-header" width="15%">&nbsp;</th>
+            </thead>
+            <tbody data-bind="foreach:forecasts">
+            <tr>
+                <td>
+                    <span data-bind="text:dbo.helpers.findArrayElement('year', 'year', year(), $root.years()),
+                                visible:! inEdit()"></span>
+                    <select class="form-control form-control-sm"
+                            data-bind="options:$root.years,
+                                        optionsText:'year',
+                                        optionsValue:'year',
+                                        value:year,
+                                        optionsCaption:'voer jaar in',
+                                        visible: inEdit(),
+                                        event:{change:$root.saveForecast}">
+                    </select>
+                </td>
+                <td>
+                    <span data-bind="text:dbo.helpers.findArrayElement('monthID', 'month', month_id(), $root.months()),
+                                visible:! inEdit()"></span>
+                    <select class="form-control form-control-sm"
+                            data-bind="options:$root.months,
+                                        optionsText:'month',
+                                        optionsValue:'monthID',
+                                        value:month_id,
+                                        optionsCaption:'voer maand in',
+                                        visible: inEdit(),
+                                        event:{change:$root.saveForecast}">
+                    </select>
+                </td>
+                <td class="align-right">
+                    <span data-bind="visible:!inEdit()">
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:dbo.helpers.numberWithPoints(forecastamount())"></span>
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="bedrag"
+                           data-bind="textInput:forecastamount, visible:inEdit,
+                            event:{change:$root.saveForecast,keyup:$root.validateNumber.bind($data, 'forecastamount')}"/>
+                </td>
+                <td>
+                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editForecast"></i>
+                    <i class="icon fa-trash redish pointer" title="verwijder"
+                       data-bind="click:$root.removeForecast"></i>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr>
+                <th colspan="4">
+                    <button class="btn btn-primary btn-round btn-sm" data-bind="click:addForecast">
+                        nieuwe prognose
+                    </button>
+                </th>
+            </tr>
+            <tr>
+                <th colspan="4">
+                    <table class="table table-condensed">
+                        <thead>
+                        <tr>
+                            <th>te factureren</th>
+                            <th>geprognosticeerd</th>
+                            <th>nog te prognosticeren</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                            <td>
+                                <span data-bind="text:outstanding"></span>
+                            </td>
+                            <td>
+                                <span data-bind="text:totalForecast"></span>
+                            </td>
+                            <td>
+                                <span data-bind="text:toForecast"></span>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </th>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_hourTotals.php b/app/Views/modals/partials/_hourTotals.php
new file mode 100644
index 0000000..4e4182f
--- /dev/null
+++ b/app/Views/modals/partials/_hourTotals.php
@@ -0,0 +1,57 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            projecturen
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header" width="40%">
+                medewerker
+            </th>
+            <th class="table-cyanish-header align-right" width="20%">
+                niet declarabel
+            </th>
+            <th class="table-cyanish-header align-right" width="20%">
+                declarabel
+            </th>
+            <th class="table-cyanish-header align-right" width="20%">
+                omzet
+            </th>
+            </thead>
+            <tbody data-bind="foreach:hourTotals">
+            <tr>
+                <td>
+                    <span data-bind="text:fullname"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:nondeclarable"></span> uur
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:declarable"></span> uur
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:revenues"></span>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr>
+                <th class="table-cyanish-header">
+                    totaal
+                </th>
+                <th class="align-right table-cyanish-header">
+                    <span data-bind="text:totalNonDeclarable"></span> uur
+                </th>
+                <th class="align-right table-cyanish-header">
+                    <span data-bind="text:totalDeclarable"></span> uur
+                </th>
+                <th class="align-right table-cyanish-header">
+                    <span data-bind="text:totalRevenueHours"></span>
+                </th>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_hours.php b/app/Views/modals/partials/_hours.php
new file mode 100644
index 0000000..954b551
--- /dev/null
+++ b/app/Views/modals/partials/_hours.php
@@ -0,0 +1,102 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            projecturen
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header" width="40%">
+                medewerker
+            </th>
+            <th class="table-cyanish-header" width="15%">
+                datum
+            </th>
+            <th class="table-cyanish-header" width="15%">
+                declarabel
+            </th>
+            <th class="table-cyanish-header align-right" width="15%">
+               uren
+            </th>
+            <th class="table-cyanish-header align-right" width="15%">
+                omzet
+            </th>
+<!--            <th class="table-cyanish-header" width="8%">-->
+<!--                &nbsp;-->
+<!--            </th>-->
+            </thead>
+            <tbody data-bind="foreach:projecthours">
+            <tr>
+                <td>
+                    <span data-bind="text:dbo.helpers.findArrayElement('id', 'fullname', projectemployee_id(), $root.projectEmployees()),
+                                visible:! inEdit()"></span>
+                    <select class="form-control form-control-sm"
+                            data-bind="options:$root.projectEmployees,
+                                        optionsText:'fullname',
+                                        optionsValue:'id',
+                                        value:projectemployee_id,
+                                        optionsCaption:'medewerker',
+                                        visible: inEdit(),
+                                        event:{change:$root.saveProjecthour}">
+                    </select>
+                </td>
+                <td>
+                    <span data-bind="text:hourdate, visible:! inEdit()"></span>
+                    <input type="text"
+                           class="form-control form-control-sm"
+                           placeholder="datum"
+                           data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                      value:hourdate, visible:inEdit,
+                            event:{change:$root.saveProjecthour}"/>
+                </td>
+                <td class="align-center">
+                    <i class="icon fa-check" data-bind="visible:hourtype_id() == 1, click:$root.setHourtype.bind($data,2)"></i>
+                    <i class="icon fa-square-o" data-bind="visible:hourtype_id() != 1, click:$root.setHourtype.bind($data, 1)"></i>
+                </td>
+                <td class="align-right">
+                    <span data-bind=" visible: ! inEdit()">
+                        <span data-bind="text:hours"></span>
+                         uur
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="uren"
+                           data-bind="textInput:hours, visible:inEdit,
+                            event:{change:$root.saveProjecthour,keyup:$root.validateNumber.bind($data, 'hours')}"/>
+                </td>
+                <td class="align-right">
+                    <i class="icon fa-euro"></i>
+                    <span data-bind="text:dbo.helpers.numberWithPoints(revenue())"></span>
+                </td>
+<!--                <td>-->
+<!--                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjecthour"></i>-->
+<!--                    <i class="icon fa-trash redish pointer" title="verwijder"-->
+<!--                       data-bind="click:$root.removeProjecthour"></i>-->
+<!--                </td>-->
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr>
+                <th class="table-cyanish-header" colspan="2">Totaal</th>
+                <th class="table-cyanish-header">&nbsp;</th>
+                <th class="table-cyanish-header align-right">
+                    <span data-bind="text:totalHours"></span> uur
+                </th>
+                <th class="table-cyanish-header align-right">
+                    <i class="icon fa-euro"></i>
+                    <span data-bind="text:dbo.helpers.numberWithPoints(totalRevenue())"></span>
+                </th>
+<!--                <th class="table-cyanish-header">&nbsp;</th>-->
+            </tr>
+<!--            <tr>-->
+<!--                <td colspan="5">-->
+<!--                    <button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjecthour">-->
+<!--                        nieuwe uren-->
+<!--                    </button>-->
+<!--                </td>-->
+<!--            </tr>-->
+            </tfoot>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_invoices.php b/app/Views/modals/partials/_invoices.php
new file mode 100644
index 0000000..54b4516
--- /dev/null
+++ b/app/Views/modals/partials/_invoices.php
@@ -0,0 +1,197 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            uitgaande facturen (incl btw)
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project" style="overflow-y:scroll;">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header">&nbsp;</th>
+            <th class="table-cyanish-header">
+                factuurnummer
+            </th>
+            <th class="table-cyanish-header">
+               factuurdatum
+            </th>
+            <th class="table-cyanish-header align-right">
+                bedrag (excl btw)
+            </th>
+            <th class="table-cyanish-header align-right">
+                bedrag (incl btw)
+            </th>
+            <th class="table-cyanish-header align-right">
+                openstaand( incl btw)
+            </th>
+            <th class="table-cyanish-header align-right">
+                btw tarief
+            </th>
+            <th class="table-cyanish-header" width="45px">
+                &nbsp;
+            </th>
+            </thead>
+            <tbody data-bind="foreach:invoices">
+            <tr>
+                <td>
+                    <i class="icon fa-chevron-right" data-bind="visible: ! showPayments(), click:$root.togglePayments"></i>
+                    <i class="icon fa-chevron-down" data-bind="visible:showPayments(), click:$root.togglePayments"></i>
+                </td>
+                <td>
+                    <span data-bind="text:invoicenumber, visible:! inEdit()"></span>
+                    <input type="text"
+                           class="form-control form-control-sm"
+                           placeholder="factuurnummer"
+                           data-bind="textInput:invoicenumber, visible:inEdit,
+                            event:{change:$root.saveInvoice}"/>
+                </td>
+                <td>
+                    <span data-bind="text:invoicedate, visible:! inEdit()"></span>
+                    <input type="text"
+                           class="form-control form-control-sm"
+                           placeholder="datum"
+                           data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                      value:invoicedate, visible:inEdit,
+                            event:{change:$root.saveInvoice}"/>
+                </td>
+                <td class="align-right">
+                    <span data-bind=" visible: ! inEdit()">
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:dbo.helpers.numberWithPoints(invoiceamount())"></span>
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="bedrag"
+                           data-bind="textInput:invoiceamount, visible:inEdit,
+                            event:{change:$root.saveInvoice,keyup:$root.validateNumber.bind($data, 'invoiceamount')}"/>
+                </td>
+                <td class="align-right">
+                    <i class="icon fa-euro"></i>
+                    <span data-bind="text:dbo.helpers.numberWithPoints(inclBtw())"></span>
+                </td>
+                <td class="align-right">
+                    <i class="icon fa-euro"></i>
+                    <span data-bind="text:dbo.helpers.numberWithPoints(outstanding())"></span>
+                </td>
+<!--                <td class="align-right">-->
+<!--                    <span data-bind=" visible: ! inEdit()">-->
+<!--                        <i class="icon fa-euro"></i>-->
+<!--                        <span data-bind="text:dbo.helpers.numberWithPoints(forecastamount())"></span>-->
+<!--                    </span>-->
+<!--                    <input type="text"-->
+<!--                           class="form-control form-control-sm align-right"-->
+<!--                           paceholder="bedrag"-->
+<!--                           data-bind="textInput:forecastamount, visible:inEdit,-->
+<!--                            event:{change:$root.saveInvoice,keyup:$root.validateNumber.bind($data, 'forecastamount')}"/>-->
+<!--                </td>-->
+<!--                <td class="align-right">-->
+<!--                    <span data-bind="text:forecastdate, visible:! inEdit()"></span>-->
+<!--                    <input type="text"-->
+<!--                           class="form-control form-control-sm"-->
+<!--                           placeholder="datum"-->
+<!--                           data-bind="datepicker:{dateFormat: 'dd-mm-yy' },-->
+<!--                                      value:forecastdate, visible:inEdit,-->
+<!--                            event:{change:$root.saveInvoice}"/>-->
+<!--                </td>-->
+                <td class="align-right">
+                    <span data-bind="visible:! inEdit()">
+                        <span data-bind="text:dbo.helpers.findArrayElement('id', 'vatrate', vat_id(), $root.vats())"></span>
+                        %
+                    </span>
+                    <select class="form-control form-control-sm"
+                            data-bind="options:$root.vats,
+                                        optionsText:'vatrate',
+                                        optionsValue:'id',
+                                        value:vat_id,
+                                        optionsCaption:'btw',
+                                        visible:inEdit(),
+                                        event:{change:$root.saveInvoice}">
+                    </select>
+                </td>
+                <td>
+                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editInvoice"></i>
+                    <i class="icon fa-trash redish pointer" title="verwijder"
+                       data-bind="click:$root.removeInvoice"></i>
+                </td>
+            </tr>
+            <tr data-bind="visible:showPayments()">
+                <td colspan="8">
+                    <table class="table table-condensed">
+                        <thead>
+                        <th>&nbsp;</th>
+                        <th class="table-cyanish-header-light">
+                            datum
+                        </th>
+                        <th class="table-cyanish-header-light">
+                            bedrag
+                        </th>
+                        <th class="table-cyanish-header-light">
+                        </th>
+                        </thead>
+                        <tbody data-bind="foreach:payments">
+                        <tr>
+                            <td>&nbsp;</td>
+                            <td>
+                                <span data-bind="text:paymentdate, visible:! inEdit()"></span>
+                                <input type="text"
+                                       class="form-control form-control-sm"
+                                       placeholder="datum"
+                                       data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                                    value:paymentdate, visible:inEdit,
+                                                    event:{change:$root.savePayment}"/>
+                            </td>
+                            <td>
+                                <span data-bind=" visible: ! inEdit()">
+                                    <i class="icon fa-euro"></i>
+                                    <span data-bind="text:dbo.helpers.numberWithPoints(paymentamount())"></span>
+                                </span>
+                                <input type="text"
+                                       class="form-control form-control-sm align-right"
+                                       paceholder="bedrag"
+                                       data-bind="textInput:paymentamount, visible:inEdit,
+                                                event:{change:$root.savePayment,
+                                                        keyup:$root.validateNumber.bind($data, 'paymentamount')}"/>
+                            </td>
+                            <td>
+                                <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editPayment.bind($data, $parents[0])"></i>
+                                <i class="icon fa-trash redish pointer" title="verwijder"
+                                   data-bind="click:$root.removePayment"></i>
+                            </td>
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <td></td>
+                        <td colspan="3">
+                            <a href="#" data-bind="click:$root.newPayment">
+                                nieuwe betaling
+                            </a>
+                        </td>
+                        </tfoot>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+			<tr>
+				<th colspan="3" class="table-cyanish-header"></th>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalInvoiceamount())"></span>
+				</th>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalInclBtw())"></span>
+				</th>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalOutstanding())"></span>
+				</th>
+				<th colspan="2" class="table-cyanish-header"></th>
+			</tr>
+            <tr>
+                <td colspan="5">
+                    <button class="btn btn-primary btn-round btn-sm" data-bind="click:newInvoice">
+                        nieuwe factuur
+                    </button>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
diff --git a/app/Views/modals/partials/_projectcomments.php b/app/Views/modals/partials/_projectcomments.php
new file mode 100644
index 0000000..806d84b
--- /dev/null
+++ b/app/Views/modals/partials/_projectcomments.php
@@ -0,0 +1,43 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            opmerkingen
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <tr>
+                <td colspan="2" class="table-cyanish-header">
+                    offerte opmerkingen
+                </td>
+            </tr>
+            </thead>
+            <tbody data-bind="foreach:projectFiles">
+                <td>
+
+                </td>
+                <td>
+                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editPayment"></i>
+                    <i class="icon fa-trash redish pointer" title="verwijder"
+                       data-bind="click:$root.removePayment"></i>
+                </td>
+            </tr>
+            </tbody>
+            <thead>
+            <tr>
+                <th colspan="2" class="table-cyanish-header">
+                    project opmerkingen
+                </th>
+            </tr>
+            </thead>
+            <tfoot>
+            <tr>
+                <td colspan="2">
+
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_projectcosts.php b/app/Views/modals/partials/_projectcosts.php
new file mode 100644
index 0000000..7473af1
--- /dev/null
+++ b/app/Views/modals/partials/_projectcosts.php
@@ -0,0 +1,137 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            inkomende facturen (bedragen incl btw)
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header">
+                onderaannemer
+            </th>
+            <th class="table-cyanish-header">
+                omschrijving
+            </th>
+            <th class="table-cyanish-header">
+                datum
+            </th>
+            <th class="table-cyanish-header align-right">
+                bedrag
+            </th>
+            <th class="table-cyanish-header align-right">
+                betaald
+            </th>
+            <th class="table-cyanish-header align-right">
+                via<br />reservering
+            </th>
+            <th class="table-cyanish-header align-right">
+                te betalen
+            </th>
+            <th class="table-cyanish-header align-right">&nbsp;</th>
+            </thead>
+            <tbody data-bind="foreach:projectcosts">
+            <tr>
+                <td>
+                    <span data-bind="text:dbo.helpers.findArrayElement('id', 'contactperson', external_id(), $root.externals()),
+                                    visible:! inEdit()"></span>
+                    <select class="form-control form-control-sm"
+                            data-bind="options:$root.externals,
+                                        optionsText:'contactperson',
+                                        optionsValue:'id',
+                                        value:external_id,
+                                        optionsCaption:'extern',
+                                        visible: inEdit(),
+                                        event:{change:$root.saveProjectcosts}">
+                    </select>
+                </td>
+                <td>
+                    <span data-bind=" visible: ! inEdit()">
+                        <span data-bind="text:description"></span>
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="omschrijving"
+                           data-bind="textInput:description, visible:inEdit,
+                            event:{change:$root.saveProjectcosts}"/>
+                </td>
+                <td>
+                    <span data-bind="text:date, visible:! inEdit()"></span>
+                    <input type="text"
+                           class="form-control form-control-sm"
+                           placeholder="start"
+                           data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                      value:date, visible:inEdit,
+                            event:{change:$root.saveProjectcosts}"/>
+                </td>
+                <td class="align-right">
+                    <span data-bind=" visible: ! inEdit()">
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:dbo.helpers.numberWithPoints(costs())"></span>
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="bedrag"
+                           data-bind="textInput:costs, visible:inEdit,
+                            event:{change:$root.saveProjectcosts,keyup:$root.validateNumber.bind($data, 'costs')}"/>
+                </td>
+                <td class="align-right">
+                    <span data-bind=" visible: ! inEdit()">
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:dbo.helpers.numberWithPoints(payed())"></span>
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="bedrag"
+                           data-bind="textInput:payed, visible:inEdit,
+                            event:{change:$root.saveProjectcosts,keyup:$root.validateNumber.bind($data, 'payed')}"/>
+                </td>
+                <td class="align-center">
+                    <!-- ko if:fromReservation() -->
+                    &nbsp;<i class="icon fa-check pointer"
+                             data-bind="click:$root.toggleFromReservation"></i>
+                    <!-- /ko -->
+                    <!-- ko if: ! fromReservation() -->
+                    &nbsp;<i class="icon fa-square-o pointer"
+                             data-bind="click:$root.toggleFromReservation"></i>
+                    <!-- /ko -->
+                </td>
+                <td class="align-right">
+                    <span>
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:dbo.helpers.numberWithPoints(toPay())"></span>
+                    </span>
+                </td>
+                <td>
+                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjectcosts"></i>
+                    <i class="icon fa-trash redish pointer" title="verwijder"
+                       data-bind="click:$root.removeProjectcosts"></i>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+			<tr>
+				<th colspan="3" class="table-cyanish-header"></th>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalCosts())"></span>
+				</th>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalPayed())"></span>
+				</th>
+				<th class="table-cyanish-header"></th>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalToPay())"></span>
+				</th>
+				<th class="table-cyanish-header"></th>
+			</tr>
+            <tr>
+                <td colspan="8">
+                    <button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjectcost">
+                        nieuwe projectkosten
+                    </button>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
diff --git a/app/Views/modals/partials/_projectdashboard.php b/app/Views/modals/partials/_projectdashboard.php
new file mode 100644
index 0000000..c1ae6f1
--- /dev/null
+++ b/app/Views/modals/partials/_projectdashboard.php
@@ -0,0 +1,159 @@
+<div class="row">
+    <div class="col-md-6">
+        <div class="panel panel-bordered panel-primary panel-line">
+            <div class="panel-heading panel-heading-project">
+                <h3 class="">
+                    Projectgegevens
+                </h3>
+            </div>
+            <div class="panel-body panel-body-project">
+                <div class="row">
+                    <label class="col-md-4 col-form-label">omschrijving</label>
+                    <div class="col-md-8">
+                        <input type="text" class="form-control form-control-sm"
+                               data-bind="textInput:projectname, event:{keyup:saveProjectname}"/>
+                    </div>
+                    <div class="divider"></div>
+                    <label class="col-md-4 col-form-label">klant</label>
+                    <div class="col-md-8">
+                        <select class="form-control form-control-sm"
+                                data-bind="options:customers,
+                                    optionsText:'name',
+                                    optionsValue: 'id',
+                                    value:customerID,
+                                    disable:offers().length > 0,
+                                    optionsCaption:'selecteer klant',
+                                    event:{change:saveProject},
+                                    css:{'is-invalid': ! customerID()}"></select>
+                        <small class="invalid-feedback"
+                               data-bind="style:{display: ! customerID() ? 'block' : 'none'}">
+                            selecteer een klant
+                        </small>
+                    </div>
+                    <div class="divider"></div>
+                    <label class="col-md-4 col-form-label">projectleider</label>
+                    <div class="col-md-8">
+                        <select class="form-control form-control-sm"
+                                data-bind="options:users,
+                                optionsText:'fullname',
+                                optionsValue:'id',
+                                value:projectleaderID,
+                                optionsCaption:'projectleider',
+                                event:{change:saveProject}">
+                        </select>
+                    </div>
+                    <div class="divider"></div>
+                    <label class="col-md-4 col-form-label">begin project</label>
+                    <div class="col-md-8">
+                        <div class="input-group input-group-icon">
+                            <span class="input-group-addon">
+                                <i class="icon fa-calendar"></i>
+                            </span>
+                            <input type="text"
+                                   placeholder="start project"
+                                   class="form-control form-control-sm"
+                                   readonly
+                                   data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                   value:startdate,
+                                   event:{change:saveProject}">
+                        </div>
+                    </div>
+                    <div class="divider"></div>
+                    <label class="col-md-4 col-form-label">eind project</label>
+                    <div class="col-md-8">
+                        <div class="input-group input-group-icon">
+                            <span class="input-group-addon">
+                                <i class="icon fa-calendar"></i>
+                            </span>
+                            <input type="text"
+                                   placeholder="eind project"
+                                   class="form-control form-control-sm"
+                                   readonly
+                                   data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                              value:enddate,
+                                              event:{change:saveProject}">
+                        </div>
+                    </div>
+                    <div class="divider"></div>
+                    <label class="col-md-4 col-form-label">BTW percentage</label>
+                    <div class="col-md-3">
+                        <select class="form-control form-control-sm"
+                                data-bind="options:vats,
+                                            optionsText:'vatrate',
+                                            optionsValue:'id',
+                                            value:vat_id,
+                                            event:{change:$root.saveProject},
+                                            optionsCaption:'selecteer btw ...'"></select>
+                    </div>
+                    <div class="divider"></div>
+                    <label class="col-md-4 col-form-label">te besteden uren</label>
+                    <div class="col-md-8">
+                        <h4><span data-bind="text:(totalBudget() - totalHours())"></span></h4>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-6">
+        <div class="panel panel-bordered panel-primary panel-line">
+            <div class="panel-heading panel-heading-project">
+                <h3 class="">
+                    Financieel
+                </h3>
+            </div>
+            <div class="panel-body panel-body-project">
+                <label class="col-md-6 col-form-label">Eigen tarief omzet(excl.btw)</label>
+                <div class="col-md-6">
+                    <h4 class="form-control-label">
+                        <i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:ownRevenue"></span>
+                    </h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Overige kosten(excl.btw)</label>
+                <div class="col-md-6">
+                    <h4 class="form-control-label">
+                        <i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:otherRevenue"></span>
+                    </h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Kosten derden(excl.btw)</label>
+                <div class="col-md-6">
+                    <h4 class="form-control-label">
+                        <i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:costs"></span>
+                    </h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Totaal omzet(excl.btw)</label>
+                <div class="col-md-6">
+                    <h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:totalRevenues"></span></h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Totaal omzet(incl.btw)</label>
+                <div class="col-md-6">
+                    <h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:totalRevenuesIncl"></span></h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Totaal gefactureerd</label>
+                <div class="col-md-6">
+                    <h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:totalInvoiced"></span></h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Nog te factureren</label>
+                <div class="col-md-6">
+                    <h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:outstanding"></span></h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Totaal betaald</label>
+                <div class="col-md-6">
+                    <h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:payed"></span></h4>
+                </div>
+                <div class="divider"></div>
+                <label class="col-md-6 col-form-label">Gefactureerd niet betaald</label>
+                <div class="col-md-6">
+                    <h4><i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:outstandingInvoices"></span></h4>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/Views/modals/partials/_projectemployees.php b/app/Views/modals/partials/_projectemployees.php
new file mode 100644
index 0000000..8384d3a
--- /dev/null
+++ b/app/Views/modals/partials/_projectemployees.php
@@ -0,0 +1,82 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            project medewerkers
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header" width="40%">
+                naam
+            </th>
+            <th class="table-cyanish-header align-right" width="20%">
+                tarief
+            </th>
+            <th class="table-cyanish-header align-right" width="25%">
+                budget
+            </th>
+            <th class="table-cyanish-header" width="15%">
+                &nbsp;&nbsp;
+            </th>
+            </thead>
+            <tbody data-bind="foreach:projectEmployees">
+            <tr>
+                <td>
+                    <span data-bind="text:dbo.helpers.findArrayElement('id', 'fullname', employeeID(), $root.users()),
+                                    visible: ! inEdit()"></span>
+                    <select class="form-control form-control-sm"
+                            data-bind="
+                            options:$root.users,
+                            optionsText:'fullname',
+                            optionsValue:'id',
+                            value:employeeID,
+                            optionsCaption:'naam',
+                            event:{change:$root.changeProjectemployee},
+                            visible:inEdit"></select>
+                </td>
+                <td class="align-right">
+                    <span data-bind=" visible: ! inEdit()">
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:tarif"></span>
+                    </span class="align-right">
+                    <input type="text"
+                           class="form-control form-control-sm"
+                           paceholder="tarief"
+                           data-bind="textInput:tarif, visible:inEdit,
+                            event:{change:$root.saveProjectemployee,keyup:$root.validateNumber.bind($data, 'tarif')}"/>
+                </td>
+                <td class="align-right">
+                    <span data-bind="visible: ! inEdit()"><span data-bind="text:budget"></span> uur</span>
+                    <input type="text"
+                           class="form-control form-control-sm"
+                           placeholder="budget"
+                           data-bind="textInput:budget, visible:inEdit,
+                            event:{change:$root.saveProjectemployee,keyup:$root.validateNumber.bind($data, 'budget')}"/>
+                </td>
+                <td>
+                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjectemployee"></i>
+                    <i class="icon fa-trash redish pointer" title="verwijder"
+                       data-bind="click:$root.removeProjectemployee"></i>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr>
+                <th class="table-cyanish-header align-right" colspan="2">&nbsp;</th>
+                <th class="table-cyanish-header align-right">
+                    <span data-bind="text:totalBudget"></span> uur
+                </th>
+                <th  class="table-cyanish-header align-right"></th>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <button class="btn btn-primary btn-round btn-sm" data-bind="click:addProjectemployee">
+                        nieuwe project medewerker
+                    </button>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_projectfiles.php b/app/Views/modals/partials/_projectfiles.php
new file mode 100644
index 0000000..e2131e9
--- /dev/null
+++ b/app/Views/modals/partials/_projectfiles.php
@@ -0,0 +1,37 @@
+<div class="col-md-8">
+    <table class="table table-condensed">
+        <thead>
+        <tr>
+            <th>door</th>
+            <th>datum</th>
+            <th>bestandsnaam</th>
+            <th>&nbsp;</th>
+        </tr>
+        </thead>
+        <tbody data-bind="foreach:documents">
+        <tr>
+            <td>
+                <span data-bind="text:fullname"></span>
+            </td>
+            <td>
+                <span data-bind="text:uploaddate"></span>
+            </td>
+            <td>
+                <span data-bind="text:originalname"></span>
+            </td>
+            <td>
+                <i class="icon fa-download pointer" data-bind="click:$root.downloadDocument"></i>
+                <i class="icon fa-trash redish pointer" data-bind="click:$root.removeFile"></i>
+            </td>
+        </tr>
+        </tbody>
+        <tfoot>
+        <tr></tr>
+        </tfoot>
+    </table>
+    <div class="upload-btn-wrapper" data-bind="">
+        <button class="upload-btn">voeg bestand toe</button>
+        <input type="file" name="userfile" data-bind="event:{change:addDocument}" id="fileinput"/>
+    </div>
+    <hr/>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_projectoffers.php b/app/Views/modals/partials/_projectoffers.php
new file mode 100644
index 0000000..f3c148d
--- /dev/null
+++ b/app/Views/modals/partials/_projectoffers.php
@@ -0,0 +1,49 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+            offerte
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header">
+                nummer
+            </th>
+            <th class="table-cyanish-header">
+                start
+            </th>
+            <th class="table-cyanish-header align-right">
+                eigen omzet (excl btw)
+            </th>
+            <th class="table-cyanish-header align-right">
+                overig omzet (excl btw)
+            </th>
+            <th class="table-cyanish-header">
+                &nbsp;
+            </th>
+            </thead>
+            <tbody data-bind="foreach:offers">
+            <tr>
+                <td>
+                    <span data-bind="text:offernumber"></span>
+                </td>
+                <td>
+                    <span data-bind="text:startdate"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:dbo.helpers.numberWithPoints(own_revenue.toFixed(0))"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:dbo.helpers.numberWithPoints(other_revenue.toFixed(0))"></span>
+                </td>
+<!--                <td>-->
+<!--                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>-->
+<!--                    <i class="icon fa-trash redish pointer" title="verwijder"-->
+<!--                       data-bind="click:$root.removeOffer"></i>-->
+<!--                </td>-->
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/partials/_reservations.php b/app/Views/modals/partials/_reservations.php
new file mode 100644
index 0000000..502dbfa
--- /dev/null
+++ b/app/Views/modals/partials/_reservations.php
@@ -0,0 +1,68 @@
+<div class="panel panel-bordered panel-primary panel-line">
+    <div class="panel-heading panel-heading-project">
+        <h3 class="">
+			gereserveerd op spaarrekening (incl. btw)
+        </h3>
+    </div>
+    <div class="panel-body panel-body-project">
+        <table class="table table-sm">
+            <thead>
+            <th class="table-cyanish-header align-right" width="40%">
+                bedrag
+            </th>
+            <th class="table-cyanish-header" width="40%">
+                klant
+            </th>
+            <th class="table-cyanish-header" width="20%">&nbsp;</th>
+            </thead>
+            <tbody data-bind="foreach:reservations">
+            <tr>
+                <td class="align-right" data-bind="css:{'red-line':invalidReservation()}">
+                    <span data-bind="visible:!inEdit()">
+                        <i class="icon fa-euro"></i>
+                        <span data-bind="text:dbo.helpers.numberWithPoints(reservationamount())"></span>
+                    </span>
+                    <input type="text"
+                           class="form-control form-control-sm align-right"
+                           paceholder="bedrag"
+                           data-bind="textInput:reservationamount, visible:inEdit,
+                            event:{change:$root.saveReservation,keyup:$root.validateNumber.bind($data, 'reservationamount')}"/>
+                </td>
+                <td data-bind="css:{'red-line':invalidReservation()}">
+                    <span data-bind="text:dbo.helpers.findArrayElement('id', 'contactperson', external_id(), $root.externals()),
+                                    visible:! inEdit()"></span>
+                    <select class="form-control"
+                            data-bind="
+                            options:$root.externals,
+                            optionsText:'contactperson',
+                            optionsValue:'id',
+                            value:external_id,
+                            optionsCaption:'selecteer...',
+                            visible: inEdit(),
+                            event:{change:$root.saveReservation}"
+                </td>
+                <td data-bind="css:{'red-line':invalidReservation()}">
+                    <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editReservation"></i>
+                    <i class="icon fa-trash redish pointer" title="verwijder"
+                       data-bind="click:$root.removeReservation"></i>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+			<tr>
+				<th class="align-right table-cyanish-header">
+					<span data-bind="text:dbo.helpers.numberWithPoints(totalReservationamount())"></span>
+				</th>
+				<th class="table-cyanish-header" colspan="2"></th>
+			</tr>
+            <tr>
+                <th colspan="4">
+                    <button class="btn btn-primary btn-round btn-sm" data-bind="click:addReservation">
+                        nieuwe reservering
+                    </button>
+                </th>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
diff --git a/app/Views/modals/project_modal.php b/app/Views/modals/project_modal.php
new file mode 100644
index 0000000..dbd651f
--- /dev/null
+++ b/app/Views/modals/project_modal.php
@@ -0,0 +1,84 @@
+<div class="project-page" id="project-modal" data-bind="fadeVisible:showProject()">
+
+    <div class="container" style="margin-top:15px;padding-top:15px;">
+        <div class="nav-tabs-horizontal nav-tabs-animate nav-tab-reverse">
+            <ul class="nav nav-tabs nav-tabs-solid">
+                <li class="nav-item"
+                    role="presentation"
+                    data-bind="css:{'active':activeTab()=='DASHBOARD'},
+                                click:setActiveTab.bind($data,'DASHBOARD')">
+                    <a>
+                        <i class="icon fa-hacker-news"></i>
+                        algemeen</a>
+                </li>
+                <li class="nav-item"
+                    role="presentation"
+                    data-bind="css:{'active':activeTab()=='FINANCIAL'},
+                                click:setActiveTab.bind($data,'FINANCIAL')">
+                    <a>
+                        <i class="icon fa-euro"></i>
+                        financieel</a>
+                </li>
+                <li class="nav-item"
+                    role="presentation"
+                    data-bind="css:{'active':activeTab()=='EMPLOYEES'},
+                                click:setActiveTab.bind($data,'EMPLOYEES')">
+                    <a>
+                        <i class="icon fa-user-circle"></i>
+                        medewerkers</a>
+                </li>
+                <li class="nav-item"
+                    role="presentation"
+                    data-bind="css:{'active':activeTab()=='FILES'},
+                                click:setActiveTab.bind($data,'FILES')">
+                    <a>
+                        <i class="icon fa-files"></i>
+                        bestanden en opmerkingen</a>
+                </li>
+            </ul>
+            <div style="position:relative; float:right;">
+                <h3 style="position:absolute;top:-65px; right:30px; width:350px;">
+                    Projectnummer: <span data-bind="text:projectnumber"></span>
+                    <i class="icon fa-refresh pointer blueish" title="ververs" data-bind="click:refreshProject"></i>
+                </h3>
+                <button class="btn btn-danger" data-bind="click:closeProject"
+                        style="position:absolute;right:0px;top:-50px">
+                    sluit
+                </button>
+            </div>
+            <div id="project-scroller">
+                <div class="tab-pane animation-slide-top"
+                     id="dashboard"
+                     data-bind="visible:activeTab()=='DASHBOARD'">
+                    <?= view('modals/partials/_dashboard') ?>
+                </div>
+                <div class="tab-pane animation-slide-top"
+                     id="financial"
+                     data-bind="visible:activeTab()=='FINANCIAL'">
+                    <?= view('modals/partials/_financials') ?>
+                </div>
+                <div class="tab-pane animation-slide-top"
+                     id="employees"
+                     data-bind="visible:activeTab()=='EMPLOYEES'">
+                    <div class="row" data-bind="fadeVisible:customerID()">
+                        <div class="col-md-5" data-bind="fadeVisible:customerID()">
+                            <?= view('modals/partials/_projectemployees') ?>
+                        </div>
+                        <div class="col-md-7">
+                            <?= view('modals/partials/_hourTotals') ?>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="tab-pane animation-slide-top"
+                     id="files"
+                     data-bind="visible:activeTab()=='FILES'">
+                    <div class="row" data-bind="fadeVisible:customerID()">
+                        <?= view('modals/partials/_projectfiles') ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
\ No newline at end of file
diff --git a/app/Views/modals/user_modal.php b/app/Views/modals/user_modal.php
new file mode 100644
index 0000000..f262df6
--- /dev/null
+++ b/app/Views/modals/user_modal.php
@@ -0,0 +1,159 @@
+<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="user-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">toevoegen / wijzigen medewerker
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                </h5>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div role="form" class="form-horizontal">
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    voornaam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-user"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="voornaam"
+                                               class="form-control"
+                                               data-bind="textInput:firstname,
+                                                            css:{'is-invalid':firstnameInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: firstnameInvalid() ? 'block' : 'none'}">
+                                        voer een voornaam in<span data-bind="text:firstnameInvalid"></span>
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    tussenvoegsel
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-user"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="tussenvoegsel"
+                                               class="form-control"
+                                               data-bind="textInput:middlename">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    achternaam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-user"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="achternaam"
+                                               class="form-control"
+                                               data-bind="textInput:lastname,
+                                                            css:{'is-invalid':lastnameInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: lastnameInvalid() ? 'block' : 'none'}">
+                                        voer een achternaam in<span data-bind="text:lastnameInvalid"></span>
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    gebruikersnaam
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-user"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="gebruikersnaam"
+                                               class="form-control"
+                                               data-bind="textInput:username,
+                                                            css:{'is-invalid':usernameInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: usernameInvalid() ? 'block' : 'none'}">
+                                        voer een gebruikernaam in<span data-bind="text:username"></span>
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    email
+                                </label>
+                                <div class="col-md-9">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-envelope"></i>
+                                        </span>
+                                        <input type="email"
+                                               placeholder="email"
+                                               class="form-control"
+                                               data-bind="textInput:email,
+                                                            css:{'is-invalid':emailInvalid}">
+                                    </div>
+                                    <small class="invalid-feedback"
+                                           data-bind="style:{display: emailInvalid() ? 'block' : 'none'}">
+                                        email ongeldig<span data-bind="text:emailInvalid"></span>
+                                    </small>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-md-3 form-control-label">
+                                    uurtarief
+                                </label>
+                                <div class="col-md-4">
+                                    <div class="input-group input-group-icon">
+                                        <span class="input-group-addon">
+                                            <i class="icon fa-euro"></i>
+                                        </span>
+                                        <input type="text"
+                                               placeholder="uurtarief"
+                                               class="form-control align-right"
+                                               data-bind="textInput:hourlyRate,
+                                                            event:{keyup:validateNumber.bind($data, 'hourlyRate')}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <div class="col-md-3">&nbsp;</div>
+                                <!-- ko foreach:roles -->
+                                <div class="radio-inline">
+                                    <i class="icon fa-circle-o blueish"
+                                       style="cursor:pointer;"
+                                       data-bind="visible:$root.role() != rolelevel,
+                                                    click:$root.setRole"></i>
+                                    <i class="icon fa-check-circle-o greenish"
+                                       data-bind="visible:$root.role() == rolelevel"></i>
+                                    <label data-bind="text:rolename">
+                                    </label>
+                                </div>
+                                <!-- /ko -->
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-success"
+                        data-bind="visible:formValid(), click:saveUser">opslaan</button>
+                <button type="button" class="btn btn-warning" data-dismiss="modal">annuleren</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/pages/authorisation_view.php b/app/Views/pages/authorisation_view.php
new file mode 100644
index 0000000..33a40f3
--- /dev/null
+++ b/app/Views/pages/authorisation_view.php
@@ -0,0 +1,35 @@
+<div class="AUTHORISATION">
+    <div class="row">
+        <div class="col-xs-12">
+            <table class="table table-condensed">
+                <thead>
+                <tr>
+                    <th>
+                        pagina
+                    </th>
+                    <th v-for="(role, roleIndex) in roles" align="center">
+                        <span>{{ role.rolename }}</span>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="(page, pageIndex) in pages">
+                        <td>
+                            <span v-bind:class="{'main-menu': page.typePage == 'MAIN', 'sub-page': page.typePage != 'MAIN'}" >
+                                {{ page.pagename }}
+                            </span>
+                        </td>
+                        <td v-for="(accessPage, roleIndex) in page.accessPages" align="center">
+                            <i v-if="accessPage.access"
+                               v-on:click="toggleAccess(pageIndex, roleIndex)"
+                               class="icon fa-check pointer"></i>
+                            <i v-if="! accessPage.access"
+                               v-on:click="toggleAccess(pageIndex, roleIndex)"
+                               class="icon fa-square-o pointer"></i>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/pages/backupdb_view.php b/app/Views/pages/backupdb_view.php
new file mode 100644
index 0000000..ef08293
--- /dev/null
+++ b/app/Views/pages/backupdb_view.php
@@ -0,0 +1,7 @@
+<div class="row">
+    <div class="col-xs-offset-3 col-xs-6">
+        <div class="jumbotron">
+            <h2 style="text-align: center">Backup DBOIS</h2>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/pages/beheer/twofactor/settings_view.php b/app/Views/pages/beheer/twofactor/settings_view.php
new file mode 100644
index 0000000..266095d
--- /dev/null
+++ b/app/Views/pages/beheer/twofactor/settings_view.php
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Tweefactorauthenticatie Instellingen - DBOIS</title>
+
+    <link rel="icon" href="/css/images/dbo-01-80x80.png" type="image/png">
+    <link rel="stylesheet" href="/css/vendor/bootstrap.min.css?v=<?=$version?>">
+    <link rel="stylesheet" href="/css/vendor/bootstrap-extend.css?v=<?=$version?>">
+    <link rel="stylesheet" href="/css/vendor/site.min.css?v=<?=$version?>">
+
+    <style>
+        .twofactor-container {
+            max-width: 800px;
+            margin: 50px auto;
+            padding: 20px;
+        }
+        .method-card {
+            border: 2px solid #ddd;
+            border-radius: 8px;
+            padding: 20px;
+            margin: 15px 0;
+            cursor: pointer;
+            transition: all 0.3s;
+        }
+        .method-card:hover {
+            border-color: #348eda;
+            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+        }
+        .method-card.active {
+            border-color: #68b90f;
+            background-color: #f0f8ff;
+        }
+        .qr-code-container {
+            text-align: center;
+            margin: 20px 0;
+        }
+        .qr-code-container img {
+            max-width: 250px;
+        }
+        .verification-code-input {
+            text-align: center;
+            font-size: 24px;
+            letter-spacing: 5px;
+            font-weight: bold;
+        }
+        .secret-code {
+            background-color: #f5f5f5;
+            padding: 10px;
+            font-family: monospace;
+            word-break: break-all;
+            border-radius: 4px;
+        }
+        .alert {
+            margin: 15px 0;
+        }
+    </style>
+</head>
+<body>
+
+<div class="twofactor-container">
+    <div class="panel">
+        <div class="panel-heading">
+            <h3 class="panel-title">Tweefactorauthenticatie Instellingen</h3>
+        </div>
+        <div class="panel-body">
+
+            <!-- Current Status -->
+            <div class="alert alert-info" data-bind="visible: !enabled()">
+                <strong>Tweefactorauthenticatie is momenteel uitgeschakeld.</strong>
+                <p>Schakel 2FA in om een extra beveiligingslaag aan uw account toe te voegen.</p>
+            </div>
+
+            <div class="alert alert-success" data-bind="visible: enabled">
+                <strong>Tweefactorauthenticatie is ingeschakeld</strong>
+                <p>Huidige methode: <span data-bind="text: currentMethod"></span></p>
+            </div>
+
+            <!-- Enable/Disable Section -->
+            <div data-bind="visible: !enabled()">
+                <h4>Kies een 2FA methode:</h4>
+
+                <div class="method-card" data-bind="click: function() { selectMethod('email'); }, css: { active: selectedMethod() === 'email' }">
+                    <h5><i class="icon wb-envelope" aria-hidden="true"></i> E-mail</h5>
+                    <p>Ontvang een eenmalige code via e-mail bij elke inlogpoging.</p>
+                </div>
+
+                <div class="method-card" data-bind="click: function() { selectMethod('authenticator'); }, css: { active: selectedMethod() === 'authenticator' }">
+                    <h5><i class="icon wb-mobile" aria-hidden="true"></i> Google Authenticator</h5>
+                    <p>Gebruik een authenticator app zoals Google Authenticator of Authy.</p>
+                </div>
+
+                <button class="btn btn-primary btn-lg" data-bind="click: enableTwoFactor, enable: selectedMethod">
+                    2FA Inschakelen
+                </button>
+            </div>
+
+            <!-- Authenticator Setup -->
+            <div data-bind="visible: showAuthenticatorSetup">
+                <hr>
+                <h4>Google Authenticator Instellen</h4>
+
+                <div class="qr-code-container">
+                    <p>Scan deze QR-code met uw authenticator app:</p>
+                    <img data-bind="attr: { src: qrCodeUrl }" alt="QR Code">
+
+                    <p class="mt-20">Of voer deze code handmatig in:</p>
+                    <div class="secret-code" data-bind="text: secret"></div>
+                </div>
+
+                <div class="form-group">
+                    <label>Voer de 6-cijferige code in om te verifiëren:</label>
+                    <input type="text"
+                           class="form-control verification-code-input"
+                           maxlength="6"
+                           data-bind="textInput: verificationCode, event: { keyup: handleVerificationKeyup }">
+                </div>
+
+                <button class="btn btn-success" data-bind="click: verifyAuthenticatorSetup, enable: verificationCode().length === 6">
+                    Verifiëren
+                </button>
+            </div>
+
+            <!-- Change Method -->
+            <div data-bind="visible: enabled() && !showAuthenticatorSetup()">
+                <hr>
+                <h4>Methode Wijzigen</h4>
+
+                <div class="method-card" data-bind="click: function() { selectMethod('email'); }, css: { active: changeToMethod() === 'email' }">
+                    <h5><i class="icon wb-envelope" aria-hidden="true"></i> E-mail</h5>
+                    <p>Ontvang een eenmalige code via e-mail bij elke inlogpoging.</p>
+                </div>
+
+                <div class="method-card" data-bind="click: function() { selectMethod('authenticator'); }, css: { active: changeToMethod() === 'authenticator' }">
+                    <h5><i class="icon wb-mobile" aria-hidden="true"></i> Google Authenticator</h5>
+                    <p>Gebruik een authenticator app zoals Google Authenticator of Authy.</p>
+                </div>
+
+                <button class="btn btn-primary" data-bind="click: changeMethod, enable: changeToMethod() !== currentMethod()">
+                    Methode Wijzigen
+                </button>
+
+                <hr>
+
+                <button class="btn btn-danger" data-bind="click: disableTwoFactor">
+                    2FA Uitschakelen
+                </button>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="text-center">
+        <a href="/" class="btn btn-default">Terug naar Dashboard</a>
+    </div>
+</div>
+
+<script src="/js/vendor/jquery/jquery.js?v=<?=$version?>"></script>
+<script src="/js/vendor/bootstrap/bootstrap.js?v=<?=$version?>"></script>
+<script src="/js/vendor/Knockout.min.js?v=<?=$version?>"></script>
+
+<script>
+function TwoFactorViewModel() {
+    var self = this;
+
+    self.enabled = ko.observable(<?= $user->two_factor_enabled === 'T' ? 'true' : 'false' ?>);
+    self.currentMethod = ko.observable('<?= $user->two_factor_method ?>');
+    self.selectedMethod = ko.observable(null);
+    self.changeToMethod = ko.observable(null);
+    self.showAuthenticatorSetup = ko.observable(false);
+    self.qrCodeUrl = ko.observable('');
+    self.secret = ko.observable('');
+    self.verificationCode = ko.observable('');
+
+    self.selectMethod = function(method) {
+        if (!self.enabled()) {
+            self.selectedMethod(method);
+        } else {
+            self.changeToMethod(method);
+        }
+    };
+
+    self.enableTwoFactor = function() {
+        if (!self.selectedMethod()) {
+            alert('Kies eerst een methode');
+            return;
+        }
+
+        $.ajax({
+            url: '/beheer/TwoFactorController/enable',
+            method: 'POST',
+            data: { method: self.selectedMethod() },
+            success: function(response) {
+                if (response.success) {
+                    if (response.method === 'authenticator') {
+                        self.qrCodeUrl(response.qrCodeUrl);
+                        self.secret(response.secret);
+                        self.showAuthenticatorSetup(true);
+                    } else {
+                        alert(response.message);
+                        location.reload();
+                    }
+                } else {
+                    alert(response.message);
+                }
+            }
+        });
+    };
+
+    self.verifyAuthenticatorSetup = function() {
+        $.ajax({
+            url: '/beheer/TwoFactorController/verifySetup',
+            method: 'POST',
+            data: { code: self.verificationCode() },
+            success: function(response) {
+                if (response.success) {
+                    alert('Google Authenticator succesvol ingesteld!');
+                    location.reload();
+                } else {
+                    alert(response.message);
+                }
+            }
+        });
+    };
+
+    self.disableTwoFactor = function() {
+        if (!confirm('Weet u zeker dat u 2FA wilt uitschakelen?')) {
+            return;
+        }
+
+        $.ajax({
+            url: '/beheer/TwoFactorController/disable',
+            method: 'POST',
+            success: function(response) {
+                if (response.success) {
+                    alert(response.message);
+                    location.reload();
+                } else {
+                    alert(response.message);
+                }
+            }
+        });
+    };
+
+    self.changeMethod = function() {
+        if (!self.changeToMethod()) {
+            alert('Kies eerst een methode');
+            return;
+        }
+
+        $.ajax({
+            url: '/beheer/TwoFactorController/changeMethod',
+            method: 'POST',
+            data: { method: self.changeToMethod() },
+            success: function(response) {
+                if (response.success) {
+                    if (response.method === 'authenticator') {
+                        self.enabled(false);
+                        self.selectedMethod('authenticator');
+                        self.qrCodeUrl(response.qrCodeUrl);
+                        self.secret(response.secret);
+                        self.showAuthenticatorSetup(true);
+                    } else {
+                        alert(response.message);
+                        location.reload();
+                    }
+                } else {
+                    alert(response.message);
+                }
+            }
+        });
+    };
+
+    self.handleVerificationKeyup = function(data, event) {
+        // Auto-verify when 6 digits entered
+        if (self.verificationCode().length === 6 && event.keyCode === 13) {
+            self.verifyAuthenticatorSetup();
+        }
+        return true;
+    };
+}
+
+$(document).ready(function() {
+    ko.applyBindings(new TwoFactorViewModel());
+});
+</script>
+
+</body>
+</html>
diff --git a/app/Views/pages/content.php b/app/Views/pages/content.php
new file mode 100644
index 0000000..a89c1f1
--- /dev/null
+++ b/app/Views/pages/content.php
@@ -0,0 +1,3 @@
+<div class="page" id="<?= $pageurl ?>">
+    <?= view('pages/' . strtolower($pageurl) . '_view') ?>
+</div>
\ No newline at end of file
diff --git a/app/Views/pages/customers_view.php b/app/Views/pages/customers_view.php
new file mode 100644
index 0000000..1e4d2e5
--- /dev/null
+++ b/app/Views/pages/customers_view.php
@@ -0,0 +1,62 @@
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th class="table-tealish-header">naam</th>
+        <th class="table-tealish-header">adres</th>
+        <th class="table-tealish-header">plaats</th>
+        <th class="table-tealish-header">contactpersoon</th>
+        <th class="table-tealish-header">email</th>
+        <th class="table-tealish-header">&nbsp;</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:customers">
+    <tr>
+        <td><span data-bind="text:name"></span></td>
+        <td><span data-bind="text:address"></span></td>
+        <td><span data-bind="text:postcode + ' ' + place"></span></td>
+        <td><span data-bind="text:contactperson"</td>
+        <td><span data-bind="text:email"></span></td>
+        <td>
+            <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editCustomer"></i>
+            <!-- ko if:archive == 'F' -->
+            <i class="icon fa-archive pointer" title="archiveer"
+               data-bind="click:$root.archiveCustomer"></i>
+            <!-- /ko -->
+            <!-- ko if:archive != 'F' -->
+            <i class="icon fa-minus-circle redish pointer" title="archiveer"
+               data-bind="click:$root.archiveCustomer"></i>
+            <!-- /ko -->
+            <i class="icon fa-trash redish pointer" title="verwijder"
+               data-bind="click:$root.removeCustomer"></i>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+    <tr>
+        <td colspan="4" class="">
+            <button class="btn btn-primary btn-round btn-sm" data-bind="click:newCustomer">
+                nieuwe opdrachtgever
+            </button>
+        </td>
+        <td colspan="2" class="">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </td>
+    </tr>
+    </tfoot>
+
+</table>
\ No newline at end of file
diff --git a/app/Views/pages/dashboard_view.php b/app/Views/pages/dashboard_view.php
new file mode 100644
index 0000000..9d185a9
--- /dev/null
+++ b/app/Views/pages/dashboard_view.php
@@ -0,0 +1,211 @@
+<div class="row">
+	<?php if(in_array(ROLE, [2] )): ?>
+	<div class="db-panel">
+		<div class="conceal-panel db-panel-success" data-bind="click:hideConceals">
+			<h3>Onderhanden werkpositie</h3>
+			<img src="css/images/progress.svg" alt="OWHP" />
+		</div>
+		<div class="db-panel-holder db-panel-success">
+			<div class="db-panel-heading" data-bind="click:showConceals">
+				<h3 class="db-panel-title">
+					Onderhanden werkpositie
+				</h3>
+			</div>
+			<div class="db-panel-body" data-bind="width:owp">
+				<br>
+				<h4>
+					<span class="db-panel-label">Onderhanden werkpositie huidig jaar:</span>
+					<span class="db-panel-data"><strong data-bind="text:owpThisYear"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">Onderhanden werkpositie volgend jaar:</span>
+					<span class="db-panel-data"><strong data-bind="text:owpNextYear"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">Totaal:</span>
+					<span class="db-panel-data"><strong data-bind="text:owpTotal"></strong></span>
+				</h4>
+			</div>
+		</div>
+	</div>
+	<div class="db-panel">
+		<div class="conceal-panel db-panel-warning" data-bind="click:hideConceals">
+			<h3>Omzet</h3>
+			<img src="css/images/revenue.svg" alt="OMZET>" />
+		</div>
+		<div class="db-panel-holder db-panel-warning">
+			<div class="db-panel-heading" data-bind="click:showConceals">
+				<h3 class="db-panel-title">
+					Omzet
+				</h3>
+			</div>
+			<div class="db-panel-body" data-bind="width:owp">
+				<br>
+				<h4>
+					<span class="db-panel-label">Omzet totaal gerealiseerd lopend jaar:</span>
+					<span class="db-panel-data"><strong data-bind="text:revenuesThisYear"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">
+						Minimum omzet lopend jaar:
+					</span>
+					<span class="dashboard-info"
+						  data-bind="event: {
+						  				mouseover: enableDetails.bind($data, 'toolTip1'),
+						  				mouseout: disableDetails.bind($data, 'toolTip1') }">
+						<label>?</label>
+						<div data-bind="if:toolTip1" class="my-tooltip">
+							<p>Omzet totaal gerealiseerd lopend jaar + Onderhanden werkpositie lopend jaar.</p>
+						</div>
+					</span>
+					<span class="db-panel-data"><strong data-bind="text:minimumRevenues"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">
+						Verwachte omzet komende 12 maanden:
+					</span>
+					<span class="dashboard-info"
+						  data-bind="event: {
+						  				mouseover: enableDetails.bind($data, 'toolTip3'),
+						  				mouseout: disableDetails.bind($data, 'toolTip3') }">
+						<label>?</label>
+						<div data-bind="if:toolTip3" class="my-tooltip">
+							<p> Onderhanden werkpositie totaal/40%.</p>
+						</div>
+					</span>
+					<span class="db-panel-data">
+						<strong data-bind="text:revenuesNextyear"></strong>
+					</span>
+				</h4>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="row">
+	<div class="db-panel">
+		<div class="conceal-panel db-panel-info" data-bind="click:hideConceals">
+			<h3>Facturatie</h3>
+			<img src="css/images/bill.svg" alt="FACTURATIE" />
+		</div>
+		<div class="db-panel-holder db-panel-info">
+			<div class="db-panel-heading">
+				<h3 class="db-panel-title" data-bind="click:showConceals">
+					Facturatie
+					<span style="margin-left:10px;display:none"
+						  class="glyphicon glyphicon-question-sign pointer"
+							data-bind="click:invoiceOverview"></span>
+					<div class="facturation-overview-holder">
+						<!-- ko if:showInvoiceOverview -->
+						<div class="facturation-overview" data-bind="click:invoiceOverview">
+							<table class="table">
+								<thead>
+								<tr>
+									<th>project</th>
+									<th>gefactureerd</th>
+									<th>betaald</th>
+									<th>te betalen</th>
+								</tr>
+								</thead>
+								<tbody data-bind="foreach:billingOverview">
+								<tr>
+									<td>
+										<span data-bind="text:project"></span>
+									</td>
+									<td>
+										<span data-bind="text:invoiced"></span>
+									</td>
+									<td>
+										<span data-bind="text:payedcosts"></span>
+									</td>
+									<td>
+										<span data-bind="text:openCosts"></span>
+									</td>
+								</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- /ko -->
+					</div>
+				</h3>
+			</div>
+			<div class="db-panel-body" data-bind="width:owp">
+				<br>
+				<h4>
+					<span class="db-panel-label">Verstuurde facturen lopende jaar (incl btw):</span>
+					<span class="db-panel-data">
+						<strong data-bind="text:invoiced">
+						</strong>
+					</span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">Openstaande facturen (incl btw):</span>
+					<span class="db-panel-data">
+						<strong data-bind="text:openInvoices">
+						</strong>
+					</span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">Nog te factureren totaal (incl btw):</span>
+					<span class="db-panel-data"><strong data-bind="text:toInvoice"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">Betaalde facturen lopende jaar (incl btw):</span>
+					<span class="db-panel-data"><strong data-bind="text:payments"></strong></span>
+				</h4>
+			</div>
+		</div>
+	</div>
+	<div class="db-panel">
+		<div class="conceal-panel db-panel-danger" data-bind="click:hideConceals">
+			<h3>Resultaat</h3>
+			<img src="css/images/seo-and-web.svg" alt="RESULTAAT" />
+		</div>
+		<div class="db-panel-holder db-panel-danger">
+			<div class="db-panel-heading" data-bind="click:showConceals">
+				<h3 class="db-panel-title">
+					Resultaat
+				</h3>
+			</div>
+			<div class="db-panel-body" data-bind="width:owp">
+				<br>
+				<h4>
+					<span class="db-panel-label">Kosten derden (incl btw):</span>
+					<span class="db-panel-data"><strong data-bind="text:openCosts"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">
+						Netto kasstroom (excl btw):
+					</span>
+					<span class="dashboard-info"
+						  data-bind="event: {
+						  				mouseover: enableDetails.bind($data, 'toolTip2'),
+						  				mouseout: disableDetails.bind($data, 'toolTip2') }">
+						<label>?</label>
+						<div data-bind="if:toolTip2" class="my-tooltip">
+							<p>Openstaande facturen + nog te factureren totaal - kosten derden.</p>
+						</div>
+					</span>
+					<span class="db-panel-data"><strong data-bind="text:revenues"></strong></span>
+				</h4>
+				<h4>
+					<span class="db-panel-label">(eigen) omzet * kans (excl btw):</span>
+					<span class="db-panel-data"><strong data-bind="text:totalChance"></strong></span>
+				</h4>
+<!--				<h4>-->
+<!--					<span class="db-panel-label">Omzet lopend jaar (excl btw):</span>-->
+<!--					<span class="db-panel-data"><strong data-bind="text:revenueCurrentYear"></strong></span>-->
+<!--				</h4>-->
+			</div>
+		</div>
+	</div>
+	<?php else: ?>
+		<div class="row">
+			<div class="col-lg-offset-3 col-lg-6">
+				<div class="jumbotron" style="text-align:center">
+					<h3>De Beleidsonderszoekers</h3>
+				</div>
+			</div>
+		</div>
+	<?php endif; ?>
+</div>
+
diff --git a/app/Views/pages/employeehours_view.php b/app/Views/pages/employeehours_view.php
new file mode 100644
index 0000000..af54ed6
--- /dev/null
+++ b/app/Views/pages/employeehours_view.php
@@ -0,0 +1,107 @@
+<div class="row">
+    <div class="col-md-2">
+        <select class="form-control form-control-sm"
+                data-bind="options:years,
+                                optionsText:'year',
+                                optionsValue:'year',
+                                value:selectedYear,
+                                event:{change:refreshEmployeehours}"></select>
+    </div>
+    <div class="col-md-2">
+        <select class="form-control form-control-sm"
+                data-bind="options:months,
+                                optionsText:'month',
+                                optionsValue:'monthID',
+                                value:selectedMonth,
+                                event:{change:refreshEmployeehours}"></select>
+    </div>
+    <div class="col-md-2">
+        <select class="form-control form-control-sm"
+                data-bind="options:employees,
+                                optionsText:'fullname',
+                                optionsValue:'id',
+                                value:$root.selectedEmployeeID,
+                                event:{change:refreshEmployeehours}"></select>
+    </div>
+</div>
+<br/>
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th class="table-tealish-header" width="15%">datum</th>
+        <th class="table-tealish-header" width="35%">soort uren</th>
+        <th class="table-tealish-header" width="35%">project</th>
+        <th class="table-tealish-header" width="10%" style="min-width:100px;">uren</th>
+        <th class="table-tealish-header" width="5%">&nbsp;</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:employeehours">
+    <tr>
+        <td data-bind="css:{'red-line': dirty}">
+            <input class="form-control form-control-sm"
+                   data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
+                                            enable:archive() == 'F',
+                                            value:hourdate,
+                                            event:{change:$root.saveEmployeehours}"
+        </td>
+        <td data-bind="css:{'red-line': dirty}">
+            <select class="form-control form-control-sm"
+                    data-bind="options:$root.hourtypes,
+                                            optionsText:'description',
+                                            optionsValue:'id',
+                                            value:hourtype_id,
+                                            enable:archive() == 'F',
+                                            optionsCaption:'selecteer...',
+                                            event:{change:$root.saveEmployeehours}"></select>
+        </td>
+        <td data-bind="css:{'red-line': dirty}">
+			<!-- ko if: archive() == 'T' -->
+				<div data-bind="text:projectname" class="fake-input"></div>
+			<!-- /ko -->
+            <!-- ko if: hourType() == 'PROJECTS' &&  archive() == 'F' -->
+            <select class="form-control form-control-sm"
+                    data-bind="options:$root.projects,
+                                optionsText:'projectFull',
+                                optionsValue:'projectID',
+                                value:projectID,
+                                optionsCaption:'selecteer...',
+                                event:{change:$root.saveEmployeehours}"></select>
+            <!-- /ko -->
+            <!-- ko if: hourType() == 'OFFERS' &&  archive() == 'F' -->
+            <select class="form-control form-control-sm"
+                    data-bind="options:$root.offersWithoutProject,
+                                optionsText:'fulloffer',
+                                optionsValue:'id',
+                                value:projectID,
+                                optionsCaption:'selecteer...',
+                                event:{change:$root.saveEmployeehours}"></select>
+            <!-- /ko -->
+        </td>
+        <td class="align-right" data-bind="css:{'red-line': dirty}">
+            <input type="number"
+                   class="form-control form-control-sm align-right"
+                   paceholder="uren"
+                   data-bind="textInput:hours,
+                   			  enable:canFillInHours && archive() == 'F',
+                              event:{keyup:$root.saveDelayedEmployeehours,
+                              			change: $root.saveDelayedEmployeehours}"/>
+        </td>
+        <td data-bind="css:{'red-line': dirty}">
+<!--            <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editEmployeehour"></i>-->
+            <i class="icon fa-trash redish pointer" title="verwijder"
+               data-bind="click:$root.removeEmployeehour"></i>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+    <tr>
+        <td colspan="3">
+            <button class="btn btn-primary btn-round btn-sm" data-bind="click:newEmployeehour">
+                nieuwe uren
+            </button>
+        </td>
+        </td>
+    </tr>
+    </tfoot>
+
+</table>
diff --git a/app/Views/pages/employeehoursreport_view.php b/app/Views/pages/employeehoursreport_view.php
new file mode 100644
index 0000000..88d7cbe
--- /dev/null
+++ b/app/Views/pages/employeehoursreport_view.php
@@ -0,0 +1,31 @@
+<div id="EMPLOYEEHOURSREPORT">
+
+    <div class="row">
+        <div class="col-md-1">
+            <label>jaar</label>
+        </div>
+        <div class="col-md-2">
+            <input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}">
+            <div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="nav-tabs-horizontal">
+                <ul class="nav nav-tabs nav-tabs-solid">
+                    <!-- ko foreach:months -->
+                    <li class="nav-item" data-bind="click:$root.setActivetab.bind($data, monthID)" style="z-index:10">
+                        <a class="nav-link"
+                           data-bind="text:monthName, css:{'active' : $root.selectedMonthID() == monthID}"></a>
+                    </li>
+                    <!-- /ko -->
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane active">
+                        <?= view('reports/employeehours/employeemonthhours_view') ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/pages/externals_view.php b/app/Views/pages/externals_view.php
new file mode 100644
index 0000000..5d98189
--- /dev/null
+++ b/app/Views/pages/externals_view.php
@@ -0,0 +1,64 @@
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th class="table-tealish-header">contact</th>
+        <th class="table-tealish-header">naam</th>
+        <th class="table-tealish-header">adres</th>
+        <th class="table-tealish-header">plaats</th>
+        <th class="table-tealish-header">email</th>
+        <th class="table-tealish-header">tarief</th>
+        <th class="table-tealish-header">&nbsp;</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:externals">
+    <tr>
+        <td><span data-bind="text:contactperson"></span></td>
+        <td><span data-bind="text:name"></span></td>
+        <td><span data-bind="text:address"></span></td>
+        <td><span data-bind="text:postcode + ' ' + place"></span></td>
+        <td><span data-bind="text:email"></span></td>
+        <td><span data-bind="text:rate"></span></td>
+        <td>
+            <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editExternal"></i>
+            <!-- ko if:archive == 'F' -->
+            <i class="icon fa-archive pointer" title="archiveer"
+               data-bind="click:$root.archiveExternal"></i>
+            <!-- /ko -->
+            <!-- ko if:archive != 'F' -->
+            <i class="icon fa-minus-circle redish pointer" title="archiveer"
+               data-bind="click:$root.archiveExternal"></i>
+            <!-- /ko -->
+            <i class="icon fa-trash redish pointer" title="verwijder"
+               data-bind="click:$root.removeExternal"></i>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+    <tr>
+        <td colspan="4" class="">
+            <button class="btn btn-primary btn-round btn-sm" data-bind="click:newExternal">
+                nieuwe onderaannemer
+            </button>
+        </td>
+        <td colspan="2" class="">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </td>
+    </tr>
+    </tfoot>
+
+</table>
\ No newline at end of file
diff --git a/app/Views/pages/home_view.php b/app/Views/pages/home_view.php
new file mode 100644
index 0000000..68d880f
--- /dev/null
+++ b/app/Views/pages/home_view.php
@@ -0,0 +1,30 @@
+<div class="dbo-page">
+    <div class="row">
+        <?php foreach ( $pages as $page ): ?>
+            <div class="col-md-4">
+                <div class="panel panel-primary panel-line">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">
+                            <?= $page->pagename ?>
+                        </h3>
+                    </div>
+                    <div class="panel-body">
+                        <div class="row">
+                            <?php foreach ( $page->subpages as $subpage ): ?>
+                                <div class="col-md-6">
+                                    <div class="panel panel-success panel-line">
+                                        <div class="panel-heading">
+                                            <h5 class="panel-title">
+                                                <?= $subpage->pagename ?>
+                                            </h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            <?php endforeach; ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        <?php endforeach; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/pages/invoicereport_view.php b/app/Views/pages/invoicereport_view.php
new file mode 100644
index 0000000..be960cc
--- /dev/null
+++ b/app/Views/pages/invoicereport_view.php
@@ -0,0 +1,85 @@
+<div id="INVOICEREPORT">
+    <div class="row">
+        <div class="col-md-1">
+            <label>jaar</label>
+        </div>
+        <div class="col-md-2">
+            <input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}">
+            <div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>
+        </div>
+        <div class="col-md-2">
+            <button class="btn btn-success" data-bind="click:createSpreadsheet">
+                maak spreadsheet
+            </button>
+        </div>
+        <div class="col-md-3">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="nav-tabs-horizontal">
+                <ul class="nav nav-tabs nav-tabs-solid">
+                    <li class="nav-item"
+                        data-bind="click:setActivetab.bind($data, 'invoice')" style="z-index:10">
+                        <a class="nav-link"
+                           data-bind="css:{'active':invoiceTab() == 'invoice'}">facturen</a>
+                    </li>
+                    <li class="nav-item" data-bind="click:setActivetab.bind($data, 'forecast')" style="z-index:10">
+                        <a class="nav-link"
+                           data-bind="css:{'active':invoiceTab() == 'forecast'}">prognoses</a>
+                    </li>
+                    <li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthforecast')" style="z-index:10">
+                        <a class="nav-link"
+                           data-bind="css:{'active':invoiceTab() == 'monthforecast'}">maand prognoses</a>
+                    </li>
+					<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthpayments')" style="z-index:10">
+						<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'monthpayments'}">maand betalingen</a>
+					</li>
+					<li class="nav-item" data-bind="click:setActivetab.bind($data, 'invoices')" style="z-index:10">
+						<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'invoices'}">verstuurde facturen</a>
+					</li>
+<!--                    <li class="nav-item" data-bind="click:setActivetab.bind($data, 'externals')" style="z-index:10">-->
+<!--                        <a class="nav-link" data-bind="css:{'active':invoiceTab() == 'externals'}">onderaannemers</a>-->
+<!--                    </li>-->
+                </ul>
+                <div class="tab-content">
+                    <div data-bind="visible:invoiceTab() == 'invoice'">
+                        <?= view('reports/invoices/invoiceoverview_report') ?>
+                    </div>
+                    <div id="cast" data-bind="visible:invoiceTab() == 'forecast'">
+                        <?= view('reports/invoices/invoiceforecast_report') ?>
+                    </div>
+                    <div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthforecast'">
+                        <?= view('reports/invoices/monthforecast_report') ?>
+                    </div>
+					<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthpayments'">
+						<?= view('reports/invoices/monthpayment_report') ?>
+					</div>
+					<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'invoices'">
+						<?= view('reports/invoices/invoices_report') ?>
+					</div>
+<!--                    <div id="invoiceforecast" data-bind="visible:invoiceTab() == 'externals'">-->
+<!--                        --><?php //$this->load->view('reports/invoices/contractors_report') ?>
+<!--                    </div>-->
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/Views/pages/login/dashboard_view.php b/app/Views/pages/login/dashboard_view.php
new file mode 100644
index 0000000..9a9b30b
--- /dev/null
+++ b/app/Views/pages/login/dashboard_view.php
@@ -0,0 +1 @@
+<h1>DASHBOARD</h1>
\ No newline at end of file
diff --git a/app/Views/pages/login/login_view.php b/app/Views/pages/login/login_view.php
new file mode 100644
index 0000000..d98b3d2
--- /dev/null
+++ b/app/Views/pages/login/login_view.php
@@ -0,0 +1,252 @@
+<!DOCTYPE html>
+<html class="no-js css-menubar" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
+    <meta name="description" content="bootstrap admin template">
+    <meta name="author" content="">
+
+    <title>-*-*-LOGIN DBOIS-*-*-</title>*
+
+    <link rel="icon" href="css/images/dbo-01-80x80.png" type="image/png">
+
+    <!-- Stylesheets -->
+    <link rel="stylesheet" href="css/vendor/bootstrap.min.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="css/vendor/bootstrap-extend.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="css/vendor/site.min.css?v=<?= APP_VERSION ?>">
+
+    <!-- Plugins -->
+<!--    <link rel="stylesheet" href="css/vendor/plugins/animsition/animsition.css">-->
+    <link rel="stylesheet" href="css/vendor/plugins/asscrollable/asScrollable.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="css/vendor/plugins/switchery/switchery.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="css/vendor/plugins/slidepanel/slidePanel.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="css/vendor/plugins/flag-icon-css/flag-icon.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="css/login-v3.css?v=<?= APP_VERSION ?>">
+
+
+    <!-- Fonts -->
+    <link rel="stylesheet" href="fonts/web-icons/web-icons.min.css?v=<?= APP_VERSION ?>">
+    <link rel="stylesheet" href="fonts/brand-icons/brand-icons.min.css?v=<?= APP_VERSION ?>">
+    <link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Roboto:300,400,500,300italic'>
+</head>
+<body class="animsition page-login-v3 layout-full">
+<!-- Page -->
+<?= view('specials/tellme_modal') ?>
+
+<!-- Password Change Modal -->
+<div class="modal fade" id="password-change-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header bg-warning">
+                <h4 class="modal-title">
+                    <i class="icon wb-warning" aria-hidden="true"></i>
+                    Wachtwoord wijzigen verplicht
+                </h4>
+            </div>
+            <div class="modal-body">
+                <div class="alert alert-warning">
+                    <strong>Let op:</strong> Uw huidige wachtwoord voldoet niet aan de beveiligingseisen.
+                    U moet uw wachtwoord wijzigen om door te gaan.
+                </div>
+
+                <h5>Wachtwoordeisen:</h5>
+                <ul class="list-unstyled" data-bind="foreach: passwordRequirements">
+                    <li style="padding: 5px 0;">
+                        <i class="icon wb-check text-success" aria-hidden="true"></i>
+                        <span data-bind="text: $data"></span>
+                    </li>
+                </ul>
+
+                <!-- New Password Input -->
+                <div class="form-group form-material floating" data-plugin="formMaterial" style="margin-top: 30px;">
+                    <input type="password"
+                           class="form-control"
+                           id="newPassword"
+                           data-bind="textInput: newPassword"
+                           autocomplete="new-password" />
+                    <label class="floating-label">Nieuw wachtwoord</label>
+                </div>
+
+                <!-- Confirm Password Input -->
+                <div class="form-group form-material floating" data-plugin="formMaterial">
+                    <input type="password"
+                           class="form-control"
+                           id="confirmPassword"
+                           data-bind="textInput: confirmPassword, event: { keyup: handlePasswordChangeKeyup }"
+                           autocomplete="new-password" />
+                    <label class="floating-label">Bevestig wachtwoord</label>
+                </div>
+
+                <!-- Error Message -->
+                <div data-bind="visible: passwordChangeError()" class="alert alert-danger" style="margin-top: 20px;">
+                    <span data-bind="text: passwordChangeError"></span>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-primary btn-lg btn-block"
+                        data-bind="click: changePassword, enable: newPassword().length >= 8 && confirmPassword().length >= 8 && !isChangingPassword()">
+                    <span data-bind="visible: !isChangingPassword()">Wachtwoord wijzigen</span>
+                    <span data-bind="visible: isChangingPassword()">Wijzigen...</span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- 2FA Verification Modal -->
+<div class="modal fade" id="twofactor-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">
+                    <i class="icon wb-lock" aria-hidden="true"></i>
+                    Tweefactorauthenticatie
+                </h4>
+            </div>
+            <div class="modal-body text-center">
+                <!-- Email Method -->
+                <div data-bind="visible: twoFactorMethod() === 'email'">
+                    <div style="font-size: 48px; color: #348eda; margin-bottom: 20px;">
+                        <i class="icon wb-envelope" aria-hidden="true"></i>
+                    </div>
+                    <p>Voer de 6-cijferige code in die naar uw e-mail is verzonden.</p>
+                </div>
+
+                <!-- Authenticator Method -->
+                <div data-bind="visible: twoFactorMethod() === 'authenticator'">
+                    <div style="font-size: 48px; color: #348eda; margin-bottom: 20px;">
+                        <i class="icon wb-mobile" aria-hidden="true"></i>
+                    </div>
+                    <p>Voer de 6-cijferige code in van uw authenticator app.</p>
+                </div>
+
+                <!-- Code Input -->
+                <div class="form-group" style="margin-top: 30px;">
+                    <input type="text"
+                           class="form-control text-center"
+                           id="twoFactorCode"
+                           maxlength="6"
+                           placeholder="000000"
+                           style="font-size: 32px; letter-spacing: 8px; font-weight: bold;"
+                           data-bind="textInput: twoFactorCode, event: { keyup: handleTwoFactorKeyup }"
+                           autocomplete="off" />
+                </div>
+
+                <!-- Error Message -->
+                <div data-bind="visible: twoFactorError()" class="alert alert-danger" style="margin-top: 20px;">
+                    <span data-bind="text: twoFactorError"></span>
+                </div>
+
+                <!-- Resend Button (Email only) -->
+                <div data-bind="visible: twoFactorMethod() === 'email'" style="margin-top: 20px;">
+                    <a href="#" data-bind="click: resendOtp, enable: !isResending()">
+                        <span data-bind="visible: !isResending()">Code opnieuw verzenden</span>
+                        <span data-bind="visible: isResending()">Verzenden...</span>
+                    </a>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-bind="click: cancelTwoFactor">Annuleren</button>
+                <button type="button" class="btn btn-primary btn-lg" data-bind="click: verifyTwoFactor, enable: twoFactorCode().length === 6 && !isVerifying()">
+                    <span data-bind="visible: !isVerifying()">Verifiëren</span>
+                    <span data-bind="visible: isVerifying()">Verifiëren...</span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="page vertical-align text-center" data-animsition-in="fade-in" data-animsition-out="fade-out">
+    <div class="page-content vertical-align-middle animation-slide-top animation-duration-1">
+        <div class="panel" id="login-form">
+            <div class="panel-body">
+                <div class="brand">
+                    <img class="brand-img" src="css/images/logo_dbo.png" alt="...">
+                    <h2 class="brand-text font-size-18">projectbeheer</h2>
+                </div>
+                <div data-bind="visible: !showPasswordRequest()">
+                    <div>
+                        <div class="form-group form-material floating" data-plugin="formMaterial">
+                            <input type="text" class="form-control" name="gebruikersnaam"
+                                   data-bind="textInput:username" />
+                            <label class="floating-label">gebruikersnaam</label>
+                        </div>
+                        <div class="form-group form-material floating" data-plugin="formMaterial">
+                            <input type="password" class="form-control" name="password"
+                                   data-bind="textInput:password" />
+                            <label class="floating-label">wachtwoord</label>
+                        </div>
+                        <button type="button"
+                                class="btn btn-primary btn-block btn-lg mt-40"
+                                data-bind="click:login">Log in</button>
+                    </div>
+                    <div>
+                        <br />
+                        <a href="#" data-bind="click:togglePasswordrequest">wachtwoord vergeten?</a>
+                    </div>
+                </div>
+                <div data-bind="visible: showPasswordRequest()">
+                    <p>
+                        Vul hieronder uw emailadres en gebruikersnaam in, u krijgt dan een mail met een nieuw wachtwoord toegezonden!
+                    </p>
+                    <div class="form-group form-material floating" data-plugin="formMaterial">
+                        <input type="text"
+                               class="form-control"
+                               name="gebruikersnaam"
+                               data-bind="textInput:username" />
+                        <label class="floating-label">gebruikersnaam</label>
+                    </div>
+                    <div class="form-group form-material floating" data-plugin="formMaterial">
+                        <input type="text"
+                               class="form-control"
+                               name="password"
+                               data-bind="textInput:email" />
+                        <label class="floating-label">emailadres</label>
+                    </div>
+                    <button type="button"
+                            class="btn btn-primary btn-block btn-lg mt-40"
+                            data-bind="click:requestPassword">vraag aan</button>
+                    <div>
+                        <br />
+                        <a href="#"  data-bind="click:togglePasswordrequest">terug naar inlog?</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <footer class="page-copyright page-copyright-inverse">
+            <p>© 2018. De Beleidsonderzoekers</p>
+<!--            <p style="font-size:.8em">powered by: Pensare Software</p>-->
+        </footer>
+    </div>
+</div>
+<!-- End Page -->
+
+
+<!-- Core  -->
+<script src="js/vendor/jquery/jquery.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/vendor/popper-js/umd/popper.min.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/vendor/bootstrap/bootstrap.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/vendor/animsition/animsition.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+<!-- Scripts -->
+<script src="js/vendor/Config.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+
+<!-- Page -->
+
+<script src="js/vendor/Knockout.min.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/login/loginModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/specials/tellmeModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/helpers.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script>
+    // Apply bindings for password change modal
+    $(function() {
+        ko.applyBindings(dbo.loginModel, document.getElementById('password-change-modal'));
+    });
+</script>
+
+</body>
+</html>
diff --git a/app/Views/pages/login/verify2fa_view.php b/app/Views/pages/login/verify2fa_view.php
new file mode 100644
index 0000000..0c949c0
--- /dev/null
+++ b/app/Views/pages/login/verify2fa_view.php
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<html class="no-js css-menubar" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
+    <title>Tweefactorauthenticatie - DBOIS</title>
+
+    <link rel="icon" href="css/images/dbo-01-80x80.png" type="image/png">
+
+    <!-- Stylesheets -->
+    <link rel="stylesheet" href="css/vendor/bootstrap.min.css?v=<?=$version?>">
+    <link rel="stylesheet" href="css/vendor/bootstrap-extend.css?v=<?=$version?>">
+    <link rel="stylesheet" href="css/vendor/site.min.css?v=<?=$version?>">
+
+    <!-- Plugins -->
+    <link rel="stylesheet" href="css/vendor/plugins/asscrollable/asScrollable.css?v=<?=$version?>">
+    <link rel="stylesheet" href="css/vendor/plugins/switchery/switchery.css?v=<?=$version?>">
+    <link rel="stylesheet" href="css/vendor/plugins/slidepanel/slidePanel.css?v=<?=$version?>">
+    <link rel="stylesheet" href="css/vendor/plugins/flag-icon-css/flag-icon.css?v=<?=$version?>">
+    <link rel="stylesheet" href="css/login-v3.css?v=<?=$version?>">
+
+    <!-- Fonts -->
+    <link rel="stylesheet" href="fonts/web-icons/web-icons.min.css?v=<?=$version?>">
+    <link rel="stylesheet" href="fonts/brand-icons/brand-icons.min.css?v=<?=$version?>">
+    <link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Roboto:300,400,500,300italic'>
+
+    <style>
+        .verification-code-input {
+            text-align: center;
+            font-size: 32px;
+            letter-spacing: 8px;
+            font-weight: bold;
+            padding: 20px;
+        }
+        .resend-link {
+            margin-top: 20px;
+            display: inline-block;
+        }
+        .method-icon {
+            font-size: 48px;
+            color: #348eda;
+            margin-bottom: 20px;
+        }
+    </style>
+</head>
+<body class="animsition page-login-v3 layout-full">
+<!-- Page -->
+<?= view('specials/tellme_modal') ?>
+<div class="page vertical-align text-center" data-animsition-in="fade-in" data-animsition-out="fade-out">
+    <div class="page-content vertical-align-middle animation-slide-top animation-duration-1">
+        <div class="panel" id="verify2fa-form">
+            <div class="panel-body">
+                <div class="brand">
+                    <img class="brand-img" src="css/images/logo_dbo.png" alt="DBOIS">
+                    <h2 class="brand-text font-size-18">projectbeheer</h2>
+                </div>
+
+                <div class="text-center">
+                    <div class="method-icon" data-bind="visible: method() === 'email'">
+                        <i class="icon wb-envelope" aria-hidden="true"></i>
+                    </div>
+                    <div class="method-icon" data-bind="visible: method() === 'authenticator'">
+                        <i class="icon wb-mobile" aria-hidden="true"></i>
+                    </div>
+
+                    <h3>Tweefactorauthenticatie</h3>
+
+                    <p data-bind="visible: method() === 'email'">
+                        Voer de 6-cijferige code in die naar uw e-mail is verzonden.
+                    </p>
+                    <p data-bind="visible: method() === 'authenticator'">
+                        Voer de 6-cijferige code in van uw authenticator app.
+                    </p>
+                </div>
+
+                <div class="form-group form-material floating mt-40" data-plugin="formMaterial">
+                    <input type="text"
+                           class="form-control verification-code-input"
+                           name="verification_code"
+                           maxlength="6"
+                           data-bind="textInput: verificationCode, event: { keyup: handleKeyup }"
+                           autocomplete="off"
+                           autofocus />
+                    <label class="floating-label">Verificatiecode</label>
+                </div>
+
+                <div data-bind="visible: errorMessage()" class="alert alert-danger">
+                    <span data-bind="text: errorMessage"></span>
+                </div>
+
+                <button type="button"
+                        class="btn btn-primary btn-block btn-lg mt-40"
+                        data-bind="click: verify, enable: verificationCode().length === 6 && !isVerifying()">
+                    <span data-bind="visible: !isVerifying()">Verifiëren</span>
+                    <span data-bind="visible: isVerifying()">Verifiëren...</span>
+                </button>
+
+                <div data-bind="visible: method() === 'email'">
+                    <a href="#" class="resend-link" data-bind="click: resendOtp, enable: !isResending()">
+                        <span data-bind="visible: !isResending()">Code opnieuw verzenden</span>
+                        <span data-bind="visible: isResending()">Verzenden...</span>
+                    </a>
+                </div>
+
+                <div class="mt-20">
+                    <a href="/login/logout">Annuleren</a>
+                </div>
+            </div>
+        </div>
+
+        <footer class="page-copyright page-copyright-inverse">
+            <p>© 2018. De Beleidsonderzoekers</p>
+        </footer>
+    </div>
+</div>
+<!-- End Page -->
+
+<!-- Core  -->
+<script src="js/vendor/jquery/jquery.js?v=<?=$version?>"></script>
+<script src="js/vendor/popper-js/umd/popper.min.js?v=<?=$version?>"></script>
+<script src="js/vendor/bootstrap/bootstrap.js?v=<?=$version?>"></script>
+<script src="js/vendor/animsition/animsition.js?v=<?=$version?>"></script>
+
+<!-- Scripts -->
+<script src="js/vendor/Config.js?v=<?=$version?>"></script>
+<script src="js/vendor/Knockout.min.js?v=<?=$version?>"></script>
+<script src="js/lib/modules/specials/tellmeModule.js?v=<?=$version?>"></script>
+<script src="js/lib/helpers.js?v=<?=$version?>"></script>
+
+<script>
+function Verify2FAViewModel() {
+    var self = this;
+
+    self.method = ko.observable('<?= $method ?>');
+    self.verificationCode = ko.observable('');
+    self.errorMessage = ko.observable('');
+    self.isVerifying = ko.observable(false);
+    self.isResending = ko.observable(false);
+
+    self.verify = function() {
+        if (self.verificationCode().length !== 6) {
+            return;
+        }
+
+        self.errorMessage('');
+        self.isVerifying(true);
+
+        $.ajax({
+            url: '/login/verify2fa',
+            method: 'POST',
+            data: { code: self.verificationCode() },
+            success: function(response) {
+                if (response.success) {
+                    // Redirect to main application
+                    window.location.href = '/';
+                } else {
+                    self.errorMessage(response.message || 'Ongeldige verificatiecode');
+                    self.verificationCode('');
+                }
+                self.isVerifying(false);
+            },
+            error: function() {
+                self.errorMessage('Er is een fout opgetreden. Probeer het opnieuw.');
+                self.isVerifying(false);
+            }
+        });
+    };
+
+    self.resendOtp = function() {
+        self.isResending(true);
+        self.errorMessage('');
+
+        $.ajax({
+            url: '/login/resendOtp',
+            method: 'POST',
+            success: function(response) {
+                if (response.success) {
+                    alert(response.message || 'Nieuwe code verzonden');
+                } else {
+                    self.errorMessage(response.message || 'Kan code niet opnieuw verzenden');
+                }
+                self.isResending(false);
+            },
+            error: function() {
+                self.errorMessage('Er is een fout opgetreden. Probeer het opnieuw.');
+                self.isResending(false);
+            }
+        });
+
+        return false;
+    };
+
+    self.handleKeyup = function(data, event) {
+        // Clear error message on input
+        self.errorMessage('');
+
+        // Auto-submit when 6 digits entered and Enter is pressed
+        if (self.verificationCode().length === 6 && event.keyCode === 13) {
+            self.verify();
+        }
+
+        // Only allow digits
+        var sanitized = self.verificationCode().replace(/[^0-9]/g, '');
+        if (sanitized !== self.verificationCode()) {
+            self.verificationCode(sanitized);
+        }
+
+        return true;
+    };
+}
+
+$(document).ready(function() {
+    ko.applyBindings(new Verify2FAViewModel());
+});
+</script>
+
+</body>
+</html>
diff --git a/app/Views/pages/monthlyemployeehours_view.php b/app/Views/pages/monthlyemployeehours_view.php
new file mode 100644
index 0000000..344d521
--- /dev/null
+++ b/app/Views/pages/monthlyemployeehours_view.php
@@ -0,0 +1,86 @@
+<div class="MONTHLYEMPLOYEEHOURS">
+<!--    <div class="row">-->
+<!--        <div class="col-md-1">-->
+<!--            <label>jaar</label>-->
+<!--        </div>-->
+<!--        <div class="col-md-2">-->
+<!--            <input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}" >-->
+<!--            <div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>-->
+<!--        </div>-->
+<!--    </div>-->
+    <div class="row">
+        <div class="col-xs-3">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="nav-tabs-horizontal">
+                <ul class="nav nav-tabs nav-tabs-solid">
+                    <li class="nav-item" data-bind="click:setActivetab.bind($data, 'euro')" style="z-index:10">
+                        <a class="nav-link" data-bind="css:{'active':sluggy() == 'euro'}">totaal euro's</a>
+                    </li>
+                    <li class="nav-item" data-bind="click:setActivetab.bind($data, 'hours')" style="z-index:10">
+                        <a class="nav-link" data-bind="css:{'active':sluggy() == 'hours'}">totaal uren</a>
+                    </li>
+
+                    <!-- ko foreach:uniqueEmployees -->
+                        <li class="nav-item" data-bind="click:$root.setActivetab.bind($data, id)" style="z-index:10">
+                            <a class="nav-link" data-bind="text:fullname, css:{'active':$root.sluggy() == id}"></a>
+                        </li>
+                    <!-- /ko -->
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane" data-bind="css:{'active':sluggy() == 'euro'}">
+                        <?= view('reports/monthlyemployeehours/euro_view') ?>
+                    </div>
+                    <div class="tab-pane" data-bind="css:{'active':sluggy() == 'hours'}">
+                        <?= view('reports/monthlyemployeehours/hours_view') ?>
+                    </div>
+
+                    <!-- ko foreach:uniqueEmployees -->
+                        <div class="tab-pane" data-bind="css:{'active':$root.sluggy() == id}">
+                            <div style="position:relative">
+                                <div style="position:absolute;right:20px; z-index:10;">
+                                    <div class="onoffswitch" data-bind="click:$root.toggleHourView">
+                                        <input type="checkbox"
+                                               name="onoffswitch"
+                                               class="onoffswitch-checkbox"
+                                               data-bind="checked:hourView"
+                                               id="myonoffswitch">
+                                        <label class="onoffswitch-label" for="myonoffswitch">
+                                            <span class="onoffswitch-inner"></span>
+                                            <span class="onoffswitch-switch"></span>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- ko if : hourView() -->
+                            <?= view('reports/monthlyemployeehours/_employeehour_view') ?>
+                            <!-- /ko -->
+                            <!-- ko if : ! hourView() -->
+                            <?= view('reports/monthlyemployeehours/_employeerevenue_view') ?>
+                            <!-- /ko -->
+                        </div>
+                    <!-- /ko -->
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
diff --git a/app/Views/pages/offers_view.php b/app/Views/pages/offers_view.php
new file mode 100644
index 0000000..46cbe53
--- /dev/null
+++ b/app/Views/pages/offers_view.php
@@ -0,0 +1,124 @@
+
+<div class="row">
+    <div class="col-xs-6">
+        <div class="form-group">
+            <div class="input-group">
+                <input type="text"
+                       data-bind="textInput:search,event:{keyup:searchOffers}"
+                       class="form-control"
+                       name=""
+                       placeholder="Zoek...">
+                <span class="input-group-btn">
+                        <button type="text"
+                                class="btn btn-primary">
+                            <i class="icon wb-search" aria-hidden="true"></i>
+                        </button>
+                      </span>
+            </div>
+        </div>
+    </div>
+</div>
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th width="10%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offernumber')">nummer</th>
+        <th width="20%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'CUS.name')">klant</th>
+        <th width="25%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offername')">offertenaam</th>
+		<th width="5%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'startdate')">datum</th>
+		<th width="5%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'deadline')">deadline</th>
+        <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'own_revenue')">(eigen) omzet</th>
+        <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'acceptance_chance')">kans</th>
+        <th width="10%" class="table-tealish-header align-right">(eigen) omzet * kans</th>
+<!--        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'accepteddate')">geaccepteerd</th>-->
+<!--        <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'rejectdate')">afgewezen</th>-->
+        <th width="5%" class="table-tealish-header pointer">&nbsp;</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:offers">
+    <tr data-bind="css:{'table-info':$root.selectedRowID() == id}">
+        <td data-bind="click:$root.selectOffer" class="pointer">
+            <span data-bind="text:offernumber"></span>
+        </td>
+        <td data-bind="click:$root.selectOffer" class="pointer">
+            <span data-bind="text:customerName"></span>
+        </td>
+        <td data-bind="click:$root.selectOffer" class="pointer">
+            <span data-bind="text:offername"></span>
+        </td>
+		<td data-bind="click:$root.selectOffer" class="pointer">
+			<span data-bind="text:startdate"></span>
+		</td>
+		<td data-bind="click:$root.selectOffer" class="pointer">
+			<span data-bind="text:deadline"></span>
+		</td>
+        <td data-bind="click:$root.selectOffer" class="pointer align-right">
+            € <span data-bind="text:own_revenue"></span>
+        </td>
+        <td data-bind="click:$root.selectOffer" class="pointer align-right">
+            <span data-bind="text:acceptance_chance"></span> %
+        </td>
+        <td data-bind="click:$root.selectOffer" class="pointer align-right">
+            € <span data-bind="text:chanceOwnRevenue"></span>
+        </td>
+<!--        <td data-bind="click:$root.selectOffer" class="pointer">-->
+<!--            <span data-bind="text:accepteddate"></span>-->
+<!--        </td>-->
+<!--        <td data-bind="click:$root.selectOffer" class="pointer">-->
+<!--            <span data-bind="text:rejectdate"></span>-->
+<!--        </td>-->
+        <td>
+            <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
+            <!-- ko if:archive == 'F' -->
+            <i class="icon fa-archive pointer" title="archiveer"
+               data-bind="click:$root.archiveOffer"></i>
+            <!-- /ko -->
+            <!-- ko if:archive != 'F' -->
+            <i class="icon fa-minus-circle redish pointer" title="archiveer"
+               data-bind="click:$root.archiveOffer"></i>
+            <!-- /ko -->
+            <i class="icon fa-trash redish pointer" title="verwijder"
+               data-bind="click:$root.removeOffer, css:{'whiteish':$root.selectedRowID() == id}"></i>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+	<tr>
+		<th colspan="5" class="align-right table-tealish-header">
+			Totaal
+		</th>
+		<th class="align-right table-tealish-header">
+			€ <span data-bind="text:totalOwnRevenue"></span>
+		</th>
+		<th class=" table-tealish-header">&nbsp;</th>
+		<th class="align-right table-tealish-header">
+			€ <span data-bind="text:totalChanceOwnRevenue"></span>
+		</th>
+		<th class=" table-tealish-header">&nbsp;</th>
+	</tr>
+    <tr>
+        <td colspan="5" class="">
+            <button class="btn btn-primary btn-round btn-sm" data-bind="click:newOffer">
+                nieuwe offerte
+            </button>
+        </td>
+        <td colspan="3" class="">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </td>
+    </tr>
+    </tfoot>
+</table>
diff --git a/app/Views/pages/projects_view.php b/app/Views/pages/projects_view.php
new file mode 100644
index 0000000..9c5c2c1
--- /dev/null
+++ b/app/Views/pages/projects_view.php
@@ -0,0 +1,126 @@
+<div class="row">
+    <div class="col-xs-6">
+        <div class="form-group">
+            <div class="input-group">
+                <input type="text"
+                       data-bind="textInput:search,event:{keyup:searchProjects}"
+                       class="form-control"
+                       name=""
+                       placeholder="Zoek...">
+                <span class="input-group-btn">
+                        <button type="text"
+                                class="btn btn-primary">
+                            <i class="icon wb-search" aria-hidden="true"></i>
+                        </button>
+                      </span>
+            </div>
+        </div>
+    </div>
+</div>
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th class="table-tealish-header pointer"
+            data-bind="click:directionOrderProjects.bind($data, 'projectnumber')">nummer</th>
+        <th class="table-tealish-header pointer"
+            data-bind="click:directionOrderProjects.bind($data, 'USR.firstname')">projectleider</th>
+        <th class="table-tealish-header pointer"
+            data-bind="click:directionOrderProjects.bind($data, 'projectname')">projectnaam</th>
+        <th class="table-tealish-header pointer"
+            data-bind="click:directionOrderProjects.bind($data, 'startdate')">start</th>
+        <th class="table-tealish-header align-right">eigen tarief omzet</th>
+        <th class="table-tealish-header align-right">overige kosten</th>
+        <th class="table-tealish-header align-right">Kosten derden</th>
+        <th class="table-tealish-header align-right">totaal</th>
+        <th class="table-tealish-header">&nbsp;</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:projects">
+    <tr data-bind="css:{'table-info':$root.selectedRowID() == id}">
+        <td data-bind="click:$root.selectProject" class="pointer">
+            <span data-bind="text:projectnumber"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer">
+            <span data-bind="text:projectleader"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer">
+            <span data-bind="text:projectname, attr:{title:customer}"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer">
+            <span data-bind="text:startdate"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer align-right">
+            <span data-bind="text:dbo.helpers.numberWithPoints(totalOwnrevenue.toFixed(0))"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer align-right">
+            <span data-bind="text:dbo.helpers.numberWithPoints(totalOtherrevenue.toFixed(0))"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer align-right">
+            <span data-bind="text:dbo.helpers.numberWithPoints(costs.toFixed(0))"></span>
+        </td>
+        <td data-bind="click:$root.selectPoject" class="pointer align-right">
+            <b data-bind="text:dbo.helpers.numberWithPoints(total.toFixed(0))"></b>
+        </td>
+        <td>
+            <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProject"></i>
+            <!-- ko if:archive == 'F' -->
+            <i class="icon fa-archive pointer" title="archiveer"
+               data-bind="click:$root.archiveProject"></i>
+            <!-- /ko -->
+            <!-- ko if:archive != 'F' -->
+            <i class="icon fa-minus-circle redish pointer" title="archiveer"
+               data-bind="click:$root.archiveProject"></i>
+            <!-- /ko -->
+            <i class="icon fa-trash redish pointer" title="verwijder"
+               data-bind="click:$root.removeProject, css:{'whiteish':$root.selectedRowID() == id}"></i>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+	<tr>
+		<th colspan="4" class="align-right table-tealish-header">
+			Totaal
+		</th>
+		<th class="align-right table-tealish-header">
+			€ <span data-bind="text:totalOwnRevenue"></span>
+		</th>
+		<th class="align-right table-tealish-header">
+			€ <span data-bind="text:totalOtherrevenue"></span>
+		</th>
+		<th class="align-right table-tealish-header">
+			€ <span data-bind="text:totalCosts"></span>
+		</th>
+		<th class="align-right table-tealish-header">
+			€ <span data-bind="text:total"></span>
+		</th>
+		<th class="align-right table-tealish-header"></th>
+	</tr>
+
+    <tr>
+        <td colspan="5" class="">
+            <!--                        <button class="btn btn-primary btn-round btn-sm" data-bind="click:newProject">-->
+            <!--                            nieuw project-->
+            <!--                        </button>-->
+        </td>
+        <td colspan="3" class="">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </td>
+    </tr>
+    </tfoot>
+
+</table>
diff --git a/app/Views/pages/reservations_view.php b/app/Views/pages/reservations_view.php
new file mode 100644
index 0000000..a081d64
--- /dev/null
+++ b/app/Views/pages/reservations_view.php
@@ -0,0 +1,138 @@
+<div id="RESERVATIONS">
+    <div class="row">
+        <div class="col-md-12">
+            <label class="col-xs-12">
+                alle bedragen inclusief btw
+            </label>
+            <table class="table table-condensed">
+                <thead>
+                <tr>
+                    <th width="2%">&nbsp;</th>
+                    <th width="34%">project</th>
+                    <th width="8%" class="align-right">Kosten derden</th>
+                    <th width="8%" class="align-right">factuur INK</th>
+                    <th width="8%" class="align-right">gereserveerd op<br/>spaarrekening</th>
+                    <th width="8%" class="align-right">betaald</th>
+                    <th width="8%" class="align-right">nog te betalen<br />facturen</th>
+                    <th width="8%" class="align-right">betaald via<br />reserveringen</th>
+                    <th width="8%" class="align-right">saldo reservering</th>
+                    <th width="8%" class="align-right">saldo facturen INK</th>
+                </tr>
+                </thead>
+                <!--  ko foreach:projects -->
+                <tbody>
+                <tr>
+                    <th>
+                        <i class="icon fa-chevron-right"
+                           data-bind="click:$root.toggleExternals, visible: ! showExternals()">
+                        </i>
+                        <i class="icon fa-chevron-down"
+                           data-bind="click:$root.toggleExternals, visible:showExternals()">
+                        </i>
+                    </th>
+                    <th>
+                        <span data-bind="text:projectnumber"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:otherRevenue"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:costs"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:reservation"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:payed"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:saldoToPay"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:fromreservation"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:saldo"></span>
+                    </th>
+                    <th class="align-right" data-bind="visible: ! showExternals()">
+                        <span data-bind="text:saldoInvoices"></span>
+                    </th>
+                </tr>
+                <!-- ko if:showExternals() -->
+                <!-- ko foreach: externals -->
+                <tr>
+                    <td width="5px">&nbsp;</td>
+                    <td>
+                        <span data-bind="text:externalName"></span>
+                    </td>
+                    <td>&nbsp</td>
+                    <td class="align-right lighgrey-background">
+                        <span data-bind="text:costs"></span>
+                    </td>
+                    <td class="align-right">
+                        <span data-bind="text:reservation"></span>
+                    </td>
+                    <td class="align-right lighgrey-background">
+                        <span data-bind="text:payed"></span>
+                    </td>
+                    <td class="align-right">
+                        <span data-bind="text:saldoToPay"></span>
+                    </td>
+                    <td class="align-right lighgrey-background">
+                        <span data-bind="text:fromreservation"></span>
+                    </td>
+                    <td class="align-right">
+                        <span data-bind="text:saldo"></span>
+                    </td>
+                    <td>&nbsp;</td>
+                </tr>
+                <!-- /ko -->
+                <!-- /ko -->
+                <!-- ko if:showExternals() -->
+                <tr class="subtotal">
+                    <th colspan="2">Totaal</th>
+                    <th class="align-right">
+                        <span data-bind="text:otherRevenue"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:costs"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:reservation"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:payed"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:saldoToPay"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:fromreservation"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:saldo"></span>
+                    </th>
+                    <th class="align-right">
+                        <span data-bind="text:saldoInvoices"></span>
+                    </th>
+                </tr>
+                <!-- /ko -->
+                </tbody>
+                <!-- /ko -->
+                <tfoot>
+                <tr class="grandtotal">
+                    <th colspan="2">Grand totaal</th>
+                    <th class="align-right"><span data-bind="text:otherRevenue"></span></th>
+                    <th class="align-right"><span data-bind="text:costs"></span></th>
+                    <th class="align-right"><span data-bind="text:reservation"></span></th>
+                    <th class="align-right"><span data-bind="text:payed"></span></th>
+                    <th class="align-right"><span data-bind="text:saldoToPay"></span></th>
+                    <th class="align-right"><span data-bind="text:fromreservation"></span></th>
+                    <th class="align-right"><span data-bind="text:saldo"></span></th>
+                    <th class="align-right"><span data-bind="text:saldoInvoices"></span></th>
+                </tr>
+                </tfoot>
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/app/Views/pages/users_view.php b/app/Views/pages/users_view.php
new file mode 100644
index 0000000..6dc3828
--- /dev/null
+++ b/app/Views/pages/users_view.php
@@ -0,0 +1,65 @@
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th class="table-tealish-header">voornaam</th>
+        <th class="table-tealish-header">achternaam</th>
+        <th class="table-tealish-header">tussenvoegsel</th>
+        <th class="table-tealish-header">gebruikersnaam</th>
+        <th class="table-tealish-header">email</th>
+        <th class="table-tealish-header">rol</th>
+        <th class="table-tealish-header">&nbsp;</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:users">
+    <tr>
+        <td><span data-bind="text:lastname"></span></td>
+        <td><span data-bind="text:firstname"></span></td>
+        <td><span data-bind="text:middlename"></span></td>
+        <td><span data-bind="text:username"</td>
+        <td><span data-bind="text:email"></span></td>
+        <td><span data-bind=""></span></td>
+        <td>
+            <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editUser"></i>
+            <i class="icon fa-user pointer" title="uren" data-bind="click:$root.editTarget"></i>
+            <!-- ko if:archive == 'F' -->
+            <i class="icon fa-archive pointer" title="archiveer"
+               data-bind="click:$root.archiveUser"></i>
+            <!-- /ko -->
+            <!-- ko if:archive != 'F' -->
+            <i class="icon fa-minus-circle redish pointer" title="archiveer"
+               data-bind="click:$root.archiveUser"></i>
+            <!-- /ko -->
+            <i class="icon fa-trash redish pointer" title="verwijder"
+               data-bind="click:$root.removeUser"></i>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+    <tr>
+        <td colspan="5" class="">
+            <button class="btn btn-primary btn-round btn-sm" data-bind="click:newUser">
+                nieuwe gebruiker
+            </button>
+        </td>
+        <td colspan="2" class="">
+            <div class="row form-horizontal">
+                <label class="col-md-4 form-control-label">archief</label>
+                <div class="col-md-8">
+                    <div class="onoffswitch" data-bind="click:toggleArchive">
+                        <input type="checkbox"
+                               name="onoffswitch"
+                               class="onoffswitch-checkbox"
+                               data-bind="checked:archive"
+                               id="myonoffswitch">
+                        <label class="onoffswitch-label" for="myonoffswitch">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </td>
+    </tr>
+    </tfoot>
+
+</table>
\ No newline at end of file
diff --git a/app/Views/pages/vat_view.php b/app/Views/pages/vat_view.php
new file mode 100644
index 0000000..b75e2df
--- /dev/null
+++ b/app/Views/pages/vat_view.php
@@ -0,0 +1,42 @@
+<div class="VAT">
+    <div class="row">
+        <div class="col-md-2">
+            <table class="table table-condensed">
+                <thead>
+                <tr>
+                    <th>percentage</th>
+                    <th></th>
+                </tr>
+                </thead>
+                <tbody data-bind="foreach:vats">
+                <tr>
+                    <td>
+                        <div class="percentage-sign-holder">
+                            <!-- ko if:inEdit() -->
+                            <input type="text"
+                                   class="form-control percentage-input"
+                                   data-bind="textInput:vatrate,
+                                               event:{keyup:$root.validateNumber.bind($data, 'vatrate')}">
+                            <!-- /ko -->
+                            <!-- ko if: !inEdit() -->
+                            <span data-bind="text:vatrate"></span>&#x25;
+                            <!-- /ko -->
+                        </div>
+                    </td>
+                    <td width="60px">
+                        <i class="icon fa-edit pointer" data-bind="click:$root.toggleEdit"></i>
+                        <i class="icon fa-trash redish pointer" data-bind="click:$root.removeVat"></i>
+                    </td>
+                </tr>
+                </tbody>
+                <tfoot>
+                <tr>
+                    <th colspan="2">
+                        <button class="btn btn-primary" data-bind="click:addVat">voeg btw toe</button>
+                    </th>
+                </tr>
+                </tfoot>
+            </table>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/partials/_css.php b/app/Views/partials/_css.php
new file mode 100644
index 0000000..611962d
--- /dev/null
+++ b/app/Views/partials/_css.php
@@ -0,0 +1,29 @@
+<link rel="apple-touch-icon" href="css/images/apple-touch-icon.png?version=<?=$version?>">
+<link rel="shortcut icon" href="css/images/favicon.ico?version=<?=$version?>">
+
+<!-- Stylesheets VENDOR -->
+<!--<link rel="stylesheet" href="css/vendor/bootstrap.min.css?version=--><!--">-->
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+<!--<link rel="stylesheet" href="css/vendor/bootstrap-extend.css?version=--><!--">-->
+<link rel="stylesheet" href="js/vendor/jquery-ui/jquery-ui.css?version=<?=$version?>">
+<link rel="stylesheet" href="fonts/font-awesome/font-awesome.min.css?version=<?=$version?>">
+
+<link href='js/vendor/froala/css/froala_editor.css?version=<?=$version?>' rel='stylesheet' type='text/css' />
+<link href='js/vendor/froala/css/froala_style.css?version=<?=$version?>' type='text/css' />
+
+<link rel="stylesheet" href="css/vendor/site.min.css?version=<?=$version?>">
+
+<link rel="stylesheet" href="css/vendor/plugins/animsition/animsition.css?version=<?=$version?>">
+<link rel="stylesheet" href="css/vendor/plugins/switchery/switchery.css?version=<?=$version?>">
+<link rel="stylesheet" href="css/vendor/plugins/asscrollable/asScrollable.css?version=<?=$version?>">
+<link rel="stylesheet" href="css/vendor/plugins/slidepanel/slidePanel.css?version=<?=$version?>">
+<link rel="stylesheet" href="css/vendor/plugins/flag-icon-css/flag-icon.css?version=<?=$version?>">
+<!-- End Stylesheets VENDOR -->
+
+<!-- Stylesheets Pensare -->
+<link rel="stylesheet" href="css/correction.css?version=<?=$version?>">
+<link rel="stylesheet" href="css/menu.css?version=<?=$version?>">
+<link rel="stylesheet" href="css/main.css?version=<?=$version?>">
+
+<!-- End Stylesheets Pensare -->
+    
\ No newline at end of file
diff --git a/app/Views/partials/_fonts.php b/app/Views/partials/_fonts.php
new file mode 100644
index 0000000..f92fc7d
--- /dev/null
+++ b/app/Views/partials/_fonts.php
@@ -0,0 +1,5 @@
+<link rel="stylesheet" href="fonts/weather-icons/weather-icons.css">
+<link rel="stylesheet" href="fonts/web-icons/web-icons.min.css">
+<link rel="stylesheet" href="fonts/brand-icons/brand-icons.min.css">
+<link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Roboto:300,400,500,300italic'>
+    
\ No newline at end of file
diff --git a/app/Views/partials/_js.php b/app/Views/partials/_js.php
new file mode 100644
index 0000000..7448535
--- /dev/null
+++ b/app/Views/partials/_js.php
@@ -0,0 +1,87 @@
+<!-- Core  -->
+<!--<script src="js/vendor/babel-external-helpers/babel-external-helpers.js"></script>-->
+<!--<script src="js/vendor/jquery/jquery.js"></script>-->
+
+<script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
+<script src="js/vendor/Knockout.min.js"></script>
+<script src="js/vendor/jquery-ui/jquery-ui.js"></script>
+<script src="js/vendor/jquery-ui/knockout-jqueryui.min.js"></script>
+<script src="js/vendor/popper-js/umd/popper.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+<!--<script src="js/vendor/bootstrap/bootstrap.js"></script>-->
+<script src="js/vendor/animsition/animsition.js"></script>
+
+<script src="js/vendor/froala/js/froala_editor.min.js"></script>
+<script src="js/vendor/froala/js/plugins/knockout-froala.js"></script>
+
+<?php if($_ENV['ENVIRONMENT'] == 'development'): ?>
+<script src="js/vendor/vue.js"></script>
+<?php else: ?>
+<script src="js/vendor/vue.min.js"></script>
+<?php endif; ?>
+
+
+<script src="js/vendor/Chart.js"></script>
+<script src="js/vendor/lodash.js"></script>
+
+<!-- DBOIS -->
+
+
+<script src="js/lib/main.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+<script src="js/lib/helpers.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/specials/tellmeModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+
+<!-- ***********DATASERVICES************* -->
+<script src="js/lib/dataservices/dashboardDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/pageDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/userDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/customerDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/externalDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/rolesDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/offerDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/commentsDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/documentsDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/projectsDataservice.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/vatDataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/employeehoursDataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/reportsDataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/invoiceDataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/reservationsDataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/employeeTargetDataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/dataservices/authorisationdataService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+<!-- ***********MODULES************* -->
+<script src="js/lib/modules/dashboard/dashboardModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/menuModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/beheer/usersModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/beheer/customersModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/beheer/externalsModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/beheer/vatModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/beheer/authorisationVue.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/projects/offersModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/projects/projectsModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/projects/employeehoursModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/reports/monthlyEmployeeHoursModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/reports/employeeHours.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/reports/invoicereport.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/reports/reservations.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modules/beheer/backupdbModule.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+<!-- ***********MODALS************* -->
+
+<script src="js/lib/modals/userModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modals/customerModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modals/externalModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modals/offerModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modals/projectModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modals/commentModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+<script src="js/lib/modals/employeeTargetModal.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+<!-- ***********MODALS************* -->
+<script src="js/lib/services/offersService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+<script src="js/lib/services/chartService.js?v=<?= APP_VERSION ?? '1.0.81' ?>"></script>
+
+
diff --git a/app/Views/partials/_modals.php b/app/Views/partials/_modals.php
new file mode 100644
index 0000000..deed929
--- /dev/null
+++ b/app/Views/partials/_modals.php
@@ -0,0 +1,12 @@
+<?php
+
+echo view('modals/user_modal');
+echo view('modals/customer_modal');
+echo view('modals/external_modal');
+echo view('modals/offer_modal');
+echo view('modals/project_modal');
+echo view('modals/comment_modal');
+echo view('modals/employeetarget_modal');
+
+echo view('specials/tellme_modal');
+echo view('specials/upload_modal');
diff --git a/app/Views/partials/_navbar-left.php b/app/Views/partials/_navbar-left.php
new file mode 100644
index 0000000..1250f1d
--- /dev/null
+++ b/app/Views/partials/_navbar-left.php
@@ -0,0 +1,31 @@
+<nav id="sidebar">
+    <div class="sidebar-header">
+        <img src="css/images/logo_dbo.png" width="200"/>
+    </div>
+
+    <ul class="list-unstyled components">
+        <p>MENU</p>
+
+        <?php foreach ( $pages as $page ): ?>
+            <?php if ( count( $page->subpages ) == 0 ): ?>
+                <li class="active" data-bind="click:setPage.bind($data, '<?= $page->pageurl ?>')">
+                    <a href="#"><?= $page->pagename ?></a>
+                </li>
+            <?php else: ?>
+                <li>
+                    <a href="#<?= $page->pageurl ?>" data-toggle="collapse" aria-expanded="false">
+                        <?= $page->pagename ?>
+                    </a>
+                    <ul class="collapse list-unstyled" id="<?= $page->pageurl ?>">
+                        <?php foreach ( $page->subpages as $subpage ): ?>
+                        <li data-bind="click:setPage.bind($data, '<?= $subpage->pageurl ?>'),
+                                        css:{'selected-page':<?= $subpage->pageurl ?>()}">
+                            <a href="#"><?= $subpage->pagename ?></a>
+                        </li>
+                        <?php endforeach; ?>
+                    </ul>
+                </li>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    </ul>
+</nav>
\ No newline at end of file
diff --git a/app/Views/partials/_topmenu.php b/app/Views/partials/_topmenu.php
new file mode 100644
index 0000000..13bf616
--- /dev/null
+++ b/app/Views/partials/_topmenu.php
@@ -0,0 +1,3 @@
+<nav class="site-navbar navbar navbar-default navbar-fixed-top navbar-mega navbar-inverse">
+    <a class="navbar-brand" href="#">Navbar</a>
+</nav>
\ No newline at end of file
diff --git a/app/Views/reports/employeehours/employeemonthhours_view.php b/app/Views/reports/employeehours/employeemonthhours_view.php
new file mode 100644
index 0000000..d3d6a49
--- /dev/null
+++ b/app/Views/reports/employeehours/employeemonthhours_view.php
@@ -0,0 +1,70 @@
+<div class="row">
+    <div class="col-md-12">
+        <table class="table table-condensed" style="font-size:.8em;">
+            <thead>
+            <tr>
+                <th class="rotate"><div><span>medewerker</span></div></th>
+                <th class="rotate"><div><span>uren declarabel</span></div></th>
+                <th class="rotate"><div><span>uren niet declarabel</span></div></th>
+                <th class="rotate"><div><span>uren indirect</span></div></th>
+                <th class="rotate"><div><span>totaal bestede uren</span></div></th>
+                <th class="rotate"><div><span>uren jaartarget</span></div></th>
+                <th class="rotate"><div><span>aandeel uren besteed tov target</span></div></th>
+                <th class="rotate"><div><span>percentage declarable<br />tov totaal</span></div></th>
+                <th class="rotate"><div><span>bezettingsgraad t.o.v. target<br />factureerbare uren</span></div></th>
+                <th class="rotate"><div><span>omzet</span></div></th>
+                <th class="rotate"><div><span>gemiddeld tarief</span></div></th>
+            </tr>
+            </thead>
+            <tbody>
+            <!-- ko foreach:employees -->
+            <tr>
+                <td><span data-bind="text:fullname"></span></td>
+                <td class="align-right"><span data-bind="text:profitablehours"></span></td>
+                <td class="align-right"><span data-bind="text:nonprofitablehours"></span></td>
+                <td class="align-right"><span data-bind="text:nonprojecthours"></span></td>
+                <td class="align-right"><span data-bind="text:totalhours"></span></td>
+                <td class="align-right"><span data-bind="text:target"></span></td>
+                <td class="align-right"><span data-bind="text:occupancyRateTotal"></span>%</td>
+                <td class="align-right"><span data-bind="text:occupancyRateHours"></span>%</td>
+                <td class="align-right"><span data-bind="text:occupancyRateInvoice"></span>%</td>
+                <td class="align-right"><i class="icon fa-euro"></i> <span data-bind="text:revenues"></span></td>
+                <td class="align-right"><i class="icon fa-euro"></i> <span data-bind="text:averageDayRate"></span></td>
+            </tr>
+            <!-- /ko -->
+            </tbody>
+            <tfoot>
+            <th><span>totaal</span></th>
+            <th class="align-right"><span data-bind="text:profitablehoursTotaal"></span></th>
+            <th class="align-right"><span data-bind="text:nonprofitablehoursTotaal"></span></th>
+            <th class="align-right"><span data-bind="text:nonprojecthoursTotaal"></span></th>
+            <th class="align-right"><span data-bind="text:totalhoursTotaal"></span></th>
+            <th class="align-right"><span data-bind="text:targetTotaal"></span></th>
+            <th class="align-right"><span data-bind="text:occupancyRateTotalTotaal"></span>%</th>
+            <th class="align-right"><span data-bind="text:occupancyRateHoursTotaal"></span>%</th>
+            <th class="align-right"><span data-bind="text:occupancyRateInvoiceTotaal"></span>%</th>
+            <th class="align-right"><i class="icon fa-euro"></i> <span data-bind="text:revenuesTotaal"></span></th>
+            <th class="align-right"><i class="icon fa-euro"></i> <span data-bind="text:averageDayRateTotaal"></span></th>
+            </tfoot>
+        </table>
+    </div>
+</div>
+<!--<div class="row">-->
+<!--    <div class="col-md-3">-->
+<!--        <div  class="graph-holder" style="min-height:350px">-->
+<!--            <canvas id="hours-per-month" width="300"></canvas>-->
+<!--            <div id="hours-per-month-legends"></div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="col-md-3">-->
+<!--        <div  class="graph-holder" style="min-height:350px">-->
+<!--            <canvas id="revenues-per-month" width="300"></canvas>-->
+<!--            <div id="revenues-per-month-legends"></div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="col-md-6">-->
+<!--        <div  class="graph-holder" style="min-height:350px">-->
+<!--            <canvas id="average-rate" width="300"></canvas>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
\ No newline at end of file
diff --git a/app/Views/reports/invoices/contractors_report.php b/app/Views/reports/invoices/contractors_report.php
new file mode 100644
index 0000000..593b05d
--- /dev/null
+++ b/app/Views/reports/invoices/contractors_report.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by Pensare Software.
+ * User: Theo Weijmer
+ * Date: 29/07/2018
+ * Time: 13:21
+ */
\ No newline at end of file
diff --git a/app/Views/reports/invoices/invoiceforecast_report.php b/app/Views/reports/invoices/invoiceforecast_report.php
new file mode 100644
index 0000000..b9d264c
--- /dev/null
+++ b/app/Views/reports/invoices/invoiceforecast_report.php
@@ -0,0 +1,63 @@
+<table class="table table-condensed" style="font-size:0.8em;">
+    <thead>
+    <tr>
+		<th class="rotate">
+			<div class="pointer">
+                <span data-bind="click:sortList.bind($data, 'projectnumber')">
+                    projectnummer
+                </span>
+			</div>
+		</th>
+		<th class="rotate">
+			<div><span>project</span></div>
+		</th>
+        <th class="rotate">
+            <div><span>klant</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te factureren<br />incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te factureren<br />lopend boekjaar incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te factureren<br /> na lopend boekjaar incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te prognotiseren<br />incl. btw</span></div>
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <!-- ko foreach: forecasts  -->
+    <tr>
+		<td><span data-bind="text:projectnumber"></span></td>
+		<td><span data-bind="text:projectname"></span></td>
+        <td><span data-bind="text:customer"></span></td>
+        <td class="align-right"><span data-bind="text:needInvoice"></span></td>
+        <td class="align-right"><span data-bind="text:forecastThisYear"></span></td>
+        <td class="align-right"><span data-bind="text:forecastOtherYears"></span></td>
+        <td class="align-right focus-green"><span data-bind="text:forecastRemaining"></span></td>
+    </tr>
+    <!-- /ko -->
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3" class="align-right">
+            totaal
+        </th>
+        <th class="align-right">
+            <span data-bind="text:needInvoice"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:forecastThisYear"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:forecastOtherYears"></span>
+        </th>
+        <th class="align-right focus-green">
+            <span data-bind="text:forecastRemaining"></span>
+        </th>
+    </tr>
+    </tfoot>
+</table>
diff --git a/app/Views/reports/invoices/invoiceoverview_report.php b/app/Views/reports/invoices/invoiceoverview_report.php
new file mode 100644
index 0000000..d409f03
--- /dev/null
+++ b/app/Views/reports/invoices/invoiceoverview_report.php
@@ -0,0 +1,91 @@
+<table class="table table-condensed" style="font-size:0.8em;">
+    <thead>
+    <tr>
+        <th class="rotate">
+            <div class="pointer">
+                <span data-bind="click:sortList.bind($data, 'projectnumber')">
+                    projectnummer
+                </span>
+            </div>
+        </th>
+        <th class="rotate">
+            <div><span>project</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>klant</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Totaal te factureren<br />excl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Totaal te factureren<br />incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Gefactureerd overige jaren<br />incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Gefactureerd lopende boekjaar<br />incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Gefactureerd totaal<br />incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Betaald incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>gefactureerd niet betaald<br />incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te factureren<br />incl. btw</span></div>
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <!-- ko foreach: invoiceOverview  -->
+    <tr>
+        <td><span data-bind="text:projectnumber"></span></td>
+        <td><span data-bind="text:projectname"></span></td>
+        <td><span data-bind="text:customer"></span></td>
+        <td class="align-right"><span data-bind="text:totalToInvoicingExcl"></span></td>
+        <td class="align-right"><span data-bind="text:totalToInvoicingIncl"></span></td>
+        <td class="align-right"><span data-bind="text:totalInvoicedOtherYears"></span></td>
+        <td class="align-right"><span data-bind="text:totalInvoicedThisYear"></span></td>
+        <td class="align-right"><span data-bind="text:invoicesTotal"></span></td>
+        <td class="align-right"><span data-bind="text:projectPayment"></span></td>
+        <td class="align-right"><span data-bind="text:invoiceToPay"></span></td>
+        <td class="align-right focus-green"><span data-bind="text:needInvoice"></span></td>
+    </tr>
+    <!-- /ko -->
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3" class="align-right">
+            totaal
+        </th>
+        <th class="align-right">
+            <span data-bind="text:totalToInvoicingExcl"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:totalToInvoicingIncl"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:totalInvoicedOtherYears"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:totalInvoicedThisYear"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:invoicesTotal"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:totalPayment"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:totalToPay"></span>
+        </th>
+        <th class="align-right focus-green">
+            <span data-bind="text:needInvoice"></span>
+        </th>
+    </tr>
+    </tfoot>
+</table>
\ No newline at end of file
diff --git a/app/Views/reports/invoices/invoices_report.php b/app/Views/reports/invoices/invoices_report.php
new file mode 100644
index 0000000..79849ae
--- /dev/null
+++ b/app/Views/reports/invoices/invoices_report.php
@@ -0,0 +1,80 @@
+<div class="row">
+	<div class="col-xs-12">
+		<table class="table table-striped table-condensed">
+			<thead>
+			<tr>
+				<th>
+					<div class="pointer">
+						<span data-bind="click:sortList.bind($data, 'projectnumber')">
+							projectnummer
+						</span>
+					</div>
+				</th>
+				<th>
+					factuurnummer
+				</th>
+				<th>
+					project
+				</th>
+				<th>
+					klant
+				</th>
+				<th>
+					factuur datum
+				</th>
+				<th>
+					excl btw
+				</th>
+				<th>
+					btw
+				</th>
+				<th>
+					incl btw
+				</th>
+			</tr>
+			</thead>
+			<tbody data-bind="foreach:invoiced">
+			<tr>
+				<td>
+					<span data-bind="text:projectnumber"></span>
+				</td>
+				<td>
+					<span data-bind="text:invoicenumber"></span>
+				</td>
+				<td>
+					<span data-bind="text:project"></span>
+				</td>
+				<td>
+					<span data-bind="text:name"></span>
+				</td>
+				<td>
+					<span data-bind="text:invoicedate"></span>
+				</td>
+				<td class="align-right">
+					<span data-bind="text:invoiceamount"></span>
+				</td>
+				<td class="align-right">
+					<span data-bind="text:vat"></span>
+				</td>
+				<td class="align-right">
+					<span data-bind="text:inclVat"></span>
+				</td>
+			</tr>
+			</tbody>
+			<tfoot>
+			<tr>
+				<th colspan="5" class="align-right">Totaal</th>
+				<th class="align-right">
+					<span data-bind="text:totalInvoiced"></span>
+				</th>
+				<th class="align-right">
+					<span data-bind="text:totalVat"></span>
+				</th>
+				<th class="align-right">
+					<span data-bind="text:totalInclVat"></span>
+				</th>
+			</tr>
+			</tfoot>
+		</table>
+	</div>
+</div>
diff --git a/app/Views/reports/invoices/monthforecast_report.php b/app/Views/reports/invoices/monthforecast_report.php
new file mode 100644
index 0000000..b5298f3
--- /dev/null
+++ b/app/Views/reports/invoices/monthforecast_report.php
@@ -0,0 +1,69 @@
+<table class="table table-condensed" style="font-size:0.8em;">
+    <thead>
+    <tr>
+		<th class="rotate">
+			<div class="pointer">
+                <span data-bind="click:sortList.bind($data, 'projectnumber')">
+                    projectnummer
+                </span>
+			</div>
+		</th>
+        <th class="rotate">
+            <div><span>project</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>klant</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te factureren<br />incl. btw</span></div>
+        </th>
+        <!-- ko foreach:months -->
+            <th class="rotate">
+                <div><span data-bind="text:month"></span></div>
+            </th>
+        <!-- /ko -->
+        <th class="rotate">
+            <div><span>Nog te factureren<br /> overige boekjaren incl. btw</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Nog te prognotiseren<br />incl. btw</span></div>
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <!-- ko foreach: monthForecasts  -->
+    <tr>
+		<td><span data-bind="text:projectnumber"></span></td>
+		<td><span data-bind="text:projectname"></span></td>
+        <td><span data-bind="text:customer"></span></td>
+        <td class="align-right focus-green"><span data-bind="text:needInvoice"></span></td>
+        <!-- ko foreach : forecastMonths -->
+        <td class="align-right"><span data-bind="text:forecastamount"></span></td>
+        <!-- /ko -->
+        <td class="align-right"><span data-bind="text:forecastOtherYears"></span></td>
+        <td class="align-right focus-green"><span data-bind="text:forecastRemaining"></span></td>
+    </tr>
+    <!-- /ko -->
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3" class="align-right">
+
+        </th>
+        <th class="align-right focus-green">
+            <span data-bind="text:needInvoice"></span>
+        </th>
+        <!-- ko foreach:monthTotals -->
+            <th class="align-right">
+                <span data-bind="text:forecastamount()"></span>
+            </th>
+        <!-- /ko -->
+        <th class="align-right">
+            <span data-bind="text:forecastOtherYears"></span>
+        </th>
+        <th class="align-right focus-green">
+            <span data-bind="text:forecastRemaining"></span>
+        </th>
+    </tr>
+    </tfoot>
+</table>
diff --git a/app/Views/reports/invoices/monthpayment_report.php b/app/Views/reports/invoices/monthpayment_report.php
new file mode 100644
index 0000000..3439c61
--- /dev/null
+++ b/app/Views/reports/invoices/monthpayment_report.php
@@ -0,0 +1,55 @@
+<table class="table table-condensed" style="font-size:0.8em;">
+    <thead>
+    <tr>
+		<th class="rotate">
+			<div class="pointer">
+                <span data-bind="click:sortList.bind($data, 'projectnumber')">
+                    projectnummer
+                </span>
+			</div>
+		</th>
+        <th class="rotate">
+            <div><span>project</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>klant</span></div>
+        </th>
+        <!-- ko foreach:months -->
+        <th class="rotate">
+            <div><span data-bind="text:month"></span></div>
+        </th>
+        <!-- /ko -->
+        <th class="rotate">
+            <div><span>Totaal betaald<br />lopend boekjaar incl. btw</span></div>
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <!-- ko foreach: monthPayments  -->
+    <tr>
+		<td><span data-bind="text:projectnumber"></span></td>
+		<td><span data-bind="text:projectname"></span></td>
+        <td><span data-bind="text:customer"></span></td>
+        <!-- ko foreach : paymentMonths -->
+        <td class="align-right"><span data-bind="text:paymentamount"></span></td>
+        <!-- /ko -->
+        <td class="align-right focus-green"><span data-bind="text:totalProjectPayments"></span></td>
+    </tr>
+    <!-- /ko -->
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3" class="align-right">
+            totaal
+        </th>
+        <!-- ko foreach:monthPaymentTotals -->
+        <th class="align-right">
+            <span data-bind="text:paymentamount"></span>
+        </th>
+        <!-- /ko -->
+        <th class="align-right focus-green">
+            <span data-bind="text:totalProjectPayments"></span>
+        </th>
+    </tr>
+    </tfoot>
+</table>
diff --git a/app/Views/reports/monthlyemployeehours/_employeehour_view.php b/app/Views/reports/monthlyemployeehours/_employeehour_view.php
new file mode 100644
index 0000000..3993d37
--- /dev/null
+++ b/app/Views/reports/monthlyemployeehours/_employeehour_view.php
@@ -0,0 +1,148 @@
+<div class="row">
+    <div class="col-md-12">
+        <h2 style="margin-top:0">uren per project</h2>
+        <table class="table table-condensed table-bordered">
+            <thead>
+            <tr class="table-info">
+                <th class="table-header-blue">project</th>
+                <th class="align-right table-header-blue">tarief</th>
+                <th class="align-right table-header-blue">jan</th>
+                <th class="align-right table-header-blue">feb</th>
+                <th class="align-right table-header-blue">mrt</th>
+                <th class="align-right table-header-blue">apr</th>
+                <th class="align-right table-header-blue">mei</th>
+                <th class="align-right table-header-blue">juni</th>
+                <th class="align-right table-header-blue">juli</th>
+                <th class="align-right table-header-blue">aug</th>
+                <th class="align-right table-header-blue">sep</th>
+                <th class="align-right table-header-blue">okt</th>
+                <th class="align-right table-header-blue">nov</th>
+                <th class="align-right table-header-blue">dec</th>
+                <th class="align-right table-header-blue">tot jaar</th>
+                <th class="align-right table-header-blue">tot overig</th>
+                <th class="align-right table-header-blue">grand total</th>
+            </tr>
+            </thead>
+            <tbody data-bind="foreach:myData">
+            <tr>
+                <td>
+                    <span data-bind="text:projectname"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:tarif"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:januari"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:februari"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:maart"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:april"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:mei"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:juni"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:juli"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:augustus"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:september"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:oktober"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:november"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:december"></span>
+                </td>
+                <th class="align-right">
+                    <span data-bind="text:totalyear"></span>
+                </th>
+                <th class="align-right">
+                    <span data-bind="text:totalotheryears"></span>
+                </th>
+                <th class="align-right">
+                    <span data-bind="text:totalhours"></span>
+                </th>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr class="table-info">
+                <th class="table-header-blue">totaal</th>
+                <th class="table-header-blue">&nbsp;</th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalJanuari "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalFebruari "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalMaart "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalApril "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalMei "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalJuni "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalJuli "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalAugustus"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalSeptember "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalOktober "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalNovember "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalDecember "></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalTotal().toFixed(1)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalTotalOtheryears().toFixed(1)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:(totalTotalOtheryears() + totalTotal()).toFixed(1)"></span>
+                </th>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
+<!--<div class="row">-->
+<!--    <div class="col-md-6">-->
+<!--        <div class="graph-holder">-->
+<!--            <canvas data-bind="attr:{id: 'hours-per-month-' + slug}" id="" height="300"></canvas>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="col-md-6">-->
+<!--        <div class="graph-holder">-->
+<!--            <canvas data-bind="attr:{id: 'hours-per-project-' + slug}" id="" height="300"></canvas>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
+
+
diff --git a/app/Views/reports/monthlyemployeehours/_employeerevenue_view.php b/app/Views/reports/monthlyemployeehours/_employeerevenue_view.php
new file mode 100644
index 0000000..758d32a
--- /dev/null
+++ b/app/Views/reports/monthlyemployeehours/_employeerevenue_view.php
@@ -0,0 +1,146 @@
+<div class="row">
+    <div class="col-md-12">
+        <h2 style="margin-top:0">omzet per project</h2>
+        <table class="table table-condensed table-bordered">
+            <thead>
+            <tr class="table-info">
+                <th class="table-header-blue">project</th>
+                <th class="align-right table-header-blue">tarief</th>
+                <th class="align-right table-header-blue">jan</th>
+                <th class="align-right table-header-blue">feb</th>
+                <th class="align-right table-header-blue">mrt</th>
+                <th class="align-right table-header-blue">apr</th>
+                <th class="align-right table-header-blue">mei</th>
+                <th class="align-right table-header-blue">juni</th>
+                <th class="align-right table-header-blue">juli</th>
+                <th class="align-right table-header-blue">aug</th>
+                <th class="align-right table-header-blue">sep</th>
+                <th class="align-right table-header-blue">okt</th>
+                <th class="align-right table-header-blue">nov</th>
+                <th class="align-right table-header-blue">dec</th>
+                <th class="align-right table-header-blue">tot jaar</th>
+                <th class="align-right table-header-blue">tot overig</th>
+                <th class="align-right table-header-blue">grand total</th>
+            </tr>
+            </thead>
+            <tbody data-bind="foreach:myData">
+            <tr>
+                <td>
+                    <span data-bind="text:projectname"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:tarif"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:januariRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:februariRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:maartRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:aprilRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:meiRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:juniRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:juliRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:augustusRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:septemberRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:oktoberRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:novemberRevenue.toFixed(0)"></span>
+                </td>
+                <td class="align-right">
+                    <span data-bind="text:decemberRevenue.toFixed(0)"></span>
+                </td>
+                <th class="align-right">
+                    <span data-bind="text:totalyearRevenue.toFixed(0)"></span>
+                </th>
+                <th class="align-right">
+                    <span data-bind="text:totalotheryearsRevenue.toFixed(0)"></span>
+                </th>
+                <th class="align-right">
+                    <span data-bind="text:totalhoursRevenue.toFixed(0)"></span>
+                </th>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr class="table-info">
+                <th class="table-header-blue">totaal</th>
+                <th class="table-header-blue">&nbsp;</th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalJanuariRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalFebruariRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalMaartRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalAprilRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalMeiRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalJuniRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalJuliRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalAugustusRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalSeptemberRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalOktoberRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalNovemberRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalDecemberRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalTotalRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:totalTotalOtheryearsRevenue().toFixed(0)"></span>
+                </th>
+                <th class="align-right table-header-blue">
+                    <span data-bind="text:(totalTotalOtheryearsRevenue() + totalTotalRevenue()).toFixed(0)"></span>
+                </th>
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
+<!--<div class="row">-->
+<!--    <div class="col-md-6">-->
+<!--        <div class="graph-holder">-->
+<!--            <canvas data-bind="attr:{id: 'revenue-per-month-' + slug}" height="300"></canvas>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="col-md-6">-->
+<!--        <div class="graph-holder">-->
+<!--            <canvas data-bind="attr:{id: 'revenue-per-project-' + slug}" height="300"></canvas>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
diff --git a/app/Views/reports/monthlyemployeehours/euro_view.php b/app/Views/reports/monthlyemployeehours/euro_view.php
new file mode 100644
index 0000000..edf2c64
--- /dev/null
+++ b/app/Views/reports/monthlyemployeehours/euro_view.php
@@ -0,0 +1,116 @@
+<table class="table" style="font-size:.8em;">
+    <thead>
+    <tr>
+        <th class="rotate sorting-field">
+            <div data-bind="click:setSorting.bind($data, 'projectnumber')">
+				<span>projectnummer</span>
+			</div>
+        </th>
+        <th class="rotate">
+            <div><span>instroom</span></div>
+        </th>
+        <th class="rotate sorting-field">
+            <div data-bind="click:setSorting.bind($data, 'projectname')">
+				<span>naam</span>
+			</div>
+        </th>
+        <th class="rotate sorting-field">
+            <div data-bind="click:setSorting.bind($data, 'CUS.name')">
+				<span>opdrachtgever</span>
+			</div>
+        </th>
+        <!-- ko foreach: uniqueEmployees -->
+        <th class="rotate">
+            <div><span data-bind="text:fullname"></span></div>
+        </th>
+        <!-- /ko -->
+        <th class="rotate">
+            <div><span>eigen tarief omzet (ex btw)</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>totaal geschreven omzet</span></div>
+        </th>
+<!--        <th class="rotate">-->
+<!--            <div><span>derden (ex btw)</span></div>-->
+<!--        </th>-->
+<!--        <th class="rotate">-->
+<!--            <div><span>beschikbaar</span></div>-->
+<!--        </th>-->
+        <th class="rotate">
+            <div><span>saldo</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>OWP</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Lopend boekjaar</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>Volgende boekjaren</span></div>
+        </th>
+    </tr>
+	<tr>
+		<th class="align-right" colspan="4">totaal</th>
+		<!-- ko foreach: totalPerEmployee -->
+		<th class="align-right">
+			<span data-bind="text:totalRevenue"></span>
+		</th>
+		<!-- /ko -->
+		<th class="align-right">
+			<span data-bind="text:totalOwnRevenue"></span>
+		</th>
+		<th class="align-right">
+			<span data-bind="text:totalEmployeeRevenues"></span>
+		</th>
+		<th class="align-right">
+			<span data-bind="text:totalAvailableRevenues"></span>
+		</th>
+		<th class="align-right">
+			<span data-bind="text:totalOwp"></span>
+		</th>
+		<th class="align-right">
+			<span data-bind="text:totalCurrentFinancialYear"></span>
+		</th>
+		<th class="align-right">
+			<span data-bind="text:totalNextFinancialYear"></span>
+		</th>
+	</tr>
+    </thead>
+    <tbody data-bind="foreach:recap">
+    <tr>
+        <td><span data-bind="text:projectnumber"></span></td>
+        <td><span data-bind="text:instroom"></span></td>
+        <td><span data-bind="text:projectname"></span></td>
+        <td><span data-bind="text:name"></span></td>
+        <!-- ko foreach: employees -->
+        <td class="align-right">
+            <span data-bind="text:revenues"></span>
+        </td>
+        <!-- /ko -->
+        <td class="align-right">
+            <span data-bind="text:ownRevenue"></span>
+        </td>
+        <td class="align-right">
+            <span data-bind="text:totalEmployeeRevenues"></span>
+        </td>
+        <th class="align-right">
+            <span data-bind="text:availableRevenue"></span>
+        </th>
+        <th class="align-right">
+            <span data-bind="text:owp"></span>
+        </th>
+        <td width="100px">
+            <input class="form-control form-control-xsm align-right"
+                   data-bind="textInput:currentFinancialYear,
+                            event:{keyup:$root.saveCurrentFinancialYear},
+                            css:{'red-border': ! pristine()}"/>
+        </td>
+        <td class="align-right">
+            <span data-bind="text:nextFinancialYears"></span>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>
+
diff --git a/app/Views/reports/monthlyemployeehours/hours_view.php b/app/Views/reports/monthlyemployeehours/hours_view.php
new file mode 100644
index 0000000..f889572
--- /dev/null
+++ b/app/Views/reports/monthlyemployeehours/hours_view.php
@@ -0,0 +1,89 @@
+<table class="table" style="font-size:.8em;">
+    <thead>
+    <tr>
+        <th class="rotate">
+            <div data-bind="click:setSorting.bind($data, 'projectnumber')">
+				<span>projectnummer</span>
+			</div>
+        </th>
+        <th class="rotate">
+            <div><span>instroom</span></div>
+        </th>
+        <th class="rotate">
+            <div><span>uitstroom</span></div>
+        </th>
+        <th class="rotate">
+            <div data-bind="click:setSorting.bind($data, 'projectname')">
+				<span>naam</span>
+			</div>
+        </th>
+        <th class="rotate">
+            <div data-bind="click:setSorting.bind($data, 'CUS.name')">
+				<span>opdrachtgever</span>
+			</div>
+        </th>
+        <!-- ko foreach: uniqueEmployees -->
+        <th class="rotate">
+            <div><span data-bind="text:fullname + ' geschreven'"></span></div>
+        </th>
+        <!-- /ko -->
+        <th class="rotate">
+            <div><span>totaal fact. uren gerealisserd</span></div>
+        </th>
+        <!-- ko foreach: uniqueEmployees -->
+        <th class="rotate">
+            <div><span data-bind="text:fullname + ' beschikbaar'"></span></div>
+        </th>
+        <!-- /ko -->
+        <th class="rotate">
+            <div><span>totaal beschikbare uren</span></div>
+        </th>
+    </tr>
+	<tr>
+		<th class="align-right" colspan="5">totaal</th>
+		<!-- ko foreach: totalPerEmployee -->
+		<th class="align-right">
+			<span data-bind="text:totalHours"></span>
+		</th>
+		<!-- /ko -->
+		<th class="align-right">
+			<span data-bind="text:totalEmployeeHours"></span>
+		</th>
+		<!-- ko foreach: totalPerEmployee -->
+		<th class="align-right">
+			<span data-bind="text:totalAvailableHours"></span>
+		</th>
+		<!-- /ko -->
+		<th class="align-right">
+			<span data-bind="text:totalEmployeeAvailableHours"></span>
+		</th>
+	</tr>
+    </thead>
+    <tbody data-bind="foreach:recap">
+    <tr>
+        <td><span data-bind="text:projectnumber"></span></td>
+        <td><span data-bind="text:instroom"></span></td>
+        <td><span data-bind="text:uitstroom ? uitstroom : ''"></span></td>
+        <td><span data-bind="text:projectname"></span></td>
+        <td><span data-bind="text:name"></span></td>
+        <!-- ko foreach: employees -->
+        <td class="align-right">
+            <span data-bind="text:hours"></span>
+        </td>
+        <!-- /ko -->
+        <th class="align-right">
+            <span data-bind="text:totalEmployeeHours"></span>
+        </th>
+        <!-- ko foreach: employees -->
+        <td class="align-right">
+            <span data-bind="text:availableHours"></span>
+        </td>
+        <!-- /ko -->
+        <td class="align-right">
+            <span data-bind="text:hoursAvailable"></span>
+        </td>
+    </tr>
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>
diff --git a/app/Views/specials/tellme_modal.php b/app/Views/specials/tellme_modal.php
new file mode 100644
index 0000000..9d60f46
--- /dev/null
+++ b/app/Views/specials/tellme_modal.php
@@ -0,0 +1,28 @@
+<div class="modal modal-3d-flip-vertical" tabindex="-1" role="dialog" id="tell-me" data-bind="css:modalClass">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" data-bind="text:title">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                </h5>
+            </div>
+            <div class="modal-body">
+                <p data-bind="html:message"></p>
+            </div>
+            <div class="modal-footer">
+                <!-- ko if : notify() -->
+                <button type="button" class="btn btn-primary"
+                        data-bind="text:yesText, click:closeYes"></button>
+                <button type="button" class="btn btn-secondary"
+                        data-bind="text:noText, click:closeNo"></button>
+                <!-- /ko -->
+                <!-- ko if : ! notify() -->
+                <button type="button" class="btn btn-primary" data-dismiss="modal"
+                        data-bind="click:closeOk">OK</button>
+                <!-- /ko -->
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Views/specials/upload_modal.php b/app/Views/specials/upload_modal.php
new file mode 100644
index 0000000..339604a
--- /dev/null
+++ b/app/Views/specials/upload_modal.php
@@ -0,0 +1,20 @@
+<div class="modal fade modal-primary" tabindex="-1" role="dialog"  id="upload-bestand">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="upload file">Uploaden bestand</h4>
+            </div>
+            <div class="modal-body">
+                <div class="upload-btn-wrapper">
+                    <button class="upload-btn">Kies bestand</button>
+                    <input type="file" name="myfile" id="file-chooser" />
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">sluit</button>
+                <button type="button" class="btn btn-primary">uploaden</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
\ No newline at end of file
diff --git a/app/Views/underconstruction.php b/app/Views/underconstruction.php
new file mode 100644
index 0000000..7722fcf
--- /dev/null
+++ b/app/Views/underconstruction.php
@@ -0,0 +1,79 @@
+<!doctype html>
+<html lang="en-US">
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<style>
+		@import url(http://fonts.googleapis.com/css?family=Roboto);
+		*
+		{
+			font-family: 'Roboto' , sans-serif;
+		}
+		body
+		{
+			background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMC8yOS8xMiKqq3kAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzVxteM2AAABHklEQVRIib2Vyw6EIAxFW5idr///Qx9sfG3pLEyJ3tAwi5EmBqRo7vHawiEEERHS6x7MTMxMVv6+z3tPMUYSkfTM/R0fEaG2bbMv+Gc4nZzn+dN4HAcREa3r+hi3bcuu68jLskhVIlW073tWaYlQ9+F9IpqmSfq+fwskhdO/AwmUTJXrOuaRQNeRkOd5lq7rXmS5InmERKoER/QMvUAPlZDHcZRhGN4CSeGY+aHMqgcks5RrHv/eeh455x5KrMq2yHQdibDO6ncG/KZWL7M8xDyS1/MIO0NJqdULLS81X6/X6aR0nqBSJcPeZnlZrzN477NKURn2Nus8sjzmEII0TfMiyxUuxphVWjpJkbx0btUnshRihVv70Bv8ItXq6Asoi/ZiCbU6YgAAAABJRU5ErkJggg==);
+		}
+		.error-template
+		{
+			padding: 40px 15px;
+			text-align: center;
+		}
+		.error-actions
+		{
+			margin-top: 15px;
+			margin-bottom: 15px;
+		}
+		.error-actions .btn
+		{
+			margin-right: 10px;
+		}
+		.message-box h1
+		{
+			color: #252932;
+			font-size: 98px;
+			font-weight: 700;
+			line-height: 98px;
+			text-shadow: rgba(61, 61, 61, 0.3) 1px 1px, rgba(61, 61, 61, 0.2) 2px 2px, rgba(61, 61, 61, 0.3) 3px 3px;
+		}
+	</style>
+</head>
+<body>
+<!------ Include the above in your HEAD tag ---------->
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-6">
+			<div class="error-template">
+				<h1>
+					:) Oops!</h1>
+				<h2>
+					Momenteel wordt aan de site gewerkt</h2>
+				<h1>
+					We zijn snel weer terug</h1>
+				<div>
+					<p>
+						Excuses voor het ongemak maar we zijn momenteel bezig om de appliactie aan te passen, </p>
+					<p>
+						— Grippa Zorg Team</p>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6">
+			<svg class="svg-box" width="380px" height="500px" viewbox="0 0 837 1045" version="1.1"
+				 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+				<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+					<path d="M353,9 L626.664028,170 L626.664028,487 L353,642 L79.3359724,487 L79.3359724,170 L353,9 Z" id="Polygon-1" stroke="#3bafda" stroke-width="6" sketch:type="MSShapeGroup"></path>
+					<path d="M78.5,529 L147,569.186414 L147,648.311216 L78.5,687 L10,648.311216 L10,569.186414 L78.5,529 Z" id="Polygon-2" stroke="#7266ba" stroke-width="6" sketch:type="MSShapeGroup"></path>
+					<path d="M773,186 L827,217.538705 L827,279.636651 L773,310 L719,279.636651 L719,217.538705 L773,186 Z" id="Polygon-3" stroke="#f76397" stroke-width="6" sketch:type="MSShapeGroup"></path>
+					<path d="M639,529 L773,607.846761 L773,763.091627 L639,839 L505,763.091627 L505,607.846761 L639,529 Z" id="Polygon-4" stroke="#00b19d" stroke-width="6" sketch:type="MSShapeGroup"></path>
+					<path d="M281,801 L383,861.025276 L383,979.21169 L281,1037 L179,979.21169 L179,861.025276 L281,801 Z" id="Polygon-5" stroke="#ffaa00" stroke-width="6" sketch:type="MSShapeGroup"></path>
+				</g>
+			</svg>
+		</div>
+	</div>
+</div>
+<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
+<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
+</body>
+</html>
diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
new file mode 100755
index 0000000..a61b4fb
--- /dev/null
+++ b/app/Views/welcome_message.php
@@ -0,0 +1,89 @@
+<?php
+
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>Welcome to CodeIgniter</title>
+
+	<style type="text/css">
+
+	::selection { background-color: #E13300; color: white; }
+	::-moz-selection { background-color: #E13300; color: white; }
+
+	body {
+		background-color: #fff;
+		margin: 40px;
+		font: 13px/20px normal Helvetica, Arial, sans-serif;
+		color: #4F5155;
+	}
+
+	a {
+		color: #003399;
+		background-color: transparent;
+		font-weight: normal;
+	}
+
+	h1 {
+		color: #444;
+		background-color: transparent;
+		border-bottom: 1px solid #D0D0D0;
+		font-size: 19px;
+		font-weight: normal;
+		margin: 0 0 14px 0;
+		padding: 14px 15px 10px 15px;
+	}
+
+	code {
+		font-family: Consolas, Monaco, Courier New, Courier, monospace;
+		font-size: 12px;
+		background-color: #f9f9f9;
+		border: 1px solid #D0D0D0;
+		color: #002166;
+		display: block;
+		margin: 14px 0 14px 0;
+		padding: 12px 10px 12px 10px;
+	}
+
+	#body {
+		margin: 0 15px 0 15px;
+	}
+
+	p.footer {
+		text-align: right;
+		font-size: 11px;
+		border-top: 1px solid #D0D0D0;
+		line-height: 32px;
+		padding: 0 10px 0 10px;
+		margin: 20px 0 0 0;
+	}
+
+	#container {
+		margin: 10px;
+		border: 1px solid #D0D0D0;
+		box-shadow: 0 0 8px #D0D0D0;
+	}
+	</style>
+</head>
+<body>
+
+<div id="container">
+	<h1>Welcome to CodeIgniter!</h1>
+
+	<div id="body">
+		<p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
+
+		<p>If you would like to edit this page you'll find it located at:</p>
+		<code>application/views/welcome_message.php</code>
+
+		<p>The corresponding controller for this page is found at:</p>
+		<code>application/controllers/Welcome.php</code>
+
+		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
+	</div>
+
+	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 6831e11..3383879 100755
--- a/composer.json
+++ b/composer.json
@@ -1,39 +1,49 @@
 {
-	"description": "The CodeIgniter framework",
-	"name": "codeigniter/framework",
-	"type": "project",
-	"homepage": "https://codeigniter.com",
-	"license": "MIT",
-	"support": {
-		"forum": "http://forum.codeigniter.com/",
-		"wiki": "https://github.com/bcit-ci/CodeIgniter/wiki",
-		"slack": "https://codeigniterchat.slack.com",
-		"source": "https://github.com/bcit-ci/CodeIgniter"
-	},
-	"require": {
-		"php": ">=8.0",
-		"vlucas/phpdotenv": "^5.6",
-		"illuminate/database": "v10.48.26",
-		"symfony/var-dumper": "^3.4",
-		"phpoffice/phpspreadsheet": "^3.8"
-	},
-	"autoload": {
-		"classmap": [
-			"application/models/eloquent",
-			"application/models/eloquent/queries",
-			"application/libraries/validation",
-			"application/libraries/reports",
-			"application/libraries/"
-		]
-	},
-	"suggest": {
-		"paragonie/random_compat": "Provides better randomness in PHP 5.x"
-	},
-	"require-dev": {
-	},
-	"config": {
-		"allow-plugins": {
-			"kylekatarnls/update-helper": true
-		}
-	}
+    "name": "dbois/application",
+    "description": "DBOIS Project Management Application on CodeIgniter 4",
+    "type": "project",
+    "license": "MIT",
+    "require": {
+        "php": "^8.1",
+        "codeigniter4/framework": "^4.5",
+        "vlucas/phpdotenv": "^5.6",
+        "illuminate/database": "^10.48",
+        "illuminate/events": "^10.48",
+        "symfony/var-dumper": "^6.0",
+        "phpoffice/phpspreadsheet": "^3.8"
+    },
+    "require-dev": {
+        "fakerphp/faker": "^1.9",
+        "mikey179/vfsstream": "^1.6",
+        "phpunit/phpunit": "^10.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/",
+            "Config\\": "app/Config/"
+        },
+        "classmap": [
+            "app/Models/Eloquent",
+            "app/Models/Eloquent/Queries",
+            "app/Libraries/Validation",
+            "app/Libraries/Reports",
+            "app/Libraries/"
+        ],
+        "files": [
+            "app/Helpers/common_helper.php"
+        ]
+    },
+    "scripts": {
+        "test": "phpunit"
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "allow-plugins": {
+            "kylekatarnls/update-helper": true
+        }
+    },
+    "minimum-stability": "stable",
+    "prefer-stable": true
 }
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..9a99163
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,40 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      args:
+        PHP_VERSION: "8.4"  # Pas aan: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4
+    image: ${PROJECT_NAME:-myproject}-app
+    container_name: ${PROJECT_NAME:-myproject}-app
+    restart: unless-stopped
+    working_dir: /var/www/html
+    volumes:
+      - ./:/var/www/html
+    networks:
+      - app-network
+      - shared-network
+
+  web:
+    image: nginx:alpine
+    container_name: ${PROJECT_NAME:-myproject}-web
+    restart: unless-stopped
+    environment:
+      - VIRTUAL_HOST=${PROJECT_DOMAIN:-myproject.test}
+      - VIRTUAL_PORT=80
+    expose:
+      - "80"
+    volumes:
+      - ./:/var/www/html
+      - ./docker/nginx.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      - app
+    networks:
+      - app-network
+      - shared-network
+
+networks:
+  app-network:
+    driver: bridge
+  shared-network:
+    external: true
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..b9bc7a1
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,55 @@
+ARG PHP_VERSION=8.2
+FROM php:${PHP_VERSION}-fpm
+
+# Install dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libfreetype6-dev \
+    libzip-dev \
+    libonig-dev \
+    libicu-dev \
+    locales \
+    zip \
+    unzip \
+    git \
+    curl \
+    vim \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install PHP extensions
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) \
+        pdo_mysql \
+        mysqli \
+        mbstring \
+        zip \
+        exif \
+        pcntl \
+        gd \
+        intl \
+        opcache
+
+# Install Xdebug
+RUN pecl install xdebug && docker-php-ext-enable xdebug
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Xdebug configuration
+COPY docker/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+
+# PHP configuration
+COPY docker/php.ini /usr/local/etc/php/conf.d/custom.ini
+
+# Add user for application
+RUN groupadd -g 1000 www && useradd -u 1000 -ms /bin/bash -g www www
+
+# Set ownership
+COPY --chown=www:www . /var/www/html
+
+USER www
+
+EXPOSE 9000
+CMD ["php-fpm"]
diff --git a/docker/nginx.conf b/docker/nginx.conf
new file mode 100644
index 0000000..d705757
--- /dev/null
+++ b/docker/nginx.conf
@@ -0,0 +1,41 @@
+server {
+    listen 80;
+    server_name _;
+    
+    # Document root - pas aan indien nodig (bijv. /var/www/html/public voor Laravel-style)
+    root /var/www/html/public;
+    index index.php index.html;
+
+    # Logging
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+
+    # Max upload size
+    client_max_body_size 64M;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass app:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_buffering off;
+    }
+
+    # Deny .ht files
+    location ~ /\.ht {
+        deny all;
+    }
+
+    # Cache static files
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|woff|woff2)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+}
diff --git a/docker/php.ini b/docker/php.ini
new file mode 100644
index 0000000..bad9604
--- /dev/null
+++ b/docker/php.ini
@@ -0,0 +1,8 @@
+[PHP]
+memory_limit = 256M
+upload_max_filesize = 64M
+post_max_size = 64M
+max_execution_time = 300
+error_reporting = E_ALL
+display_errors = On
+display_startup_errors = On
diff --git a/docker/xdebug.ini b/docker/xdebug.ini
new file mode 100644
index 0000000..e1c46fd
--- /dev/null
+++ b/docker/xdebug.ini
@@ -0,0 +1,8 @@
+[xdebug]
+xdebug.mode=debug
+xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
+xdebug.start_with_request=yes
+xdebug.discover_client_host=false
+xdebug.idekey=PHPSTORM
+xdebug.log_level=0
diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000..cbec4d6
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,47 @@
+# Disable directory browsing
+Options All -Indexes
+
+# ----------------------------------------------------------------------
+# Rewrite engine
+# ----------------------------------------------------------------------
+
+<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 ^(.*)$ index.php/$1 [L]
+
+    # 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/index.php b/public/index.php
index d420970..bebe4b4 100755
--- a/public/index.php
+++ b/public/index.php
@@ -1,334 +1,60 @@
 <?php
-/**
- * Load all enviroment variables
- *
- * using: vlucas/phpdotenv (composer require vlucas/phpdotenv)
- */
-
-include_once('../vendor/autoload.php');
-
-//$dotenv = new Dotenv\Dotenv(__DIR__);
-$dotenv = $dotenv = Dotenv\Dotenv::createImmutable('../');
-$dotenv->load();
-
-$dotenv->required(['DB_HOST', 'DB_NAME', 'DB_USER', 'DB_PASS', 'ENVIRONMENT']);
 
+use CodeIgniter\Boot;
+use Config\Paths;
 
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * 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.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	https://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
+ * CodeIgniter 4 Front Controller
  */
 
-/*
- *---------------------------------------------------------------
- * APPLICATION ENVIRONMENT
- *---------------------------------------------------------------
- *
- * 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
- *
- * NOTE: If you change these, also change the error_reporting() code below
- */
-	define('ENVIRONMENT', getenv('ENVIRONMENT'));
+// Check PHP version.
+$minPhpVersion = '8.1';
+if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
+    $message = sprintf(
+        'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
+        $minPhpVersion,
+        PHP_VERSION
+    );
 
-/*
- *---------------------------------------------------------------
- * ERROR REPORTING
- *---------------------------------------------------------------
- *
- * Different environments will require different levels of error reporting.
- * By default development will show errors but testing and live will hide them.
- */
-switch ($_ENV['ENVIRONMENT'])
-{
-	case 'development':
-		error_reporting(-1);
-		ini_set('display_errors', 1);
-	break;
+    header('HTTP/1.1 503 Service Unavailable.', true, 503);
+    echo $message;
 
-	case 'testing':
-	case 'production':
-		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-		}
-	break;
-
-	default:
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'The application environment is not set correctly.';
-		exit(1); // EXIT_ERROR
+    exit(1);
 }
 
 /*
  *---------------------------------------------------------------
- * SYSTEM DIRECTORY NAME
+ * SET THE CURRENT DIRECTORY
  *---------------------------------------------------------------
- *
- * This variable must contain the name of your "system" directory.
- * Set the path if it is not in the same directory as this file.
  */
-	$system_path = '../system';
+// Path to the front controller (this file)
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
+
+// Ensure the current directory is pointing to the front controller's directory
+if (getcwd() . DIRECTORY_SEPARATOR !== FCPATH) {
+    chdir(FCPATH);
+}
 
 /*
  *---------------------------------------------------------------
- * APPLICATION DIRECTORY NAME
+ * BOOTSTRAP THE APPLICATION
  *---------------------------------------------------------------
- *
- * If you want this front controller to use a different "application"
- * directory than the default one you can set its name here. The directory
- * can also be renamed or relocated anywhere on your server. If you do,
- * use an absolute (full) server path.
- * For more info please see the user guide:
- *
- * https://codeigniter.com/user_guide/general/managing_apps.html
- *
- * NO TRAILING SLASH!
- */
-	$application_folder = '../application';
-
-/*
- *---------------------------------------------------------------
- * VIEW DIRECTORY NAME
- *---------------------------------------------------------------
- *
- * If you want to move the view directory out of the application
- * directory, set the path to it here. The directory can be renamed
- * and relocated anywhere on your server. If blank, it will default
- * to the standard location inside your application directory.
- * If you do move this, use an absolute (full) server path.
- *
- * NO TRAILING SLASH!
- */
-	$view_folder = '';
-
-
-/*
- * --------------------------------------------------------------------
- * DEFAULT CONTROLLER
- * --------------------------------------------------------------------
- *
- * Normally you will set your default controller in the routes.php file.
- * You can, however, force a custom routing by hard-coding a
- * specific controller class/function here. For most applications, you
- * WILL NOT set your routing here, but it's an option for those
- * special instances where you might want to override the standard
- * routing in a specific front controller that shares a common CI installation.
- *
- * IMPORTANT: If you set the routing here, NO OTHER controller will be
- * callable. In essence, this preference limits your application to ONE
- * specific controller. Leave the function name blank if you need
- * to call functions dynamically via the URI.
- *
- * Un-comment the $routing array below to use this feature
- */
-	// The directory name, relative to the "controllers" directory.  Leave blank
-	// if your controller is not in a sub-directory within the "controllers" one
-	// $routing['directory'] = '';
-
-	// The controller class file name.  Example:  mycontroller
-	// $routing['controller'] = '';
-
-	// The controller function you wish to be called.
-	// $routing['function']	= '';
-
-
-/*
- * -------------------------------------------------------------------
- *  CUSTOM CONFIG VALUES
- * -------------------------------------------------------------------
- *
- * The $assign_to_config array below will be passed dynamically to the
- * config class when initialized. This allows you to set custom config
- * items or override any default config values found in the config.php file.
- * This can be handy as it permits you to share one application between
- * multiple front controller files, with each file containing different
- * config values.
- *
- * Un-comment the $assign_to_config array below to use this feature
- */
-	// $assign_to_config['name_of_config_item'] = 'value of config item';
-
-
-
-// --------------------------------------------------------------------
-// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
-// --------------------------------------------------------------------
-
-/*
- * ---------------------------------------------------------------
- *  Resolve the system path for increased reliability
- * ---------------------------------------------------------------
  */
 
-	// Set the current directory correctly for CLI requests
-	if (defined('STDIN'))
-	{
-		chdir(dirname(__FILE__));
-	}
+// LOAD COMPOSER AUTOLOADER
+require_once __DIR__ . '/../vendor/autoload.php';
 
-	if (($_temp = realpath($system_path)) !== FALSE)
-	{
-		$system_path = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
-	{
-		// Ensure there's a trailing slash
-		$system_path = strtr(
-			rtrim($system_path, '/\\'),
-			'/\\',
-			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-		).DIRECTORY_SEPARATOR;
-	}
+// LOAD ENVIRONMENT VARIABLES
+$dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . '/..');
+$dotenv->load();
+$dotenv->required(['DB_HOST', 'DB_NAME', 'DB_USER', 'DB_PASS', 'ENVIRONMENT']);
 
-	// Is the system path correct?
-	if ( ! is_dir($system_path))
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
-		exit(3); // EXIT_CONFIG
-	}
+// LOAD OUR PATHS CONFIG FILE
+require FCPATH . '../app/Config/Paths.php';
 
-/*
- * -------------------------------------------------------------------
- *  Now that we know the path, set the main path constants
- * -------------------------------------------------------------------
- */
-	// The name of THIS file
-	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
+$paths = new Paths();
 
-	// Path to the system directory
-	define('BASEPATH', $system_path);
+// LOAD THE FRAMEWORK BOOTSTRAP FILE
+require $paths->systemDirectory . '/Boot.php';
 
-	// Path to the front controller (this file) directory
-	define('FCPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
-
-    //path to the root of the project
-    define( 'MYROOTPATH', str_replace( 'public/', '', FCPATH ) );
-
-
-// Name of the "system" directory
-	define('SYSDIR', basename(BASEPATH));
-
-	// The path to the "application" directory
-	if (is_dir($application_folder))
-	{
-		if (($_temp = realpath($application_folder)) !== FALSE)
-		{
-			$application_folder = $_temp;
-		}
-		else
-		{
-			$application_folder = strtr(
-				rtrim($application_folder, '/\\'),
-				'/\\',
-				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-			);
-		}
-	}
-	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
-	{
-		$application_folder = BASEPATH.strtr(
-			trim($application_folder, '/\\'),
-			'/\\',
-			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-		);
-	}
-	else
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
-		exit(3); // EXIT_CONFIG
-	}
-
-	define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
-
-	// The path to the "views" directory
-	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
-	{
-		$view_folder = APPPATH.'views';
-	}
-	elseif (is_dir($view_folder))
-	{
-		if (($_temp = realpath($view_folder)) !== FALSE)
-		{
-			$view_folder = $_temp;
-		}
-		else
-		{
-			$view_folder = strtr(
-				rtrim($view_folder, '/\\'),
-				'/\\',
-				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-			);
-		}
-	}
-	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
-	{
-		$view_folder = APPPATH.strtr(
-			trim($view_folder, '/\\'),
-			'/\\',
-			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-		);
-	}
-	else
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
-		exit(3); // EXIT_CONFIG
-	}
-
-	define('VIEWPATH', $view_folder.DIRECTORY_SEPARATOR);
-
-/*
- * --------------------------------------------------------------------
- * LOAD THE BOOTSTRAP FILE
- * --------------------------------------------------------------------
- *
- * And away we go...
- */
-require_once BASEPATH.'core/CodeIgniter.php';
+exit(Boot::bootWeb($paths));