diff --git a/demandshaper-module/Views/add_device.php b/demandshaper-module/Views/add_device.php
index 70c6ee5..5405b37 100644
--- a/demandshaper-module/Views/add_device.php
+++ b/demandshaper-module/Views/add_device.php
@@ -11,10 +11,19 @@
 
 */
 $v=2;
-global $path;
+global $path, $mysqli, $redis, $user, $session, $settings;
 $emoncmspath = $path;
+if ($remoteaccess) $emoncmspath .= "remoteaccess/";
 // if ($remoteaccess) $emoncmspath .= "remoteaccess/";
 if (isset($_GET['apikey'])) $apikeystr = "&apikey=".$_GET['apikey']; else $apikeystr = "";
+
+$device = false;
+if (file_exists("Modules/device/device_model.php")) {
+  require_once "Modules/device/device_model.php";
+  $device = new Device($mysqli, $redis);
+}
+
+$u = $user->get($session['userid'])
 ?>
 
 <style>#icon-list svg { opacity: .7; }</style>
@@ -55,6 +64,28 @@
     
           <p>4. With the smartplug WIFI settings configured, connect back to you home network and keep this window open. After a couple of minutes a notice will appear asking whether to allow device at the given ip address to connect. Click allow and wait a couple of minutes for the smart plug to appear in the left hand menu. Click on the smart plug to start scheduling it.</p>
           </div>
+
+          <div class="wizard-option-l2" name="tasmota"><svg class="icon"><use xlink:href="#icon-smartplug"></use></svg> Tasmota Device</div>
+          <div class="wizard-option-l3 hide" name="tasmota">
+            <ol>
+              <li><p>Commission your device as per the <a href="https://tasmota.github.io/docs/" target="_blank">Tasmota</a> instructions.</p></li>
+              <li><p>Navigate to your Tasmota device configuration in your webbrowser.</p></li>
+              <li><p>Select Configuration &gt; Configure Other and set MQTT enabled. Save, and return to Configuration.</p></li>
+              <li>
+                <p>Select Configure MQTT. Enter (or copy and paste) the values below before saving:</p>
+                <ul>
+                  <li>Host: <b><?= $_SERVER['HTTP_HOST']  ?></b></li>
+                  <li>Port: <b><?= $settings['mqtt']['port'] ?></b></li>
+                  <li>User: <b><?= $u->username ?></b></li>
+                  <li>Password (API write key): <b><?= $u->apikey_write ?></b></li>
+                  <li>Topic: <b>tasmota_%06X</b></li>
+                  <li>Full topic: <b>user/<?=$u->id?>/%topic%/%prefix%</b></li>
+                </ul>
+              </li>
+              <li>A new Tasmota entry should appear in the devices menu shortly.</li>
+            </ol>
+          </div>
+
           <div class="wizard-option-l2" name="emonevse"><svg class="icon"><use xlink:href="#icon-openevse"></use></svg> OpenEVSE Charging Station</div>
           <div class="wizard-option-l3 hide" name="emonevse">
           
diff --git a/demandshaper-module/Views/main.php b/demandshaper-module/Views/main.php
index 538e98e..b9cdfa7 100644
--- a/demandshaper-module/Views/main.php
+++ b/demandshaper-module/Views/main.php
@@ -1,4 +1,9 @@
-<?php global $path; $v=12; ?>
+<?php 
+$v=12;
+global $path; 
+$emoncmspath = $path;
+if ($remoteaccess) $emoncmspath .= "remoteaccess/";
+?>
 <link rel="stylesheet" href="<?php echo $path; ?>Modules/demandshaper/demandshaper.css?v=<?php echo $v; ?>">
 
 <script language="javascript" type="text/javascript" src="<?php echo $path; ?>Lib/flot/jquery.flot.min.js"></script>
@@ -10,6 +15,7 @@
 <script language="javascript" type="text/javascript" src="<?php echo $path; ?>Modules/demandshaper/js/battery.js?v=<?php echo $v; ?>"></script>
 <script language="javascript" type="text/javascript" src="<?php echo $path; ?>Modules/demandshaper/js/openevse.js?v=<?php echo $v; ?>"></script>
 <script language="javascript" type="text/javascript" src="<?php echo $path; ?>Modules/demandshaper/js/hpmon.js?v=<?php echo $v; ?>"></script>
+<script language="javascript" type="text/javascript" src="<?php echo $path; ?>Modules/demandshaper/js/tasmota.js?v=<?php echo $v; ?>"></script>
 <div id="scheduler-top"></div>
 
 <div id="scheduler-outer">
@@ -209,6 +215,7 @@
 </div>
 
 <script>
+var emoncmspath = "<?php echo $emoncmspath; ?>";
 var forecast_list = <?php echo json_encode($forecast_list); ?>;
 var schedule = <?php echo json_encode($schedule); ?>;
 var device_id = <?php echo $device_id; ?>;
diff --git a/demandshaper-module/demandshaper_controller.php b/demandshaper-module/demandshaper_controller.php
index 2bb143d..93dc9c5 100644
--- a/demandshaper-module/demandshaper_controller.php
+++ b/demandshaper-module/demandshaper_controller.php
@@ -17,7 +17,7 @@
 
 function demandshaper_controller()
 {
-    global $mysqli, $redis, $session, $route, $settings, $linked_modules_dir, $user, $input;
+    global $mysqli, $redis, $session, $route, $settings, $linked_modules_dir, $user, $input, $demandshaper_hub;
     $result = false;
 
     define("MAX",1);
@@ -26,12 +26,19 @@ function demandshaper_controller()
     $route->format = "json";
     $result = false;
 
-    $remoteaccess = false;
-    
     require_once "$linked_modules_dir/demandshaper/lib/misc.php";
 
-    require_once "Modules/device/device_model.php";
-    $device = new Device($mysqli,$redis);
+    if ($session['userid'] && in_array($session['userid'],$demandshaper_hub)) {
+        $remoteaccess = true;
+        $device = false;
+        
+        require_once "Modules/remoteaccess/RemoteAccess.php";
+        $remoteaccess_class = new RemoteAccess($session["username"]);
+    } else {
+        $remoteaccess = false;
+        require_once "Modules/device/device_model.php";
+        $device = new Device($mysqli,$redis);
+    }
 
     include "Modules/demandshaper/demandshaper_model.php";
     $demandshaper = new DemandShaper($mysqli,$redis,$device);
@@ -57,7 +64,11 @@ function demandshaper_controller()
         case "":
             $route->format = "html";
             if ($session["write"]) {
-                $schedules = $demandshaper->get($session["userid"]);
+                if ($remoteaccess) {
+                    $schedules = $remoteaccess_class->request("demandshaper","schedules","",array("userid"=>$session["userid"]),1.5);
+                } else {
+                    $schedules = $demandshaper->get($session["userid"]);
+                }
                 if (isset($_GET['device'])) {
                     $device_name = $_GET['device'];
                 } else {
@@ -68,9 +79,10 @@ function demandshaper_controller()
                 
                 if (isset($schedules->$device_name)) {
                     return view("Modules/demandshaper/Views/main.php", array(
+                        "remoteaccess"=>$remoteaccess,
                         "forecast_list"=>$forecast_list,
                         "schedule"=>$schedules->$device_name,
-                        "device_id"=>$device->exists_nodeid($session["userid"], $device_name)
+                        "device_id"=>0 //$device->exists_nodeid($session["userid"], $device_name)
                     ));
                 }
             }
@@ -79,7 +91,9 @@ function demandshaper_controller()
         case "add-device":
             $route->format = "html";
             if ($session["write"]) {
-                return view("Modules/demandshaper/Views/add_device.php", array());
+                return view("Modules/demandshaper/Views/add_device.php", array(
+                    "remoteaccess"=>$remoteaccess
+                ));
             }
             break;
 
@@ -95,19 +109,19 @@ function demandshaper_controller()
             return $forecast_list;
                         
         case "forecast":
-            if (isset($_POST['config'])) {
-                $config = json_decode($_POST['config']);
-                return $demandshaper->get_combined_forecast($config,$timezone);
+            if (isset($_POST['config']) || isset($_GET['config'])) {
+                $config = json_decode(prop('config'));
+                return $demandshaper->get_combined_forecast($config,$timezone,$session["userid"]);
             } 
             break;
             
         case "schedule":
-            if (isset($_POST['config'])) {
-                $config = json_decode($_POST['config']);
-                $combined = $demandshaper->get_combined_forecast($config,$timezone);
+            if (isset($_POST['config']) || isset($_GET['config'])) {
+                $config = json_decode(prop('config'));
+                $combined = $demandshaper->get_combined_forecast($config,$timezone,$session["userid"]);
                 
-                $period = (int) post('period');               // period in seconds
-                $end = (int) post('end');                     // end timestamp
+                $period = (int) prop('period');               // period in seconds
+                $end = (int) prop('end');                     // end timestamp
                 $interruptible = (int) post('interruptible');
 
                 // Run schedule
@@ -123,11 +137,11 @@ function demandshaper_controller()
             break;
 
         case "timer":
-            if (isset($_POST['config'])) {
-                $timers = json_decode($_POST['config']);
+            if (isset($_POST['config']) || isset($_GET['config'])) {
+                $timers = json_decode(prop('config'));
                 
-                $forecast_start = (int) post('forecast_start');
-                $forecast_end = (int) post('forecast_end');
+                $forecast_start = (int) prop('forecast_start');
+                $forecast_end = (int) prop('forecast_end');
                 
                 // Run schedule
                 require_once "$linked_modules_dir/demandshaper/lib/scheduler2.php";
@@ -137,7 +151,7 @@ function demandshaper_controller()
             break;
             
         case "save": 
-            if ($session["write"]) {
+            if (!$remoteaccess && $session["write"]) {
                 if (isset($_POST['schedule']) || isset($_GET['schedule'])) {
                     $schedule = json_decode(prop('schedule'));
                     
@@ -192,7 +206,7 @@ function demandshaper_controller()
                 $schedule = $demandshaper->device_class[$device_type]->auto_update_timeleft($schedule);
 
                 // 1. Compile combined forecast
-                $combined = $demandshaper->get_combined_forecast($schedule->settings->forecast_config,$timezone);
+                $combined = $demandshaper->get_combined_forecast($schedule->settings->forecast_config,$timezone,$session["userid"]);
                 // 2. Calculate forecast min/max 
                 require_once "$linked_modules_dir/demandshaper/lib/scheduler2.php";
                 $combined = forecast_calc_min_max($combined);
@@ -262,7 +276,7 @@ function demandshaper_controller()
                     include "Modules/demandshaper/MQTTRequest.php";
                     $mqtt_request = new MQTTRequest($settings['mqtt']);
                     
-                    $demandshaper->device_class[$schedules->$device->settings->device_type]->set_basetopic($settings['mqtt']['basetopic']);
+                    $demandshaper->device_class[$schedules->$device->settings->device_type]->set_basetopic($basetopic);
                     return $demandshaper->device_class[$schedules->$device->settings->device_type]->get_state($mqtt_request,$device,$timezone);
                 }
             }   
diff --git a/demandshaper-module/demandshaper_menu.php b/demandshaper-module/demandshaper_menu.php
index 573acfe..a8ed849 100644
--- a/demandshaper-module/demandshaper_menu.php
+++ b/demandshaper-module/demandshaper_menu.php
@@ -1,75 +1,46 @@
 <?php
 
-global $mysqli,$redis,$session;
+global $mysqli,$redis,$session, $demandshaper_hub;
 
 if ($session['write']) {
 
-    $menu['tabs'][] = array(
-        'icon'=>'calendar',
-        'text'=> _("DemandShaper"),
-        'path'=> 'demandshaper',
-        'data'=> array('sidebar' => '#sidebar_demandshaper')
-    );
-
-    require_once "Modules/device/device_model.php";
-    $device = new Device($mysqli,$redis);
+    $menu["demandshaper"] = array("name"=>"Devices", "order"=>3, "icon"=>"calendar", "default"=>"demandshaper/add-device", "l2"=>array());
 
-    require_once "Modules/demandshaper/demandshaper_model.php";
-    $demandshaper = new DemandShaper($mysqli,$redis,$device);
+    if (in_array($session['userid'],$demandshaper_hub)) {
     
-    $devices = $demandshaper->get_list($session['userid']);
+        require_once "Modules/remoteaccess/RemoteAccess.php";
+        $remoteaccess = new RemoteAccess($session["username"]);
+        $devices = $remoteaccess->request("demandshaper","list","",array(),1.5);
+        if ($devices=="API Timeout") $devices = array();
+        
+    } else {
+        require_once "Modules/device/device_model.php";
+        $device = new Device($mysqli,$redis);
+
+        require_once "Modules/demandshaper/demandshaper_model.php";
+        $demandshaper = new DemandShaper($mysqli,$redis,$device);
+        
+        $devices = $demandshaper->get_list($session['userid']);
+        // $devices = json_decode(json_encode($devices));
+    }
     
     $o=0;
-    foreach ($devices as $name=>$d) {
-        $menu['sidebar']['demandshaper'][] = array(
-            'icon' => $d["type"],
-            'text' => ucfirst($devices[$name]['device_name']),
-            'path' => "demandshaper?device=".$name,
-            'order'=> $o
+    foreach ($devices as $name=>$d) {        
+        $menu["demandshaper"]['l2'][] = array(
+            "name"=>ucfirst($devices[$name]['device_name']),
+            "title"=>ucfirst($devices[$name]['device_name']),
+            "href"=>"demandshaper?device=".$name,
+            "icon"=>$d["type"],
+            "order"=>$o
         );
+        $menu["demandshaper"]["default"] = "demandshaper?device=".$name;
         $o++;
     }
     
-    $menu['sidebar']['demandshaper'][] = array(
-        'icon' => "plus",
-        'text' => "Add Device",
-        'path' => "demandshaper/add-device",
-        'order'=> $o
+    $menu["demandshaper"]['l2'][] = array(
+        "name"=>"Add Device",
+        "href"=>"demandshaper/add-device",
+        "icon"=>"plus", 
+        "order"=>$o
     );
 }
-// these <symbols> will be included into the theme.php file within the <svg><defs> 
-$menu['includes']['icons'][] = <<<ICONS
-        <symbol id="icon-smartplug" viewBox="0 0 32 32">
-            <!-- <title>smart_plug</title> -->
-            <path d="m 23.25899,0.51693219 c -0.291893,0.0200725 -0.585576,0.15239844 -0.813057,0.39192845 L 16.872602,6.7772337 18.460181,8.2846985 24.032899,2.4163279 C 24.48786,1.9372548 24.500397,1.2150987 24.060905,0.79767932 23.841129,0.58896847 23.550919,0.49686208 23.259038,0.51693219 Z M 14.269469,5.3852976 c -0.354965,0.015854 -0.703952,0.163746 -0.969575,0.4434823 -0.547207,0.5762169 -0.524044,1.4813777 0.05218,2.0285856 L 25.247205,19.153734 c 0.576226,0.547209 1.481376,0.524045 2.028586,-0.05218 0.531248,-0.55941 0.519397,-1.425493 -0.0084,-1.976413 L 15.274103,5.735611 C 14.985381,5.4861313 14.624713,5.3694451 14.269748,5.3852976 Z m 16.673435,2.4292125 c -0.291893,0.020072 -0.585577,0.1517723 -0.813057,0.3913082 l -5.572718,5.8689897 1.586978,1.507467 5.573331,-5.8689918 C 32.172387,9.2342088 32.184322,8.5126778 31.744722,8.0952573 31.524946,7.8865464 31.234736,7.7944364 30.942855,7.8145101 Z M 12.907967,7.9306543 6.9458115,14.218904 c -2.2690183,2.80115 -2.519563,6.603017 -0.8614966,9.565296 l -3.4534467,3.636677 c -0.7474402,0.787069 -0.7156476,2.022144 0.071432,2.769591 l 0.5937953,0.564601 c 0.7870709,0.747443 2.0221493,0.715022 2.7695895,-0.07206 l 3.411826,-3.592576 c 3.075639,1.619865 6.963796,1.207364 9.701314,-1.254668 l 6.018064,-6.234834 -3.908731,-3.711834 -4.527986,-4.300035 z m -0.980752,6.7168267 2.714306,0.35528 1.791313,4.316806 -2.008084,-0.262734 0.764604,4.634822 -3.537919,-6.141667 2.073929,0.272053 z"></path>
-        </symbol>
-        
-        <symbol id="icon-wifirelay" viewBox="0 0 32 32">
-            <!-- <title>wifi_relay</title> -->
-            <path d="m 23.25899,0.51693219 c -0.291893,0.0200725 -0.585576,0.15239844 -0.813057,0.39192845 L 16.872602,6.7772337 18.460181,8.2846985 24.032899,2.4163279 C 24.48786,1.9372548 24.500397,1.2150987 24.060905,0.79767932 23.841129,0.58896847 23.550919,0.49686208 23.259038,0.51693219 Z M 14.269469,5.3852976 c -0.354965,0.015854 -0.703952,0.163746 -0.969575,0.4434823 -0.547207,0.5762169 -0.524044,1.4813777 0.05218,2.0285856 L 25.247205,19.153734 c 0.576226,0.547209 1.481376,0.524045 2.028586,-0.05218 0.531248,-0.55941 0.519397,-1.425493 -0.0084,-1.976413 L 15.274103,5.735611 C 14.985381,5.4861313 14.624713,5.3694451 14.269748,5.3852976 Z m 16.673435,2.4292125 c -0.291893,0.020072 -0.585577,0.1517723 -0.813057,0.3913082 l -5.572718,5.8689897 1.586978,1.507467 5.573331,-5.8689918 C 32.172387,9.2342088 32.184322,8.5126778 31.744722,8.0952573 31.524946,7.8865464 31.234736,7.7944364 30.942855,7.8145101 Z M 12.907967,7.9306543 6.9458115,14.218904 c -2.2690183,2.80115 -2.519563,6.603017 -0.8614966,9.565296 l -3.4534467,3.636677 c -0.7474402,0.787069 -0.7156476,2.022144 0.071432,2.769591 l 0.5937953,0.564601 c 0.7870709,0.747443 2.0221493,0.715022 2.7695895,-0.07206 l 3.411826,-3.592576 c 3.075639,1.619865 6.963796,1.207364 9.701314,-1.254668 l 6.018064,-6.234834 -3.908731,-3.711834 -4.527986,-4.300035 z m -0.980752,6.7168267 2.714306,0.35528 1.791313,4.316806 -2.008084,-0.262734 0.764604,4.634822 -3.537919,-6.141667 2.073929,0.272053 z"></path>
-        </symbol>
-
-        <symbol id="icon-openevse" viewBox="0 0 32 32">
-            <!-- <title>openevse</title> -->
-            <path d="m 4.271181,3.8763201 c -0.66746,0 -1.20458,0.53712 -1.20458,1.20458 V 28.83242 H 2 v 2.788462 H 19.041338 V 28.83242 h -1.02474 V 15.78309 c 0.37684,-0.0501 0.92994,-0.0941 1.49861,-0.007 0.47878,0.0736 0.91777,0.23495 1.23403,0.50178 0.31314,0.26419 0.55329,0.63335 0.64493,1.33997 l 0.0935,6.84557 0.002,0.0295 c 0.13205,1.63745 0.7532,2.78098 1.63297,3.414261 0.87978,0.633279 1.88516,0.729829 2.68925,0.7028 0.80883,-0.0272 1.83568,-0.20604 2.681481,-0.95084 0.845809,-0.7448 1.391499,-1.991401 1.443329,-3.77962 v -0.0176 L 29.821469,13.209329 a 3.0979756,3.0979756 0 0 0 2.164731,-2.95331 3.0979756,3.0979756 0 0 0 -0.008,-0.15192 h 0.006 V 7.38178 H 31.051454 V 4.3085801 H 30.008625 V 7.38178 H 27.760668 V 4.3085801 h -1.04283 V 7.38178 h -0.93482 v 2.72232 h 0.0139 a 3.0979756,3.0979756 0 0 0 -0.007,0.15192 3.0979756,3.0979756 0 0 0 2.265499,2.98432 l 0.115752,10.60193 c -0.0453,1.45931 -0.43047,2.12833 -0.84388,2.49236 -0.41509,0.36553 -0.97729,0.49156 -1.57406,0.5116 -0.601521,0.0202 -1.18334,-0.0711 -1.5999,-0.37104 -0.4157,-0.29923 -0.797151,-0.83324 -0.902271,-2.11925 l -0.0956,-6.8926 -0.006,-0.0486 c -0.13493,-1.08653 -0.61636,-1.94018 -1.26349,-2.48615 -0.64713,-0.54596 -1.40969,-0.79003 -2.10323,-0.89659 -0.66306,-0.10188 -1.28895,-0.0808 -1.7663,-0.032 V 5.0806501 c 0,-0.66746 -0.53764,-1.20458 -1.2051,-1.20458 z m 0.5947931,2.17145 H 16.038418 V 13.93204 H 4.8659741 Z M 28.884667,8.82072 a 1.3614041,1.3614041 0 0 1 1.361152,1.36116 1.3614041,1.3614041 0 0 1 -1.361152,1.36167 1.3614041,1.3614041 0 0 1 -1.361159,-1.36167 1.3614041,1.3614041 0 0 1 1.361159,-1.36116 z m -19.01848,8.13284 h 3.595641 l -2.88406,3.82716 h 2.74712 L 7.670455,28.17458 9.456392,22.269 H 6.7971231 Z"></path>
-        </symbol>
-
-        <symbol id="icon-emonth" viewBox="0 0 32 32">
-            <!-- <title>emonth</title> -->
-            <path d="m 13.679206,0.29798677 c -3.225442,0 -5.8551056,2.63217853 -5.8551056,5.85575643 v 9.9098388 c -1.9522162,1.706206 -3.3706827,3.989186 -3.3730942,6.705857 v 0.0025 0.0025 c 5.03e-5,5.060831 4.1653869,9.22551 9.2262488,9.225561 5.060847,-5.1e-5 9.222933,-4.16473 9.222997,-9.22559 -8.69e-4,-2.715488 -1.415623,-5.001816 -3.365289,-6.709117 v -2.49437 H 22.09633 V 10.757915 H 19.534963 V 9.5975587 H 22.09633 V 6.7844753 H 19.534963 V 6.153567 c 0,-3.224396 -2.631373,-5.85510193 -5.855757,-5.85510193 z M 13.678541,2.918548 v 6.419e-4 c 1.760328,0 3.235208,1.4748925 3.235208,3.2352078 V 17.04442 c 2.036046,1.153585 3.365817,3.321815 3.366584,5.730231 v 6.32e-4 c -2.6e-5,3.624956 -2.978785,6.603715 -6.603732,6.603753 -3.624958,-3.8e-5 -6.6037032,-2.978797 -6.6037396,-6.603744 v -0.0025 C 7.0750414,20.36367 8.4064253,18.196033 10.444,17.043869 V 6.1538187 c 0,-1.759258 1.474233,-3.2351952 3.234552,-3.2351952 z M 12.310066,6.8692072 V 18.242498 c -1.999879,0.602461 -3.3692896,2.443494 -3.3711426,4.532152 2.6e-5,2.616534 2.1211426,4.737652 4.7376776,4.737677 2.616534,-2.5e-5 4.737652,-2.121143 4.737678,-4.737677 -6.68e-4,-2.08789 -1.368047,-3.929199 -3.366586,-4.53345 V 6.8692072 Z"></path>
-        </symbol>
-
-        <symbol id="icon-hpmon" viewBox="0 0 32 32">
-            <!-- <title>heatpumpmonitor</title> -->
-            <path d="M 5.5201055,4.4518919 C 3.569967,4.4518919 2,6.0218531 2,7.9719965 V 24.027991 c 0,1.950144 1.569967,3.520117 3.5201055,3.520117 H 28.580503 c 1.950144,0 3.520105,-1.569973 3.520105,-3.520117 V 7.9719965 c 0,-1.9501434 -1.569961,-3.5201046 -3.520105,-3.5201046 z M 13.545873,7.9828628 A 8.1040157,8.1040157 0 0 1 21.649662,16.086652 8.1040157,8.1040157 0 0 1 13.545873,24.19044 8.1040157,8.1040157 0 0 1 5.4420802,16.086652 8.1040157,8.1040157 0 0 1 13.545873,7.9828628 Z m -0.04728,1.7447119 v 6.222e-4 c -2.776917,-0.02896 -2.244732,2.8981181 -1.354579,5.2859181 0.04851,0.35048 -0.09752,0.497199 -0.330653,0.53658 -2.4689858,0.500466 -5.2021235,1.595171 -3.7797624,3.972278 1.3981991,2.336749 3.5592944,0.475368 5.1241064,-1.489528 0.278154,-0.308488 0.486419,-0.301743 0.699029,0.0025 1.600456,1.904412 3.804718,3.693544 5.204693,1.358416 1.419171,-2.367083 -1.332723,-3.388857 -3.830931,-3.831575 -0.350814,-0.06138 -0.448535,-0.207326 -0.321693,-0.530825 0.864362,-2.367912 1.362191,-5.275596 -1.41021,-5.304457 z m 13.423596,4.6226943 a 1.7365748,1.7365748 0 0 1 1.737027,1.736383 1.7365748,1.7365748 0 0 1 -1.737027,1.736395 1.7365748,1.7365748 0 0 1 -1.736383,-1.736395 1.7365748,1.7365748 0 0 1 1.736383,-1.736383 z"></path>
-        </symbol>
-        <symbol id="icon-smartmeter" viewBox="0 0 32 32">
-            <!-- <title>smartmeter</title> -->
-            <path d="M4.688 24.625l-2-2 10-10 5.313 5.375 9.438-10.625 1.875 1.875-11.313 12.75-5.313-5.375z"></path>
-        </symbol>
-        <symbol id="icon-edmi-am" viewBox="0 0 32 32">
-            <!-- <title>smartmeter</title> -->
-            <path d="M4.688 24.625l-2-2 10-10 5.313 5.375 9.438-10.625 1.875 1.875-11.313 12.75-5.313-5.375z"></path>
-        </symbol>
-        
-ICONS;
diff --git a/demandshaper-module/demandshaper_model.php b/demandshaper-module/demandshaper_model.php
index f07a291..d7ad670 100644
--- a/demandshaper-module/demandshaper_model.php
+++ b/demandshaper-module/demandshaper_model.php
@@ -285,10 +285,11 @@ public function get_forecast_list() {
         return $forecast_list;
     }
     
-    public function get_combined_forecast($config,$timezone) {
+    public function get_combined_forecast($config,$timezone,$userid) {
         
         $params = new stdClass();
         $params->timezone = $timezone;
+        $params->userid = $userid;
 
         // 1. Set desired forecast interval
         // This will downsample or upsample original forecast
diff --git a/demandshaper-module/js/get_device_state.js b/demandshaper-module/js/get_device_state.js
index 6eac121..9f965c1 100644
--- a/demandshaper-module/js/get_device_state.js
+++ b/demandshaper-module/js/get_device_state.js
@@ -3,7 +3,7 @@
 // used to provide user feedback to confirm that schedule has been transfered to device
 // --------------------------------------------------------------------------------------------   
 function get_device_state() {
-    $.ajax({ url: path+"demandshaper/get-state?device="+schedule.settings.device,
+    $.ajax({ url: emoncmspath+"demandshaper/get-state?device="+schedule.settings.device,
         dataType: 'json',
         async: true,
         success: function(result) {
diff --git a/demandshaper-module/js/main.js b/demandshaper-module/js/main.js
index d007a90..0b31e76 100644
--- a/demandshaper-module/js/main.js
+++ b/demandshaper-module/js/main.js
@@ -31,7 +31,7 @@ function get_forecast(callback) {
     $.ajax({
         type: 'POST',
         data: "config="+JSON.stringify(schedule.settings.forecast_config),
-        url: path+"demandshaper/forecast", 
+        url: emoncmspath+"demandshaper/forecast", 
         dataType: 'json', 
         async: true, 
         success: function(result) {
@@ -52,7 +52,7 @@ function calc_schedule(callback) {
         $.ajax({
             type: 'POST',
             data: "config="+JSON.stringify(schedule.settings.forecast_config)+"&interruptible="+schedule.settings.interruptible+"&period="+schedule.runtime.timeleft+"&end="+schedule.settings.end_timestamp,
-            url: path+"demandshaper/schedule", 
+            url: emoncmspath+"demandshaper/schedule", 
             dataType: 'json', 
             async: true, 
             success: function(result) {
@@ -67,7 +67,7 @@ function calc_schedule(callback) {
         $.ajax({
             type: 'POST',
             data: "config="+JSON.stringify(schedule.settings.timer)+"&forecast_start="+forecast.start+"&forecast_end="+forecast.end,
-            url: path+"demandshaper/timer", 
+            url: emoncmspath+"demandshaper/timer", 
             dataType: 'json', 
             async: true, 
             success: function(result) {
@@ -138,7 +138,7 @@ function update_input_UI() {
 }
 
 function update_UI_from_input_values(){
-    $.ajax({ url: path+"input/get/"+schedule.settings.device, dataType: 'json', async: true, success: function(inputs) {
+    $.ajax({ url: emoncmspath+"input/get/"+schedule.settings.device, dataType: 'json', async: true, success: function(inputs) {
         if (inputs!=null) {
             var fn_name = schedule.settings.device_type+"_update_UI_from_input_values";
             if (window[fn_name]!=undefined) window[fn_name](inputs);
@@ -270,7 +270,7 @@ function save_schedule() {
             $.ajax({
                 type: 'POST',
                 data: "schedule="+JSON.stringify(schedule),
-                url: path+"demandshaper/save", 
+                url: emoncmspath+"demandshaper/save", 
                 dataType: 'text', 
                 async: true, 
                 success: function(result) {
@@ -398,11 +398,11 @@ $("#delete-device-confirm").click(function(){
     on_UI_change();
     apikeystr = "";
     // 1. Delete demandshaper schedule entry
-    $.ajax({ url: path+"demandshaper/delete?device="+schedule.settings.device+apikeystr, async: true, success: function(data) {
+    $.ajax({ url: emoncmspath+"demandshaper/delete?device="+schedule.settings.device+apikeystr, async: true, success: function(data) {
         // 2. Delete device
-        $.ajax({ url: path+"device/delete.json", data: "id="+device_id+apikeystr, async: true, success: function(data) {
+        $.ajax({ url: emoncmspath+"device/delete.json", data: "id="+device_id+apikeystr, async: true, success: function(data) {
             // 3. Delete device inputs
-            $.ajax({ url: path+"input/list.json"+apikeystr, async: true, success: function(data) {
+            $.ajax({ url: emoncmspath+"input/list.json"+apikeystr, async: true, success: function(data) {
                 // get list of device inputs
                 var device_inputs = [];
                 for (var z in data) {
@@ -412,7 +412,7 @@ $("#delete-device-confirm").click(function(){
                 }
                 console.log("Deleting inputs:");
                 console.log(device_inputs);
-                $.ajax({ url: path+"input/delete.json"+apikeystr, data: "inputids="+JSON.stringify(device_inputs), async: true, success: function(data){
+                $.ajax({ url: emoncmspath+"input/delete.json"+apikeystr, data: "inputids="+JSON.stringify(device_inputs), async: true, success: function(data){
                     location.href = path+"demandshaper";
                 }});
             }});
diff --git a/demandshaper-module/js/tasmota.js b/demandshaper-module/js/tasmota.js
new file mode 100644
index 0000000..4aa91d5
--- /dev/null
+++ b/demandshaper-module/js/tasmota.js
@@ -0,0 +1,4 @@
+
+function tasmota_update_UI_from_input_values(inputs) {
+}
+
diff --git a/demandshaper.service b/demandshaper.service
index 6c18f19..ddb6d4c 100644
--- a/demandshaper.service
+++ b/demandshaper.service
@@ -51,7 +51,7 @@ Documentation=https://github.com/emoncms/demandshaper/blob/master/readme.md
 [Service]
 Type=idle
 ExecStart=/usr/bin/php /home/pi/demandshaper/demandshaper_run.php
-User=pi
+User=cydynni
 
 # Restart script if stopped
 Restart=always
diff --git a/demandshaper_run.php b/demandshaper_run.php
index aea662d..776782a 100644
--- a/demandshaper_run.php
+++ b/demandshaper_run.php
@@ -127,7 +127,7 @@
             // Get time of start of day
             $timezone = $user->get_timezone($userid);
             $date = new DateTime();
-            $date->setTimezone(new DateTimeZone($timezone));
+            $date->setTimezone(new DateTimeZone("Europe/London"));
             $date->setTimestamp($now);
             $date->modify("midnight");
             $daystart = $date->getTimestamp();
@@ -243,7 +243,7 @@
                         $schedule = $device_class[$device_type]->auto_update_timeleft($schedule);
                     
                         // 1. Compile combined forecast
-                        $combined = $demandshaper->get_combined_forecast($schedule->settings->forecast_config,$timezone);
+                        $combined = $demandshaper->get_combined_forecast($schedule->settings->forecast_config,$timezone,$userid);
                         // 2. Calculate forecast min/max 
                         $combined = forecast_calc_min_max($combined);
                         // 3. Calculate schedule
@@ -259,7 +259,7 @@
                 }
                 else if ($schedule->settings->ctrlmode=="timer") {
                     // 1. Compile combined forecast, not really needed here but we need forecast start and end times
-                    $combined = $demandshaper->get_combined_forecast($schedule->settings->forecast_config,$timezone);
+                    $combined = $demandshaper->get_combined_forecast($schedule->settings->forecast_config,$timezone,$userid);
                     // 2. Calculate periods from timers
                     $schedule->runtime->periods = schedule_timer($combined->start,$combined->end,$schedule->settings->timer,$timezone);
                     // 3. Log output for debug
diff --git a/devices/tasmota.php b/devices/tasmota.php
new file mode 100644
index 0000000..5dc02ef
--- /dev/null
+++ b/devices/tasmota.php
@@ -0,0 +1,262 @@
+<?php
+class tasmota
+{
+    public $mqtt_client = false;
+    public $basetopic = "";
+
+    public $last_ctrlmode = array();
+    public $last_timer = array();
+    public $last_flowT = array();
+
+    public function __construct($mqtt_client,$basetopic) {
+        $this->mqtt_client = $mqtt_client;
+        $this->basetopic = $basetopic;
+    }
+
+    public function default_settings() {
+        $defaults = new stdClass();
+        return $defaults;
+    }
+
+    public function set_basetopic($basetopic) {
+        $this->basetopic = $basetopic;
+    }
+
+    // Gets the offset for a timezone in decimal hours (e.g +01:30 returns 1.5)
+    public function get_time_offset($timezone) {
+        $dateTimeZone = new DateTimeZone($timezone);
+        $date = new DateTime("now", $dateTimeZone);
+        return $dateTimeZone->getOffset($date) / 3600;
+    }
+
+    public function on($device) {
+      schedule_log("Tasmota $device switch on");
+
+        if (!isset($this->last_ctrlmode[$device])) $this->last_ctrlmode[$device] = "";
+
+        if ($this->last_ctrlmode[$device]!="on") {
+            $this->last_ctrlmode[$device] = "on";
+            // user/1/tasmota/cmnd/tasmota_AABB3F/POWER -m 'OFF'
+            $this->mqtt_client->publish("$this->basetopic/$device/cmnd/timers","0",0);
+            $this->mqtt_client->publish("$this->basetopic/$device/cmnd/POWER","ON",0);
+            schedule_log("Tasmota $device switch on sent");
+        }
+    }
+
+    public function off($device) {
+      schedule_log("Tasmota $device switch off");
+
+        if (!isset($this->last_ctrlmode[$device])) $this->last_ctrlmode[$device] = "";
+
+        if ($this->last_ctrlmode[$device]!="off") {
+            $this->last_ctrlmode[$device] = "off";
+            $this->mqtt_client->publish("$this->basetopic/$device/cmnd/timers","0",0);
+            $this->mqtt_client->publish("$this->basetopic/$device/cmnd/POWER","OFF",0);
+            schedule_log("Tasmota $device switch off sent");
+        }
+    }
+
+
+    public function timer($device,$s1,$e1,$s2,$e2) {
+
+        // TODO - doesn't work with somevalues e.g. close to midnight during BST.
+        schedule_log("Tasmota $device timer mode $s1 $e1 $s2 $e2");
+
+        $payloads = [];
+        $UTC = new DateTimeZone("UTC");
+        $now = new DateTime("now", $UTC);
+        foreach ([$s1, $e1] as $i => $t) { // Only one time slot is currently in use - , $s2, $e2
+          $dt = DateTime::createFromFormat("Hi", time_conv_dec_str($t), $UTC);
+          schedule_log($dt->format('H:i'));
+
+          $action = 1;
+          if ($i % 2) {
+            $action = 0;
+          }
+          schedule_log($now->format("Y-m-d\TH:i:s\Z")." - ".$dt->format('Y-m-d\TH:i:s\Z'));
+
+          $dt->setTimezone(new DateTimeZone(date_default_timezone_get())); // TODO should get the remote timezone rather than assume it is the same as the server
+          schedule_log($dt->format('H:i'));
+
+          $payload = json_encode(array(
+            "Enable" => 1,
+            "Mode" => 0,
+            "Time" => $dt->format("H:i"),
+            "Days" => "SMTWTFS",
+            "Repeat" => 1,
+            "Action" => $action
+          ));
+          array_push($payloads, $payload);
+          schedule_log($payload);
+        }
+
+        schedule_log($payloads[1]);
+        schedule_log($payloads[2]);
+        schedule_log($payloads[3]);
+
+        if (!isset($this->last_ctrlmode[$device])) $this->last_ctrlmode[$device] = "";
+        if (!isset($this->last_timer[$device])) $this->last_timer[$device] = "";
+
+
+        $timer_str = time_conv_dec_str($s1)." ".time_conv_dec_str($e1)." ".time_conv_dec_str($s2)." ".time_conv_dec_str($e2);
+
+        // If state or time has changed
+        if ($this->last_ctrlmode[$device]!="timer" || $timer_str!=$this->last_timer[$device]) {
+          $this->last_ctrlmode[$device] = "timer";
+          $this->last_timer[$device] = $timer_str;
+          foreach($payloads as $i => $payload) {
+            $this->mqtt_client->publish("$this->basetopic/$device/cmnd/Timer".($i+1), $payload, 0);
+          }
+          $this->mqtt_client->publish("$this->basetopic/$device/cmnd/Timers", 1 ,0); // Enable timers
+          schedule_log("Tasmota $device set timer $timer_str");
+        }
+    }
+
+    public function send_state_request($device) {
+        schedule_log("Tasmota $device send state request");
+        $this->mqtt_client->publish($this->basetopic."/$device/cmnd/Status8","",0);
+        $this->mqtt_client->publish($this->basetopic."/$device/cmnd/Timers","",0);
+    }
+
+    public function handle_state_response($schedule,$message,$timezone) {
+
+        $device = $schedule->settings->device;
+
+        schedule_log("Tasmota $device handle_state_response $message->topic: $message->payload");
+        schedule_log("$message->topic - $this->basetopic/$device/stat/STATUS0");
+        if ($message->topic==$this->basetopic."/$device/stat/STATUS0") {
+            $p = json_decode($message->payload);
+
+            schedule_log("stat result: $message->payload");
+
+
+            if (isset($p->StatusNET)) {
+              if (isset($p->StatusNET->IPAddress)) {
+                $schedule->settings->ip = $p->StatusNET->IPAddress;
+              }
+            }
+
+            if (isset($p->POWER)) {
+              if ($p->StatusSTS->POWER=="ON") {
+                $schedule->settings->ctrlmode = "on";
+                schedule_log("$device is on");
+              }
+              if ($p->StatusSTS->POWER=="OFF") {
+                $schedule->settings->ctrlmode = "off";
+                schedule_log("$device is off");
+              }
+
+             //   if ($p->POWER=="Timer" && $schedule->settings->ctrlmode!="smart") $schedule->settings->ctrlmode = "timer";
+            }
+
+            if (isset($p->Timers)) {
+              if ($p->Timers == "ON") {
+//                if ($timer->Enable == 1) { // check for mismatch on enabled, action etc.
+                  $timeOffset = $this->get_time_offset($timezone);
+                  if ($p->Timer1->Enable == 1) {
+                    $schedule->settings->timer_start1 = time_conv($p->Timer1, $timeOffset);
+                  }
+                  if ($p->Timer1->Enable == 1) {
+                    $schedule->settings->timer_stop1 = time_conv($p->Timer2, $timeOffset);
+                  }
+                  if ($p->Timer1->Enable == 1) {
+                    $schedule->settings->timer_start2 = time_conv($p->Timer3, $timeOffset);
+                  }
+                  if ($p->Timer1->Enable == 1) {
+                    $schedule->settings->timer_stop2 = time_conv($p->Timer4, $timeOffset);
+                  }
+              }
+            }
+
+            $schedule->runtime->last_update_from_device = time();
+            return $schedule;
+        } else if ($message->topic==$this->basetopic."/$device/stat/RESULT") {
+          if (isset($p->Timers)) {
+            if ($p->Timers == "ON") {
+              //                if ($timer->Enable == 1) { // check for mismatch on enabled, action etc.
+              $timeOffset = $this->get_time_offset($timezone);
+              if ($p->Timer1->Enable == 1) {
+                $schedule->settings->timer_start1 = time_conv($p->Timer1, $timeOffset);
+              }
+              if ($p->Timer1->Enable == 1) {
+                $schedule->settings->timer_stop1 = time_conv($p->Timer2, $timeOffset);
+              }
+              if ($p->Timer1->Enable == 1) {
+                $schedule->settings->timer_start2 = time_conv($p->Timer3, $timeOffset);
+              }
+              if ($p->Timer1->Enable == 1) {
+                $schedule->settings->timer_stop2 = time_conv($p->Timer4, $timeOffset);
+              }
+            }
+          }
+
+          $schedule->runtime->last_update_from_device = time();
+          return $schedule;
+        }
+        return false;
+    }
+
+    public function get_state($mqtt_request,$device,$timezone) {
+
+      schedule_log("Tasmota $device switch on");
+
+        $result = json_decode($mqtt_request->request($this->basetopic."/$device/cmnd/Status0","",$this->basetopic."/$device/stat/STATUS0"));
+        if (!$result) {
+          schedule_log("No result fetching state for $device");
+          return false;
+        }
+      /*  $timers_result = json_decode($mqtt_request->request($this->basetopic."/$device/cmnd/Timers","",$this->basetopic."/$device/stat/RESULT"));
+        if (!$result) {
+          schedule_log("No result fetching timers for $device");
+          return false;
+        }
+        $timezone_result = json_decode($mqtt_request->request($this->basetopic."/$device/cmnd/Timezone","",$this->basetopic."/$device/stat/RESULT"));
+        if (!$timezone_result) {
+          schedule_log("No result fetching timers for $device");
+          return false;
+        }
+        $timezone_result->Timezone; */
+
+        $state = new stdClass;
+        if ($result->StatusSTS->POWER == "ON") {
+          $state->ctrl_mode = "on";
+        } else if ($result->StatusSTS->POWER == "OFF") {
+          $state->ctrl_mode = "off";
+        }
+
+
+           /* $timer_parts = explode(" ",$result->timer);
+
+            $dateTimeZone = new DateTimeZone($timezone);
+            $date = new DateTime("now", $dateTimeZone);
+            $timeOffset = $dateTimeZone->getOffset($date) / 3600;
+            */
+
+        /*
+          "Timer1": {
+          "Enable": 1,
+            "Mode": 0,
+            "Time": "03:00",
+            "Window": 0,
+            "Days": "1111111",
+            "Repeat": 1,
+            "Output": 1,
+            "Action": 1
+        },
+        */
+
+
+
+
+        $state->timer_start1 = conv_time($timer_parts[0],$timeOffset);
+        $state->timer_stop1 = conv_time($timer_parts[1],$timeOffset);
+        $state->timer_start2 = conv_time($timer_parts[2],$timeOffset);
+        $state->timer_stop2 = conv_time($timer_parts[3],$timeOffset);
+//        $state->voltage_output = $result->vout*1;*/
+        return $state;
+    }
+
+    public function auto_update_timeleft($schedule) {
+        return $schedule;
+    }
+}
diff --git a/forecasts/demandprofile.php b/forecasts/demandprofile.php
new file mode 100644
index 0000000..40662e8
--- /dev/null
+++ b/forecasts/demandprofile.php
@@ -0,0 +1,55 @@
+<?php
+
+function get_list_entry_demandprofile()
+{
+    return array(
+        "category"=>"Demand Profile",
+        "name"=>"Demand Profile",
+        "params"=>array(
+            "device_name"=>array("name"=>"Device name","type"=>"text")
+        )
+    );
+}
+
+function get_forecast_demandprofile($redis,$params)
+{
+    $timezone = new DateTimeZone($params->timezone);
+    $forecast_interval = 1800;
+
+    if ($demandshaper_devices_json = $redis->get("demandshaper:schedules:".$params->userid)) {
+        $demandshaper_devices = json_decode($demandshaper_devices_json);
+    }
+    
+    $device_schedules = array();    
+    foreach ($demandshaper_devices as $name=>$device) {
+        if ($name!=$params->device_name) {
+            $device_schedules[] = $device->runtime->periods;
+        }
+    }
+
+    $profile = array();
+    for ($time=$params->start; $time<$params->end; $time+=$params->interval) {
+        $forecast_time = floor($time / $forecast_interval) * $forecast_interval;
+        
+        $status = 0;
+        foreach ($device_schedules as $device_schedule) {
+            foreach ($device_schedule as $period) {
+                $start = $period->start[0];
+                $end = $period->end[0];
+                if ($time>=$start && $time<$end) {
+                    $status += 10;
+                }
+            }
+        }
+        
+        $profile[] = $status;
+    }
+    
+    $result = new stdClass();
+    $result->start = $params->start;
+    $result->end = $params->end; 
+    $result->interval = $params->interval;
+    $result->profile = $profile;
+    $result->optimise = MIN;
+    return $result;
+}
diff --git a/forecasts/energylocal.php b/forecasts/energylocal.php
index 991e4bd..c55f92a 100644
--- a/forecasts/energylocal.php
+++ b/forecasts/energylocal.php
@@ -11,8 +11,10 @@ function get_list_entry_energylocal()
                 "type"=>"select",
                 "options"=>array(
                     "bethesda"=>"Bethesda",
-                    "bethesda_solar"=>"Bethesda Solar",
-                    "repower"=>"Repower"
+                    "corwen"=>"Corwen",
+                    "crickhowell"=>"Crickhowell",
+                    "bethesda_solar"=>"Solar",
+                    "repower"=>"Repower",
                 ),
                 "default"=>"bethesda"
             )
diff --git a/lib/misc.php b/lib/misc.php
index 4fdc151..4a84ab0 100644
--- a/lib/misc.php
+++ b/lib/misc.php
@@ -7,6 +7,7 @@ function time_offset($t,$timeOffset) {
     return $t;
 }
 
+// time_conv and conv_time???
 function time_conv($t,$timeOffset){
     $t = floor($t*0.01) + ($t*0.01 - floor($t*0.01))/0.6;
     $t += $timeOffset;
@@ -24,6 +25,8 @@ function conv_time($time,$timeOffset) {
     return $t;
 }
 
+
+// Converts fractional time to human readable time, e.g. 14.5 to "14$div30"
 function time_conv_dec_str($t,$div="") {
     $h = floor($t); 
     $m = round(($t-$h)*60);