diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index a5262b7..add7806
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 install/conf.php
 html/svc/BU-commander
 private.txt
+vendor/
\ No newline at end of file
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..3a24405
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,32 @@
+{
+ 	
+	"config": {
+		"secure-http": false
+	},
+	
+	"name": "johnpearcey/backupcommander",
+	"description": "WebUI for controlling and scheduling backups on a web server",
+	"type": "project",
+	"license": "proprietary",
+	"autoload": {
+		"psr-4": {
+			"Johnpearcey\\Backupcommander\\": "src/"
+		}
+	},
+	"authors": [
+		{
+			"name": "John Pearcey"
+		}
+	],
+	"repositories": [
+		{
+			"type": "vcs", 
+			"url": "http://johnpearcey:325bfbed42068584ee2d850e1934c79677e0d296@pearcey.net:8080/johnpearcey/Amara.git"
+		}
+	],
+	"require": {
+		"johnpearcey/amara": "*",
+		"katzgrau/klogger": "dev-master"
+	}
+
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..d3b7b0b
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,461 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "22664b97c2671d3a3a87d84f3b55d389",
+    "packages": [
+        {
+            "name": "delight-im/auth",
+            "version": "v8.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/delight-im/PHP-Auth.git",
+                "reference": "7bce546defa2bec75485d4bf1d68b72cf311c489"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/delight-im/PHP-Auth/zipball/7bce546defa2bec75485d4bf1d68b72cf311c489",
+                "reference": "7bce546defa2bec75485d4bf1d68b72cf311c489",
+                "shasum": ""
+            },
+            "require": {
+                "delight-im/base64": "^1.0",
+                "delight-im/cookie": "^3.1",
+                "delight-im/db": "^1.3",
+                "ext-openssl": "*",
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Delight\\Auth\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Authentication for PHP. Simple, lightweight and secure.",
+            "homepage": "https://github.com/delight-im/PHP-Auth",
+            "keywords": [
+                "Authentication",
+                "auth",
+                "login",
+                "security"
+            ],
+            "support": {
+                "issues": "https://github.com/delight-im/PHP-Auth/issues",
+                "source": "https://github.com/delight-im/PHP-Auth/tree/v8.3.0"
+            },
+            "time": "2021-04-21T14:39:10+00:00"
+        },
+        {
+            "name": "delight-im/base64",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/delight-im/PHP-Base64.git",
+                "reference": "687b2a49f663e162030a8d27b32838bbe7f91c78"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/delight-im/PHP-Base64/zipball/687b2a49f663e162030a8d27b32838bbe7f91c78",
+                "reference": "687b2a49f663e162030a8d27b32838bbe7f91c78",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Delight\\Base64\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Simple and convenient Base64 encoding and decoding for PHP",
+            "homepage": "https://github.com/delight-im/PHP-Base64",
+            "keywords": [
+                "URL-safe",
+                "base-64",
+                "base64",
+                "decode",
+                "decoding",
+                "encode",
+                "encoding",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/delight-im/PHP-Base64/issues",
+                "source": "https://github.com/delight-im/PHP-Base64/tree/master"
+            },
+            "time": "2017-07-24T18:59:51+00:00"
+        },
+        {
+            "name": "delight-im/cookie",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/delight-im/PHP-Cookie.git",
+                "reference": "67065d34272377d63bab0bd58f984f9b228c803f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/delight-im/PHP-Cookie/zipball/67065d34272377d63bab0bd58f984f9b228c803f",
+                "reference": "67065d34272377d63bab0bd58f984f9b228c803f",
+                "shasum": ""
+            },
+            "require": {
+                "delight-im/http": "^2.0",
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Delight\\Cookie\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Modern cookie management for PHP",
+            "homepage": "https://github.com/delight-im/PHP-Cookie",
+            "keywords": [
+                "cookie",
+                "cookies",
+                "csrf",
+                "http",
+                "same-site",
+                "samesite",
+                "xss"
+            ],
+            "support": {
+                "issues": "https://github.com/delight-im/PHP-Cookie/issues",
+                "source": "https://github.com/delight-im/PHP-Cookie/tree/v3.4.0"
+            },
+            "time": "2020-04-16T11:01:26+00:00"
+        },
+        {
+            "name": "delight-im/db",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/delight-im/PHP-DB.git",
+                "reference": "7d6f4c7a7e8ba6a297bfc30d65702479fd0b5f7c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/delight-im/PHP-DB/zipball/7d6f4c7a7e8ba6a297bfc30d65702479fd0b5f7c",
+                "reference": "7d6f4c7a7e8ba6a297bfc30d65702479fd0b5f7c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pdo": "*",
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Delight\\Db\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Safe and convenient SQL database access in a driver-agnostic way",
+            "homepage": "https://github.com/delight-im/PHP-DB",
+            "keywords": [
+                "database",
+                "mysql",
+                "pdo",
+                "pgsql",
+                "postgresql",
+                "sql",
+                "sqlite"
+            ],
+            "support": {
+                "issues": "https://github.com/delight-im/PHP-DB/issues",
+                "source": "https://github.com/delight-im/PHP-DB/tree/v1.3.1"
+            },
+            "time": "2020-02-21T10:46:03+00:00"
+        },
+        {
+            "name": "delight-im/http",
+            "version": "v2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/delight-im/PHP-HTTP.git",
+                "reference": "a5c2c4eae1dd3207f797984e8f64f2d71ed889dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/delight-im/PHP-HTTP/zipball/a5c2c4eae1dd3207f797984e8f64f2d71ed889dd",
+                "reference": "a5c2c4eae1dd3207f797984e8f64f2d71ed889dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Delight\\Http\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Hypertext Transfer Protocol (HTTP) utilities for PHP",
+            "homepage": "https://github.com/delight-im/PHP-HTTP",
+            "keywords": [
+                "headers",
+                "http",
+                "https"
+            ],
+            "support": {
+                "issues": "https://github.com/delight-im/PHP-HTTP/issues",
+                "source": "https://github.com/delight-im/PHP-HTTP/tree/v2.1.0"
+            },
+            "time": "2021-10-12T18:52:29+00:00"
+        },
+        {
+            "name": "johnpearcey/amara",
+            "version": "v0.9.10",
+            "source": {
+                "type": "git",
+                "url": "http://johnpearcey:325bfbed42068584ee2d850e1934c79677e0d296@pearcey.net:8080/johnpearcey/Amara.git",
+                "reference": "11d38eb93ddb9930583886dbc19bbf9a00f2b9c0"
+            },
+            "require": {
+                "delight-im/auth": "^8.3",
+                "katzgrau/klogger": "dev-master",
+                "phpmailer/phpmailer": "^6.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Johnpearcey\\Amara\\": "src/"
+                }
+            },
+            "license": [
+                "proprietary"
+            ],
+            "authors": [
+                {
+                    "name": "John Pearcey",
+                    "email": "john@pearcey.net"
+                }
+            ],
+            "description": "Home grown web navigation framework complete with login",
+            "time": "2025-01-21T11:51:44+00:00"
+        },
+        {
+            "name": "katzgrau/klogger",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/katzgrau/KLogger.git",
+                "reference": "36481c69db9305169a2ceadead25c2acaabd567c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/katzgrau/KLogger/zipball/36481c69db9305169a2ceadead25c2acaabd567c",
+                "reference": "36481c69db9305169a2ceadead25c2acaabd567c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "psr/log": "^1.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0.0"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Katzgrau\\KLogger\\": "src/"
+                },
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kenny Katzgrau",
+                    "email": "katzgrau@gmail.com"
+                },
+                {
+                    "name": "Dan Horrigan",
+                    "email": "dan@dhorrigan.com"
+                }
+            ],
+            "description": "A Simple Logging Class",
+            "keywords": [
+                "logging"
+            ],
+            "support": {
+                "issues": "https://github.com/katzgrau/KLogger/issues",
+                "source": "https://github.com/katzgrau/KLogger/tree/1.2.2"
+            },
+            "time": "2022-07-29T20:41:14+00:00"
+        },
+        {
+            "name": "phpmailer/phpmailer",
+            "version": "v6.9.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPMailer/PHPMailer.git",
+                "reference": "2f5c94fe7493efc213f643c23b1b1c249d40f47e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2f5c94fe7493efc213f643c23b1b1c249d40f47e",
+                "reference": "2f5c94fe7493efc213f643c23b1b1c249d40f47e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-filter": "*",
+                "ext-hash": "*",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                "doctrine/annotations": "^1.2.6 || ^1.13.3",
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                "phpcompatibility/php-compatibility": "^9.3.5",
+                "roave/security-advisories": "dev-latest",
+                "squizlabs/php_codesniffer": "^3.7.2",
+                "yoast/phpunit-polyfills": "^1.0.4"
+            },
+            "suggest": {
+                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
+                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
+                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+                "psr/log": "For optional PSR-3 debug logging",
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPMailer\\PHPMailer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-only"
+            ],
+            "authors": [
+                {
+                    "name": "Marcus Bointon",
+                    "email": "phpmailer@synchromedia.co.uk"
+                },
+                {
+                    "name": "Jim Jagielski",
+                    "email": "jimjag@gmail.com"
+                },
+                {
+                    "name": "Andy Prevost",
+                    "email": "codeworxtech@users.sourceforge.net"
+                },
+                {
+                    "name": "Brent R. Matzelle"
+                }
+            ],
+            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+            "support": {
+                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.9.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Synchro",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-11-24T18:04:13+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
+            "time": "2021-05-03T11:20:27+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "katzgrau/klogger": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {},
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
+}
diff --git a/file-layout.txt b/file-layout.txt
old mode 100644
new mode 100755
diff --git a/html/bin/db-site-insert-all.php b/html/bin/db-site-insert-all.php
old mode 100644
new mode 100755
diff --git a/html/css/main.css b/html/css/main.css
old mode 100644
new mode 100755
diff --git a/html/img/edit-icon-24x24.png b/html/img/edit-icon-24x24.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/edit-icon-32x32.png b/html/img/edit-icon-32x32.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/edit-icon-L.png b/html/img/edit-icon-L.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/green-tick.png b/html/img/green-tick.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/red-cross.png b/html/img/red-cross.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/shb_logo-light-2.png b/html/img/shb_logo-light-2.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/trash-bin-red-24x24.jpg b/html/img/trash-bin-red-24x24.jpg
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/trash-bin-red-24x24.png b/html/img/trash-bin-red-24x24.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/img/uk-green.png b/html/img/uk-green.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/html/inc/.htaccess b/html/inc/.htaccess
old mode 100644
new mode 100755
diff --git a/html/inc/bu_list_content.php b/html/inc/bu_list_content.php
old mode 100644
new mode 100755
diff --git a/html/inc/edit-sh-bu.php b/html/inc/edit-sh-bu.php
old mode 100644
new mode 100755
diff --git a/html/inc/login.php b/html/inc/login.php
old mode 100644
new mode 100755
diff --git a/html/inc/new-file-bu.php b/html/inc/new-file-bu.php
old mode 100644
new mode 100755
diff --git a/html/inc/pagemap.php b/html/inc/pagemap.php
old mode 100644
new mode 100755
diff --git a/html/inc/secure.php b/html/inc/secure.php
old mode 100644
new mode 100755
diff --git a/html/index.php b/html/index.php
old mode 100644
new mode 100755
index f2fff07..e2fbe0c
--- a/html/index.php
+++ b/html/index.php
@@ -25,29 +25,29 @@
 	<body onload="index_onload()">
 	  
 	<div class="main_page">
-		
-	<div id="shb_Header" class="flex_header"  >
-		<div id="shb_Title" class="shb_Title" ><img src="img/uk-green.png" style="margin-right: 20px; height: 40px;" >Backup Commander<span id="shb_pageName" style="margin-left:30px; font-size: 10px;">Version 0.9.1</span></div>
-		<?php echo $strui_login; ?>
-	</div>
-
-	<div class="page_inner">
-      
-      <div id="page_content"></div>
-
-		<div class="section_header">Panel Help</div>
-
-		<div class="content_section_text">
-
-			<p>For help using this panel, please email john@pearcey.net</p>
 			
-			<p>This backup utility is open source and can be downloaded from <a href="http://pearcey.net:8080/">pearcey.net</a></p>
-			
-			<p>Please report bugs to john@pearcey.net</p>
+		<div id="shb_Header" class="flex_header"  >
+			<div id="shb_Title" class="shb_Title" ><img src="img/uk-green.png" style="margin-right: 20px; height: 40px;" >Backup Commander<span id="shb_pageName" style="margin-left:30px; font-size: 10px;">Version 0.9.1</span></div>
+			<?php echo $strui_login; ?>
 		</div>
 
-      </div>
-    </div>
+		<div class="page_inner">
+			
+			<div id="page_content"></div>
+
+			<div class="section_header">Panel Help</div>
+
+			<div class="content_section_text">
+
+				<p>For help using this panel, please email john@pearcey.net</p>
+				
+				<p>This backup utility is open source and can be downloaded from <a href="http://pearcey.net:8080/">pearcey.net</a></p>
+				
+				<p>Please report bugs to john@pearcey.net</p>
+			</div>
+
+		 </div>
+	</div>
     
-  </body>
+	</body>
 </html>
diff --git a/html/js/common.js b/html/js/common.js
old mode 100644
new mode 100755
diff --git a/html/js/main.js b/html/js/main.js
old mode 100644
new mode 100755
diff --git a/html/lib/sysVcom.php b/html/lib/sysVcom.php
old mode 100644
new mode 100755
diff --git a/html/lib/time.php b/html/lib/time.php
old mode 100644
new mode 100755
diff --git a/html/phpinfo.php b/html/phpinfo.php
old mode 100644
new mode 100755
diff --git a/html/post_handler.php b/html/post_handler.php
old mode 100644
new mode 100755
diff --git a/html/shd/backup-funcs.php b/html/shd/backup-funcs.php
old mode 100644
new mode 100755
diff --git a/html/shd/common.php b/html/shd/common.php
old mode 100644
new mode 100755
diff --git a/html/svc/backup.php b/html/svc/backup.php
old mode 100644
new mode 100755
diff --git a/html/svc/bu_cmdr.service b/html/svc/bu_cmdr.service
old mode 100644
new mode 100755
diff --git a/html/svc/db-reads.php b/html/svc/db-reads.php
old mode 100644
new mode 100755
diff --git a/html/svc/db-writes.php b/html/svc/db-writes.php
old mode 100644
new mode 100755
diff --git a/html/svc/file-line-reader.php b/html/svc/file-line-reader.php
old mode 100644
new mode 100755
diff --git a/html/svc/main-svc.php b/html/svc/main-svc.php
old mode 100644
new mode 100755
diff --git a/html/svc/main.php b/html/svc/main.php
old mode 100644
new mode 100755
diff --git a/html/svc/table-cache.php b/html/svc/table-cache.php
old mode 100644
new mode 100755
diff --git a/install/apply-patches.php b/install/apply-patches.php
old mode 100644
new mode 100755
diff --git a/install/conf-sample.php b/install/conf-sample.php
old mode 100644
new mode 100755
diff --git a/install/db/data.db b/install/db/data.db
old mode 100644
new mode 100755
Binary files differ
diff --git a/install/db/p-1.sql b/install/db/p-1.sql
old mode 100644
new mode 100755
diff --git a/install/db/p-2.sql b/install/db/p-2.sql
new file mode 100755
index 0000000..5f1e031
--- /dev/null
+++ b/install/db/p-2.sql
@@ -0,0 +1,86 @@
+-- Upgraded the users part of the database
+
+DROP TABLE "LOGINS";
+
+-- PHP-Auth (https://github.com/delight-im/PHP-Auth)
+-- Copyright (c) delight.im (https://www.delight.im/)
+-- Licensed under the MIT License (https://opensource.org/licenses/MIT)
+
+PRAGMA foreign_keys = OFF;
+
+CREATE TABLE "users" (
+	"id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK ("id" >= 0),
+	"email" VARCHAR(249) NOT NULL,
+	"password" VARCHAR(255) NOT NULL,
+	"username" VARCHAR(100) DEFAULT NULL,
+	"status" INTEGER NOT NULL CHECK ("status" >= 0) DEFAULT "0",
+	"verified" INTEGER NOT NULL CHECK ("verified" >= 0) DEFAULT "0",
+	"resettable" INTEGER NOT NULL CHECK ("resettable" >= 0) DEFAULT "1",
+	"roles_mask" INTEGER NOT NULL CHECK ("roles_mask" >= 0) DEFAULT "0",
+	"registered" INTEGER NOT NULL CHECK ("registered" >= 0),
+	"last_login" INTEGER CHECK ("last_login" >= 0) DEFAULT NULL,
+	"force_logout" INTEGER NOT NULL CHECK ("force_logout" >= 0) DEFAULT "0",
+	CONSTRAINT "email" UNIQUE ("email")
+);
+
+CREATE TABLE "users_2fa" (
+	"id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK ("id" >= 0),
+	"user_id" INTEGER NOT NULL CHECK ("user_id" >= 0),
+	"mechanism" INTEGER NOT NULL CHECK ("mechanism" >= 0),
+	"seed" VARCHAR(255) DEFAULT NULL,
+	"created_at" INTEGER NOT NULL CHECK ("created_at" >= 0),
+	"expires_at" INTEGER CHECK ("expires_at" >= 0) DEFAULT NULL,
+	CONSTRAINT "user_id_mechanism" UNIQUE ("user_id", "mechanism")
+);
+
+CREATE TABLE "users_confirmations" (
+	"id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK ("id" >= 0),
+	"user_id" INTEGER NOT NULL CHECK ("user_id" >= 0),
+	"email" VARCHAR(249) NOT NULL,
+	"selector" VARCHAR(16) NOT NULL,
+	"token" VARCHAR(255) NOT NULL,
+	"expires" INTEGER NOT NULL CHECK ("expires" >= 0),
+	CONSTRAINT "selector" UNIQUE ("selector")
+);
+CREATE INDEX "users_confirmations.email_expires" ON "users_confirmations" ("email", "expires");
+CREATE INDEX "users_confirmations.user_id" ON "users_confirmations" ("user_id");
+
+CREATE TABLE "users_otps" (
+	"id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK ("id" >= 0),
+	"user_id" INTEGER NOT NULL CHECK ("user_id" >= 0),
+	"mechanism" INTEGER NOT NULL CHECK ("mechanism" >= 0),
+	"single_factor" INTEGER NOT NULL CHECK ("single_factor" >= 0) DEFAULT "0",
+	"selector" VARCHAR(24) NOT NULL,
+	"token" VARCHAR(255) NOT NULL,
+	"expires_at" INTEGER CHECK ("expires_at" >= 0) DEFAULT NULL
+);
+CREATE INDEX "users_otps.user_id_mechanism" ON "users_otps" ("user_id", "mechanism");
+CREATE INDEX "users_otps.selector_user_id" ON "users_otps" ("selector", "user_id");
+
+CREATE TABLE "users_remembered" (
+	"id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK ("id" >= 0),
+	"user" INTEGER NOT NULL CHECK ("user" >= 0),
+	"selector" VARCHAR(24) NOT NULL,
+	"token" VARCHAR(255) NOT NULL,
+	"expires" INTEGER NOT NULL CHECK ("expires" >= 0),
+	CONSTRAINT "selector" UNIQUE ("selector")
+);
+CREATE INDEX "users_remembered.user" ON "users_remembered" ("user");
+
+CREATE TABLE "users_resets" (
+	"id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK ("id" >= 0),
+	"user" INTEGER NOT NULL CHECK ("user" >= 0),
+	"selector" VARCHAR(20) NOT NULL,
+	"token" VARCHAR(255) NOT NULL,
+	"expires" INTEGER NOT NULL CHECK ("expires" >= 0),
+	CONSTRAINT "selector" UNIQUE ("selector")
+);
+CREATE INDEX "users_resets.user_expires" ON "users_resets" ("user", "expires");
+
+CREATE TABLE "users_throttling" (
+	"bucket" VARCHAR(44) PRIMARY KEY NOT NULL,
+	"tokens" REAL NOT NULL CHECK ("tokens" >= 0),
+	"replenished_at" INTEGER NOT NULL CHECK ("replenished_at" >= 0),
+	"expires_at" INTEGER NOT NULL CHECK ("expires_at" >= 0)
+);
+CREATE INDEX "users_throttling.expires_at" ON "users_throttling" ("expires_at");
diff --git a/install/install.php b/install/install.php
old mode 100644
new mode 100755
diff --git a/install/rsync-exclude.txt b/install/rsync-exclude.txt
old mode 100644
new mode 100755
diff --git a/notes.txt b/notes.txt
old mode 100644
new mode 100755
index 194c1c9..baa9216
--- a/notes.txt
+++ b/notes.txt
@@ -1,3 +1,4 @@
+
 Service
 -------
 
diff --git a/src/bu-command-local-conf.json b/src/bu-command-local-conf.json
new file mode 100644
index 0000000..1bae8fa
--- /dev/null
+++ b/src/bu-command-local-conf.json
@@ -0,0 +1,12 @@
+{	
+	"Smtp": {
+		"SMTPDebug": "0",                  
+		"Host" : "xhia.com",
+		"SMTPAuth" : true,      
+		"Username" : "john@pearcey.net",
+		"Password" : "N0M0r3M4sk5",
+		"SMTPSecure" : "tls",
+		"Port" : 587
+	}
+	
+}
diff --git a/src/bu-command-nav.json b/src/bu-command-nav.json
new file mode 100644
index 0000000..a4f3977
--- /dev/null
+++ b/src/bu-command-nav.json
@@ -0,0 +1,40 @@
+{
+	"Global": {
+		"sitename":"Backup Commander",
+		"meta":{
+			"author":"John Pearcey",
+			"desription":"WebUI backup manager for web servers"
+		},
+		"icon":"/img/uk-green.png",
+		"style":	[ "/css/main.css" ]
+
+	},
+
+	"Handlers":{
+		"Johnpearcey\\Amara\\Router\\RqHandlerCls_login" : {
+			"properties":{
+				"lost_pwd":"/lostpwd"
+			},
+			"style":[ "/css/login.css" ],
+			"page_builder" : "login_page"
+		}
+
+	},
+
+	"Navigate": {
+		
+		"/index.html": {
+			"#1" : "Same as mainpage but only if logged in",
+			"secure":1,
+			"class-handler": "Johnpearcey\\Amara\\Router\\RqHandlerCls_mainpage"
+		},
+		
+		
+		"/mainpage": {
+			"secure":1,
+			"class-handler": "Johnpearcey\\Amara\\Router\\RqHandlerCls_mainpage"
+		}
+		
+	}		
+
+}
diff --git a/src/bu-command-pages.json b/src/bu-command-pages.json
new file mode 100644
index 0000000..a22d5c3
--- /dev/null
+++ b/src/bu-command-pages.json
@@ -0,0 +1,18 @@
+{
+
+	"DataSources": {
+
+	},
+
+	"PageBuilder": {
+		
+	},
+
+	"Templates": {
+		
+		"template_root" : "./templates"
+
+	}
+
+
+}
\ No newline at end of file
diff --git a/src/css/login.css b/src/css/login.css
new file mode 100644
index 0000000..a5549bf
--- /dev/null
+++ b/src/css/login.css
@@ -0,0 +1,38 @@
+/* admin_layout contains general administrative layout on forms*/
+.admin_layout {
+	display: grid;
+	margin: auto;
+	margin-top: 10px;
+	padding: 10px;
+	padding-left: 20px;
+}
+
+.admin_layout.frm_login {
+	
+	grid-template-columns: 30% 1fr;
+	grid-template-rows: 25px 25px 1fr;
+	column-gap: 5px;
+	row-gap: 5px;  
+}
+
+.admin_layout label {
+	align-self: center;
+	justify-self: end;
+	margin-right: 15px;
+}
+
+.admin_layout input[type=submit] {
+	grid-column: 2;
+	grid-row: 3;
+	justify-self: start;
+	padding: 3px;
+	min-width: 80px
+}
+
+.admin_layout input[type=text], .admin_layout input[type=password] {
+	max-width: 300px;
+}
+
+.frm_tail {
+	padding: 15px;
+}
\ No newline at end of file
diff --git a/src/css/main.css b/src/css/main.css
new file mode 100644
index 0000000..3fe1a36
--- /dev/null
+++ b/src/css/main.css
@@ -0,0 +1,198 @@
+* {
+	margin: 0px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+}
+
+body, html {
+	padding: 3px 3px 3px 3px;
+	background-color: #D8DBE2;
+	font-family: Ubuntu, Verdana, sans-serif;
+	font-size: 11pt;
+	text-align: center;
+}
+
+input[type=text], input[type=password], input[type=submit] {
+	font-size: 11pt;
+}
+	
+.errcls{
+	margin: 20px;
+	padding: 5px;
+	background-color: salmon;
+}
+
+  div.main_page {
+    position: relative;
+    display: table;
+
+    width: 1000px;
+
+    margin-bottom: 3px;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 0px 0px 0px 0px;
+
+    border-width: 2px;
+    border-color: #212738;
+    border-style: solid;
+
+    background-color: #FFFFFF;
+
+    text-align: center;
+  }
+
+  div.content_section_text {
+    padding: 4px 8px 4px 8px;
+
+    color: #000000;
+    font-size: 100%;
+  }
+
+  div.content_section_text pre {
+    margin: 8px 0px 8px 0px;
+    padding: 8px 8px 8px 8px;
+
+    border-width: 1px;
+    border-style: dotted;
+    border-color: #000000;
+
+    background-color: #F5F6F7;
+
+    font-style: italic;
+  }
+
+  div.content_section_text p {
+    margin-bottom: 6px;
+  }
+
+  div.content_section_text ul, div.content_section_text li {
+    padding: 4px 8px 4px 16px;
+  }
+
+  div.section_header {
+    padding: 3px 6px 3px 6px;
+
+    background-color: #8E9CB2;
+
+    color: #FFFFFF;
+    font-weight: bold;
+    font-size: 112%;
+    text-align: center;
+    margin-top: 10px;
+  }
+
+  div.content_section_text a {
+    text-decoration: none;
+    font-weight: bold;
+  }
+
+
+  div.content_section_text a:link,
+  div.content_section_text a:visited,
+   div.content_section_text a:active {
+    background-color: #DCDFE6;
+    color: #0e3f2b;
+  }
+	
+  div.content_section_text a:hover {
+    background-color: #0e3f2b;
+    color: #DCDFE6;
+  }
+  
+.tblcenter {
+	width: 100%;
+	margin-left: 10px;
+	margin-right: 10px;
+	text-align: left;
+}
+	
+.flex_header{
+   display: flex;
+   justify-content: space-between;
+   align-items: stretch;
+   background-color: #0e3f2b;
+   border: solid lightgray 1px;
+   border-bottom: solid gray 1px;
+   min-height: 50px;
+   margin-bottom: 10px;
+}
+
+.shb_Title img {
+   margin: 3px 3px 3px 5px;
+}
+
+.flex_header .shb_Title {
+   display: flex;
+   flex-direction: row;
+   align-items: center;		
+   color: #cfa949;
+   font-size: 18px;
+   font-weight: bold;
+   font-family: Helvetica, Arial, sans-serif;
+   margin-left: 0px;
+}
+
+.flex_header .shb_TitleRHS {
+	display: flex;
+	flex-direction: row;
+	align-items: center; /*align-items is perpendicular to the flex-direction*/
+	color: #c9bda2;
+}
+
+.page_inner{
+	margin-left: 10px;
+	margin-right: 10px;	
+}
+
+.btn_mse:hover {
+	cursor: pointer;
+}
+
+.btn_exec{
+	background-color: #04AA6D;
+	border: none;
+	color: white;
+	padding: 5px;
+	text-align: center;
+	text-decoration: none;
+	display: inline-block;
+	font-size: 12px;	
+	border-radius: 8px;
+}
+.btn_small {
+	font-size: 10px;
+	border-radius: 6px;
+	padding: 2px 5px 2px 5px;
+}
+
+.td_label_bkup{
+	text-align: right;
+	padding-right: 15px;
+}
+
+table tr.high-row-style td {
+	padding-top: 15px;	
+}
+
+table tr td.td_icon {
+	width: 35px;
+}
+
+.two-col-panel {
+  padding-top: 15px;	
+  text-align: left;
+  display: grid;
+  grid-template-columns: 200px auto;  
+}
+
+.two-col-panel > div {  
+  margin-top: 5px;  
+}
+
+.two-col-panel input {  
+  width: 300px;  
+}
+
+.two-col-panel textarea {  
+  width: 300px;
+}
diff --git a/src/img/uk-green.png b/src/img/uk-green.png
new file mode 100755
index 0000000..dab2252
--- /dev/null
+++ b/src/img/uk-green.png
Binary files differ
diff --git a/src/index.php b/src/index.php
new file mode 100755
index 0000000..77430b0
--- /dev/null
+++ b/src/index.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+	BACKUP COMMANDER VERIOSN 2
+	==========================
+
+		So far, we have created a new composer project, imported Amara and run it successfully.
+		Before going any further, I need to organise the HTML.
+		I will do this by creating a template engine as part of Amara.
+		
+*/
+ 
+	session_start();
+
+	require dirname(__DIR__)."/vendor/autoload.php";
+
+	use \Johnpearcey\Amara\AmaraApp;
+	use \Johnpearcey\Amara\JPLogger;
+
+	JPLogger::init( dirname(__DIR__).'/logs', Psr\Log\LogLevel::DEBUG );
+	JPLogger::get()->info("*** Request start ***");
+
+	// database required for backup commander and Amara
+	$db = new \PDO('sqlite:'.__DIR__.'/data/data.db');
+		
+	// secret properties, logins for email etc.
+	$local_props_json = __DIR__."/bu-command-local-conf.json";
+	
+	// Init Amara application using it's own nav defaults
+	$app = new AmaraApp( $db, $local_props_json );
+
+	//set globals
+	$app->setGlobals( __DIR__.'/bu-command-nav.json' );
+
+	// settings and overrides for "Handlers" and "Navigate"		
+	$app->setAdditional_Nav_Rq( __DIR__.'/bu-command-nav.json' );
+
+	// settings and overrides "Templates"
+	$app->setAdditional_Templates( __DIR__.'/bu-command-pages.json' );
+
+	// settings and overrides "PageBuilder" and "DataSources"
+	$app->setAdditional_PageBuilder( __DIR__.'/bu-command-pages.json' );
+
+	// Start Amara application
+	$app->run( );
+	
+?>
diff --git a/src/templates/body_c.tp b/src/templates/body_c.tp
new file mode 100644
index 0000000..eb5993f
--- /dev/null
+++ b/src/templates/body_c.tp
@@ -0,0 +1 @@
+"</div></body>"
\ No newline at end of file
diff --git a/src/templates/body_o.tp b/src/templates/body_o.tp
new file mode 100644
index 0000000..7f851ce
--- /dev/null
+++ b/src/templates/body_o.tp
@@ -0,0 +1,21 @@
+
+
+	$auth = \Johnpearcey\Amara\Router\UserState::get()->getAuth();
+
+	$strui_login = '';
+	if ($auth->isLoggedIn()) {
+		$strui_login = "<a id=\"anc_login\" class=\"shb_TitleRHS\" href=\"post_handler.php?action=logout\" style=\"margin-right: 10px;\"  >Logout</a>";
+	}else{
+		$strui_login = "<a id=\"anc_login\" class=\"shb_TitleRHS\" href=\"index.php\" style=\"margin-right: 10px;\"  >Login</a>";
+	}
+
+?>
+	<body onload="index_onload()">
+
+	<div class="main_page">
+			
+		<div id="shb_Header" class="flex_header"  >
+			<div id="shb_Title" class="shb_Title" ><img src="/img/uk-green.png" style="margin-right: 20px; height: 40px;" >Backup Commander<span id="shb_pageName" style="margin-left:30px; font-size: 10px;">Version 0.9.1</span></div>
+			<?php echo $strui_login; ?>
+		</div>
+<?php 
\ No newline at end of file
diff --git a/src/templates/btn_submit.tp b/src/templates/btn_submit.tp
new file mode 100644
index 0000000..faacc83
--- /dev/null
+++ b/src/templates/btn_submit.tp
@@ -0,0 +1 @@
+"<input class=\"btn_submit\" type=\"submit\" value=\"Login\" />\n"
\ No newline at end of file
diff --git a/src/templates/form_o.tp b/src/templates/form_o.tp
new file mode 100644
index 0000000..aa413aa
--- /dev/null
+++ b/src/templates/form_o.tp
@@ -0,0 +1 @@
+"<form class=\"admin_layout frm_login\" method=\"post\" action=\"{$t_form_action}\" >"
\ No newline at end of file
diff --git a/src/templates/form_tail.tp b/src/templates/form_tail.tp
new file mode 100644
index 0000000..c383244
--- /dev/null
+++ b/src/templates/form_tail.tp
@@ -0,0 +1 @@
+"\n<div class='frm_tail' >$form_tail_info</div>"
\ No newline at end of file
diff --git a/src/templates/txt_email.tp b/src/templates/txt_email.tp
new file mode 100644
index 0000000..001c56f
--- /dev/null
+++ b/src/templates/txt_email.tp
@@ -0,0 +1 @@
+"<label for=\"{$t_txt_email_name}\">{$t_lbl_email_content}</label><input type=\"text\" name=\"{$t_txt_email_name}\" value=\"{$t_txt_email_value}\" required />\n"
\ No newline at end of file
diff --git a/src/templates/txt_password.tp b/src/templates/txt_password.tp
new file mode 100644
index 0000000..43a3595
--- /dev/null
+++ b/src/templates/txt_password.tp
@@ -0,0 +1 @@
+"<label for=\"{$t_txt_password_name}\">{$t_lbl_password_content}</label><input type=\"password\" name=\"{$t_txt_password_name}\" value=\"{$t_txt_password_value}\" required />"
\ No newline at end of file