From 0496b04608e566b689b0b57a156af63079301465 Mon Sep 17 00:00:00 2001
From: manuel83 <cUrrent2015>
Date: Mon, 28 Jan 2019 22:21:31 +0100
Subject: [PATCH] config fix

---
 .idea/workspace.xml                        | 1251 +++++++++++---------
 cbpi/api/sensor.py                         |    7 +-
 cbpi/api/step.py                           |   10 +-
 cbpi/controller/actor_controller.py        |    6 +-
 cbpi/controller/crud_controller.py         |   15 +-
 cbpi/controller/kettle_controller.py       |    6 +-
 cbpi/controller/sensor_controller.py       |    5 +-
 cbpi/controller/step_controller.py         |   20 +-
 cbpi/controller/system_controller.py       |   52 +-
 cbpi/database/model.py                     |    2 +
 cbpi/database/orm_framework.py             |    6 +
 cbpi/extension/dummylogic/__init__.py      |    6 +-
 cbpi/extension/dummysensor/__init__.py     |    9 +-
 cbpi/extension/dummystep/__init__.py       |   21 +-
 cbpi/http_endpoints/http_curd_endpoints.py |    5 +-
 cbpi/http_endpoints/http_sensor.py         |   40 +-
 cbpi/http_endpoints/http_step.py           |    5 +-
 cbpi/utils/encoder.py                      |    3 +-
 craftbeerpi.db                             |  Bin 53248 -> 53248 bytes
 tests/test_config.py                       |    2 +-
 tests/test_dashboard.py                    |    3 +-
 tests/test_index.py                        |    2 +-
 tests/test_kettle.py                       |    4 +-
 23 files changed, 881 insertions(+), 599 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb23ca5..56b176b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,25 +3,28 @@
   <component name="ChangeListManager">
     <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/cli.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/cli.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/api/sensor.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/api/sensor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/api/step.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/api/step.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/controller/actor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/actor_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/controller/crud_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/crud_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/controller/kettle_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/kettle_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/controller/sensor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/sensor_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/controller/step_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/step_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/translation_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/translation_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/craftbeerpi.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/craftbeerpi.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/extension/comp/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/comp/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/controller/system_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/system_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/database/model.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/database/model.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/database/orm_framework.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/database/orm_framework.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_config.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_kettle.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_kettle.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/utils/encoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/utils/encoder.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/craftbeerpi.db" beforeDir="false" afterPath="$PROJECT_DIR$/craftbeerpi.db" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/actor.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/actor.rst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs_src/source/conf.py" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/conf.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_config.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_dashboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_dashboard.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_index.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_index.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_kettle.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_kettle.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -42,9 +45,9 @@
     <SUITE FILE_PATH="coverage/craftbeerpi4$dummy.coverage" NAME="dummy Coverage Results" MODIFIED="1546520051389" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_config_py.coverage" NAME="pytest in test_config.py Coverage Results" MODIFIED="1546113553124" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_actor.coverage" NAME="pytest for tests.test_actor Coverage Results" MODIFIED="1546724758047" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1546728972103" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1546525009502" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1548361615044" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1548370129500" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1548370120657" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1548710313894" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_kettle_KettleTestCase.coverage" NAME="pytest for test_kettle.KettleTestCase Coverage Results" MODIFIED="1546357864696" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$py_test_in_tests.coverage" NAME="py.test in tests Coverage Results" MODIFIED="1544486432317" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_ConfigTestCase.coverage" NAME="pytest for test_config.ConfigTestCase Coverage Results" MODIFIED="1546212760017" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -84,10 +87,22 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/controller/actor_controller.py">
+        <entry file="file://$PROJECT_DIR$/cbpi/api/sensor.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="497">
-              <caret line="123" column="66" selection-start-line="123" selection-start-column="66" selection-end-line="123" selection-end-column="66" />
+            <state relative-caret-position="210">
+              <caret line="14" column="21" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="21" />
+              <folding>
+                <element signature="e#0#48#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/controller/config_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="255">
+              <caret line="25" column="15" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -95,32 +110,54 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/api/__init__.py">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/utils/encoder.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="311">
+              <caret line="25" column="60" selection-start-line="25" selection-start-column="60" selection-end-line="25" selection-end-column="60" />
+              <folding>
+                <element signature="e#0#28#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="274">
+              <caret line="39" column="52" selection-start-line="39" selection-start-column="52" selection-end-line="39" selection-end-column="52" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/config">
+          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+            <state>
+              <filtering enabled="true" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/config.yaml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/cbpi/controller/kettle_controller.py">
+        <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="206">
-              <caret line="98" column="31" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#9#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../craftbeerpi-ui/cbpi-ui/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="426">
-              <caret line="67" column="43" lean-forward="true" selection-start-line="67" selection-start-column="43" selection-end-line="67" selection-end-column="43" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="367">
-              <caret line="60" selection-start-line="60" selection-end-line="60" />
+            <state relative-caret-position="137">
+              <caret line="177" column="80" selection-start-line="177" selection-start-column="80" selection-end-line="177" selection-end-column="80" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -128,40 +165,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/extension/comp/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="307">
-              <caret line="43" column="12" selection-start-line="43" selection-start-column="12" selection-end-line="43" selection-end-column="12" />
-              <folding>
-                <element signature="e#0#9#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_kettle.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="465">
-              <caret line="173" column="40" selection-start-line="173" selection-start-column="40" selection-end-line="173" selection-end-column="40" />
-              <folding>
-                <element signature="e#0#23#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/docs_src/build/html/install.html">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3315">
-              <caret line="224" column="47" selection-start-line="224" selection-start-column="47" selection-end-line="224" selection-end-column="47" />
+            <state relative-caret-position="15">
+              <caret line="229" column="4" selection-start-line="229" selection-start-column="4" selection-end-line="262" selection-end-column="39" />
               <folding>
                 <element signature="e#0#23#0" expanded="true" />
               </folding>
@@ -170,25 +178,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/websocket.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="34" column="32" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="32" />
-              <folding>
-                <element signature="e#0#14#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
-              <folding>
-                <element signature="e#0#14#0" expanded="true" />
-              </folding>
+        <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/sensor">
+          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+            <state>
+              <filtering enabled="true" />
             </state>
           </provider>
         </entry>
@@ -204,9 +197,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>###</find>
-      <find>ui</find>
-      <find>httpsen</find>
       <find>CustomSensor</find>
       <find>Errr</find>
       <find>ws</find>
@@ -225,7 +215,6 @@
       <find>step/brewing/stopped</find>
       <find>ADDD</find>
       <find>Nit ACTOR</find>
-      <find>DELE</find>
       <find>delete_a</find>
       <find>notifi</find>
       <find>exte</find>
@@ -234,6 +223,10 @@
       <find>job</find>
       <find>print</find>
       <find>automatic</find>
+      <find>delete</find>
+      <find>not found</find>
+      <find>DELE</find>
+      <find>dirty</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -257,16 +250,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/views/hardware/Hardware.js" />
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/views/hardware/SensorTable.js" />
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/websocket.js" />
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/views/hardware/ActorTable.js" />
-        <option value="$PROJECT_DIR$/samples.txt" />
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/recucers/brewing.js" />
-        <option value="$PROJECT_DIR$/cbpi/controller/dashboard_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/recucers/dashboard.js" />
-        <option value="$PROJECT_DIR$/cbpi/controller/config_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/recucers/parameter.js" />
         <option value="$PROJECT_DIR$/cbpi/extension/ui/react/src/recucers/translation.js" />
         <option value="$PROJECT_DIR$/requirements.txt" />
         <option value="$PROJECT_DIR$/.gitignore" />
@@ -276,7 +259,6 @@
         <option value="$PROJECT_DIR$/docs_src/source/install.rst" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_translation.py" />
         <option value="$PROJECT_DIR$/cbpi/api/actor.py" />
-        <option value="$PROJECT_DIR$/cbpi/api/sensor.py" />
         <option value="$PROJECT_DIR$/sample.py" />
         <option value="$PROJECT_DIR$/cbpi/api/__init__.py" />
         <option value="$PROJECT_DIR$/cbpi/api/decorator.py" />
@@ -285,36 +267,47 @@
         <option value="$PROJECT_DIR$/cbpi/eventbus.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" />
         <option value="$PROJECT_DIR$/config/config.yaml" />
-        <option value="$PROJECT_DIR$/cbpi/api/step.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" />
-        <option value="$PROJECT_DIR$/cbpi/database/model.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/system_controller.py" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_config.py" />
-        <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
-        <option value="$PROJECT_DIR$/docs_src/source/conf.py" />
-        <option value="$PROJECT_DIR$/docs_src/source/actor.rst" />
         <option value="$PROJECT_DIR$/cbpi/craftbeerpi.py" />
         <option value="$PROJECT_DIR$/cbpi/cli.py" />
         <option value="$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/actor_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/step_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/translation_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" />
-        <option value="$PROJECT_DIR$/cbpi/utils/encoder.py" />
-        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_kettle.py" />
         <option value="$PROJECT_DIR$/cbpi/extension/comp/__init__.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/kettle_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py" />
+        <option value="$PROJECT_DIR$/tests/test_index.py" />
+        <option value="$PROJECT_DIR$/tests/test_config.py" />
+        <option value="$PROJECT_DIR$/tests/test_dashboard.py" />
+        <option value="$PROJECT_DIR$/tests/test_kettle.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/system_controller.py" />
+        <option value="$PROJECT_DIR$/docs_src/source/standards.rst" />
+        <option value="$PROJECT_DIR$/docs_src/source/conf.py" />
+        <option value="$PROJECT_DIR$/docs_src/source/actor.rst" />
+        <option value="$PROJECT_DIR$/docs_src/source/webapis.rst" />
+        <option value="$PROJECT_DIR$/cbpi/database/orm_framework.py" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/step_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/database/model.py" />
+        <option value="$PROJECT_DIR$/cbpi/api/step.py" />
+        <option value="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/actor_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/sensor_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/crud_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/utils/encoder.py" />
+        <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
+        <option value="$PROJECT_DIR$/cbpi/api/sensor.py" />
+        <option value="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
     <option name="y" value="23" />
-    <option name="width" value="1680" />
-    <option name="height" value="962" />
+    <option name="width" value="1472" />
+    <option name="height" value="911" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -338,28 +331,28 @@
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="sensor.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="sensor.py" type="8704e2dd:PyFileNode" />
+              <item name="CBPiSensor" type="dd8bbb05:PyElementNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="kettle_controller.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="kettle_controller.py" type="8704e2dd:PyFileNode" />
-              <item name="KettleController" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="database" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
@@ -372,14 +365,14 @@
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
               <item name="extension" type="462c0819:PsiDirectoryNode" />
-              <item name="comp" type="462c0819:PsiDirectoryNode" />
+              <item name="dummysensor" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
               <item name="extension" type="462c0819:PsiDirectoryNode" />
-              <item name="comp" type="462c0819:PsiDirectoryNode" />
+              <item name="dummysensor" type="462c0819:PsiDirectoryNode" />
               <item name="__init__.py" type="8704e2dd:PyFileNode" />
             </path>
             <path>
@@ -387,24 +380,9 @@
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
               <item name="extension" type="462c0819:PsiDirectoryNode" />
-              <item name="comp" type="462c0819:PsiDirectoryNode" />
-              <item name="__init__.py" type="8704e2dd:PyFileNode" />
-              <item name="MyComp" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="extension" type="462c0819:PsiDirectoryNode" />
-              <item name="dummylogic" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="extension" type="462c0819:PsiDirectoryNode" />
-              <item name="dummylogic" type="462c0819:PsiDirectoryNode" />
+              <item name="dummysensor" type="462c0819:PsiDirectoryNode" />
               <item name="__init__.py" type="8704e2dd:PyFileNode" />
+              <item name="CustomSensor" type="dd8bbb05:PyElementNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
@@ -412,6 +390,87 @@
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
               <item name="http_endpoints" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="cbpi" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="logs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_config.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_config.py" type="8704e2dd:PyFileNode" />
+              <item name="ConfigTestCase" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_dashboard.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_dashboard.py" type="8704e2dd:PyFileNode" />
+              <item name="DashboardTestCase" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_index.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_index.py" type="8704e2dd:PyFileNode" />
+              <item name="IndexTestCase" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_kettle.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_kettle.py" type="8704e2dd:PyFileNode" />
+              <item name="KettleTestCase" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_system.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="test_system.py" type="8704e2dd:PyFileNode" />
+              <item name="IndexTestCase" type="dd8bbb05:PyElementNode" />
+            </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -425,31 +484,162 @@
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi-ui" type="462c0819:PsiDirectoryNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi-ui" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi-ui" type="462c0819:PsiDirectoryNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="asyncio" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi-ui" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi-ui" type="462c0819:PsiDirectoryNode" />
-              <item name="__init__.py" type="8704e2dd:PyFileNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="asyncio" type="462c0819:PsiDirectoryNode" />
+              <item name="tasks.py" type="8704e2dd:PyFileNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="craftbeerpi-ui" type="462c0819:PsiDirectoryNode" />
-              <item name="cbpi-ui" type="462c0819:PsiDirectoryNode" />
-              <item name="__init__.py" type="8704e2dd:PyFileNode" />
-              <item name="UIWebSocket" type="dd8bbb05:PyElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+              <item name="web_response.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+              <item name="web_response.py" type="8704e2dd:PyFileNode" />
+              <item name="Response" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+              <item name="web_response.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+              <item name="web_response.py" type="8704e2dd:PyFileNode" />
+              <item name="Response" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+              <item name="web_response.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
+              <item name="web_response.py" type="8704e2dd:PyFileNode" />
+              <item name="Response" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="1959656778" type="70582d5e:PySkeletonsNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="1959656778" type="70582d5e:PySkeletonsNode" />
+              <item name="_sha256.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="1959656778" type="70582d5e:PySkeletonsNode" />
+              <item name="_sha256.py" type="8704e2dd:PyFileNode" />
+              <item name="SHA224Type" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="1959656778" type="70582d5e:PySkeletonsNode" />
+              <item name="builtins.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="1959656778" type="70582d5e:PySkeletonsNode" />
+              <item name="builtins.py" type="8704e2dd:PyFileNode" />
+              <item name="Exception" type="dd8bbb05:PyElementNode" />
             </path>
           </expand>
           <select />
@@ -689,8 +879,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.sample" />
         <item itemvalue="Python tests.pytest in tests" />
+        <item itemvalue="Python.sample" />
         <item itemvalue="Python.test" />
         <item itemvalue="Python.cli" />
       </list>
@@ -725,7 +915,8 @@
       <workItem from="1547893445860" duration="434000" />
       <workItem from="1547903206587" duration="1339000" />
       <workItem from="1548102683575" duration="10341000" />
-      <workItem from="1548359334840" duration="2252000" />
+      <workItem from="1548359334840" duration="7272000" />
+      <workItem from="1548369407856" duration="25253000" />
     </task>
     <task id="LOCAL-00001" summary="Lots of changes">
       <created>1541288846149</created>
@@ -745,21 +936,6 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="pytest_for_tests_test_actor - 2019.01.05 at 22h 40m 42s.xml">
-      <configuration name="pytest for tests.test_actor" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_for_tests_test_actor - 2019.01.05 at 22h 42m 11s.xml">
-      <configuration name="pytest for tests.test_actor" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_for_tests_test_actor - 2019.01.05 at 22h 42m 42s.xml">
-      <configuration name="pytest for tests.test_actor" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_for_tests_test_actor - 2019.01.05 at 22h 43m 01s.xml">
-      <configuration name="pytest for tests.test_actor" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_for_tests_test_actor - 2019.01.05 at 22h 43m 21s.xml">
-      <configuration name="pytest for tests.test_actor" configurationId="tests" />
-    </history-entry>
     <history-entry file="pytest_for_tests_test_actor - 2019.01.05 at 22h 45m 28s.xml">
       <configuration name="pytest for tests.test_actor" configurationId="tests" />
     </history-entry>
@@ -775,11 +951,26 @@
     <history-entry file="pytest_in_tests - 2019.01.05 at 23h 56m 45s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
+    <history-entry file="pytest_in_tests - 2019.01.24 at 23h 41m 19s.xml">
+      <configuration name="pytest in tests" configurationId="tests" />
+    </history-entry>
+    <history-entry file="pytest_in_tests - 2019.01.24 at 23h 42m 41s.xml">
+      <configuration name="pytest in tests" configurationId="tests" />
+    </history-entry>
+    <history-entry file="pytest_in_tests - 2019.01.24 at 23h 44m 20s.xml">
+      <configuration name="pytest in tests" configurationId="tests" />
+    </history-entry>
+    <history-entry file="pytest_in_tests - 2019.01.24 at 23h 46m 22s.xml">
+      <configuration name="pytest in tests" configurationId="tests" />
+    </history-entry>
+    <history-entry file="pytest_in_tests - 2019.01.24 at 23h 49m 39s.xml">
+      <configuration name="pytest in tests" configurationId="tests" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="228050000" />
+    <option name="totallyTimeSpent" value="258323000" />
   </component>
-  <component name="TodoView" selected-index="4">
+  <component name="TodoView">
     <todo-panel id="selected-file">
       <is-autoscroll-to-source value="true" />
     </todo-panel>
@@ -789,30 +980,30 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1680" height="962" extended-state="0" />
+    <frame x="0" y="23" width="1472" height="911" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21550672" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24965034" />
       <window_info id="Structure" order="1" weight="0.24908425" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.2737931" side_tool="true" weight="0.3997555" />
       <window_info anchor="bottom" id="Version Control" order="1" weight="0.32762837" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.7262069" visible="true" weight="0.50574714" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.3960396" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.7262069" visible="true" weight="0.33333334" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3954023" />
       <window_info anchor="bottom" id="Python Console" order="4" weight="0.32885087" />
-      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.24022989" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.3286945" />
+      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.2808303" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3275862" />
       <window_info anchor="bottom" id="Message" order="7" />
       <window_info anchor="bottom" id="Find" order="8" weight="0.32518336" />
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
       <window_info anchor="bottom" id="Thumbnails" order="11" weight="0.22666667" />
       <window_info anchor="bottom" id="Docker" order="12" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" order="13" />
+      <window_info anchor="bottom" id="Database Changes" order="13" weight="0.32988507" />
       <window_info anchor="bottom" id="Database Console" order="14" weight="0.32885087" />
       <window_info anchor="bottom" id="Concurrent Activities Diagram" order="15" weight="0.40342298" />
       <window_info anchor="right" id="Data View" order="0" />
-      <window_info anchor="right" id="Database" order="1" sideWeight="0.49781278" visible="true" weight="0.22588523" />
+      <window_info anchor="right" id="Database" order="1" sideWeight="0.49781278" visible="true" weight="0.19300699" />
       <window_info anchor="right" id="Commander" order="2" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
@@ -840,7 +1031,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/cbpi/database/orm_framework.py</url>
-          <line>149</line>
+          <line>155</line>
           <option name="timeStamp" value="28" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -864,366 +1055,32 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/cbpi/api/sensor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/tasks.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="556" selection-start-line="556" selection-end-line="556" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/kettle">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_dashboard.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="256" column="36" selection-start-line="256" selection-start-column="36" selection-end-line="256" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/dashboard_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="31" column="14" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/plugin_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="65" selection-start-line="65" selection-end-line="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/eventbus.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="118" column="40" selection-start-line="118" selection-start-column="40" selection-end-line="118" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web_response.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="417">
-          <caret line="634" selection-start-line="634" selection-end-line="634" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/translation_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/extension.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/utils/encoder.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="23" column="43" selection-start-line="23" selection-start-column="43" selection-end-line="23" selection-end-column="43" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/sensor">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dashboard">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/argparse.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="2470" column="8" selection-start-line="2470" selection-start-column="8" selection-end-line="2470" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/actor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/config.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dashboard_content">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/splash.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummystep/config.yaml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="28" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/step.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="49" selection-start-line="49" selection-end-line="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/database/orm_framework.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="81" column="8" lean-forward="true" selection-start-line="81" selection-start-column="8" selection-end-line="89" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/database/model.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="97" column="16" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/config_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_config.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/config">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="43" column="14" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_step.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="164" column="86" selection-start-line="164" selection-start-column="86" selection-end-line="164" selection-end-column="86" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="598">
-          <caret line="87" column="54" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="54" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/logs/app.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2453">
-          <caret line="11082" column="73" selection-start-line="11082" selection-start-column="73" selection-end-line="11082" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/translation">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/step_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2475">
-          <caret line="25" column="24" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="24" />
-          <caret line="55" column="28" selection-start-line="55" selection-start-column="25" selection-end-line="55" selection-end-column="28" />
-          <caret line="55" column="50" selection-start-line="55" selection-start-column="47" selection-end-line="55" selection-end-column="50" />
-          <caret line="55" column="60" selection-start-line="55" selection-start-column="57" selection-end-line="55" selection-end-column="60" />
-          <caret line="98" column="18" selection-start-line="98" selection-start-column="15" selection-end-line="98" selection-end-column="18" />
-          <caret line="170" column="32" selection-start-line="170" selection-start-column="29" selection-end-line="170" selection-end-column="32" />
-          <caret line="170" column="54" selection-start-line="170" selection-start-column="51" selection-end-line="170" selection-end-column="54" />
-          <caret line="170" column="64" selection-start-line="170" selection-start-column="61" selection-end-line="170" selection-end-column="64" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/conf.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
-          <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/cli.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="495">
-          <caret line="39" column="4" selection-start-line="39" selection-start-column="4" selection-end-line="39" selection-end-column="4" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/actor.rst">
-      <provider selected="true" editor-type-id="restructured-text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/build/html/install.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py">
+    <entry file="file://$PROJECT_DIR$/logs/sensors/sensor_2.log" />
+    <entry file="file://$PROJECT_DIR$/logs/sensors/sensor_1.log" />
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3315">
-          <caret line="224" column="47" selection-start-line="224" selection-start-column="47" selection-end-line="224" selection-end-column="47" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/websocket.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="34" column="32" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="32" />
+        <state relative-caret-position="870">
+          <caret line="60" selection-start-line="60" selection-end-line="60" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
+    <entry file="file://$PROJECT_DIR$/tests/test_index.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="45" column="35" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="79">
+          <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/actor_controller.py">
+    <entry file="file://$PROJECT_DIR$/tests/test_config.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="497">
-          <caret line="123" column="66" selection-start-line="123" selection-start-column="66" selection-end-line="123" selection-end-column="66" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/crud_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
+        <state relative-caret-position="64">
+          <caret line="48" column="45" selection-start-line="48" selection-start-column="45" selection-end-line="48" selection-end-column="45" />
         </state>
       </provider>
     </entry>
@@ -1237,39 +1094,327 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/comp/__init__.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="43" column="12" selection-start-line="43" selection-start-column="12" selection-end-line="43" selection-end-column="12" />
+        <state relative-caret-position="171">
+          <caret line="218" column="27" selection-start-line="218" selection-start-column="27" selection-end-line="218" selection-end-column="66" />
           <folding>
-            <element signature="e#0#9#0" expanded="true" />
+            <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py">
+    <entry file="file://$PROJECT_DIR$/tests/test_dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="367">
-          <caret line="60" selection-start-line="60" selection-end-line="60" />
+        <state relative-caret-position="273">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_kettle.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="41" column="52" selection-start-line="41" selection-start-column="52" selection-end-line="41" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_system.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web_response.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="780">
+          <caret line="443" column="49" lean-forward="true" selection-start-line="443" selection-start-column="49" selection-end-line="443" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docs_src/source/picture.jpeg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="21" column="17" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="17" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../craftbeerpi-ui/cbpi-ui/__init__.py">
+    <entry file="file://$PROJECT_DIR$/docs_src/build/html/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="67" column="43" lean-forward="true" selection-start-line="67" selection-start-column="43" selection-end-line="67" selection-end-column="43" />
+        <state relative-caret-position="-3601" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docs_src/source/conf.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="166">
+          <caret line="44" column="4" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/kettle_controller.py">
+    <entry file="file://$PROJECT_DIR$/docs_src/source/actor.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docs_src/source/standards.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docs_src/source/webapis.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dashboard">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_step.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="98" column="31" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
+        <state relative-caret-position="218">
+          <caret line="98" column="35" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
           <folding>
-            <element signature="e#0#9#0" expanded="true" />
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/api/extension.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-215">
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/api/property.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/utils/utils.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/kettle">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/database/orm_framework.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="104">
+          <caret line="13" column="16" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="268">
+          <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/database/model.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="199">
+          <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/api/step.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="71" column="22" selection-start-line="71" selection-start-column="22" selection-end-line="71" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/translation">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dashboard_content">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/step_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="385">
+          <caret line="197" column="33" selection-start-line="197" selection-start-column="33" selection-end-line="197" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/actor_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="94" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Library/Caches/PyCharm2018.3/python_stubs/1959656778/_sha256.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="33" column="8" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/sensor_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="19" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="19" />
+          <folding>
+            <element signature="e#1#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Library/Caches/PyCharm2018.3/python_stubs/1959656778/builtins.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="896" column="6" selection-start-line="896" selection-start-column="6" selection-end-line="896" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/crud_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="358">
+          <caret line="115" column="83" selection-start-line="115" selection-start-column="83" selection-end-line="115" selection-end-column="83" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/tasks.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="556" selection-start-line="556" selection-end-line="556" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/sensor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/config.yaml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/api/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/utils/encoder.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="25" column="60" selection-start-line="25" selection-start-column="60" selection-end-line="25" selection-end-column="60" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/api/sensor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="14" column="21" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#48#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/config_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="25" column="15" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/config">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="39" column="52" selection-start-line="39" selection-start-column="52" selection-end-line="39" selection-end-column="52" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="229" column="4" selection-start-line="229" selection-start-column="4" selection-end-line="262" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="177" column="80" selection-start-line="177" selection-start-column="80" selection-end-line="177" selection-end-column="80" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/cbpi/api/sensor.py b/cbpi/api/sensor.py
index 3ea9be9..fcde573 100644
--- a/cbpi/api/sensor.py
+++ b/cbpi/api/sensor.py
@@ -12,6 +12,8 @@ class CBPiSensor(CBPiExtension):
         self.data_logger = None
         self.state = False
 
+    def get_parameter(self, name, default):
+        return self.cbpi.config.get(name, default)
 
 
     def log_data(self, value):
@@ -27,7 +29,7 @@ class CBPiSensor(CBPiExtension):
         self.data_logger = logging.getLogger('cbpi.sensor.%s' % self.id)
         self.data_logger.propagate = False
         self.data_logger.setLevel(logging.DEBUG)
-        handler = RotatingFileHandler('./logs/sensors/sensor_%s.log' % self.id, maxBytes=2000, backupCount=10)
+        handler = RotatingFileHandler('./logs/sensor_%s.log' % self.id, maxBytes=2000, backupCount=10)
         self.data_logger.addHandler(handler)
         pass
 
@@ -39,4 +41,7 @@ class CBPiSensor(CBPiExtension):
         pass
 
     def get_value(self):
+        pass
+
+    def get_unit(self):
         pass
\ No newline at end of file
diff --git a/cbpi/api/step.py b/cbpi/api/step.py
index da350bc..a46a36f 100644
--- a/cbpi/api/step.py
+++ b/cbpi/api/step.py
@@ -8,12 +8,13 @@ class CBPiSimpleStep(metaclass=ABCMeta):
 
     __dirty = False
     managed_fields = []
-    _interval = 0.1
+    _interval = 1
     _max_exceptions = 2
     _exception_count = 0
 
     def __init__(self, *args, **kwargs):
         self.logger = logging.getLogger(__name__)
+        print(kwargs)
         for a in kwargs:
             super(CBPiSimpleStep, self).__setattr__(a, kwargs.get(a))
         self.id = kwargs.get("id")
@@ -60,14 +61,15 @@ class CBPiSimpleStep(metaclass=ABCMeta):
             await asyncio.sleep(self._interval)
 
             if self.is_dirty():
+                print("DIRTY")
                 # Now we have to store the managed props
                 state = {}
                 for field in self.managed_fields:
+
                     state[field] = self.__getattribute__(field)
-                    #step_controller.model.update_step_state(step_controller.current_step.id, state)
-
-                    await self.cbpi.step.model.update_step_state(self.id, state)
 
+                await self.cbpi.step.model.update_step_state(self.id, state)
+                await self.cbpi.bus.fire("step/update")
                 self.reset_dirty()
 
     @abstractmethod
diff --git a/cbpi/controller/actor_controller.py b/cbpi/controller/actor_controller.py
index fcdb2e9..eb153c8 100644
--- a/cbpi/controller/actor_controller.py
+++ b/cbpi/controller/actor_controller.py
@@ -39,16 +39,19 @@ class ActorController(CRUDController):
 
         try:
             if actor.type in self.types:
+
                 cfg = actor.config.copy()
                 cfg.update(dict(cbpi=self.cbpi, id=id, name=actor.name))
                 clazz = self.types[actor.type]["class"];
                 self.cache[actor.id].instance = clazz(**cfg)
                 self.cache[actor.id].instance.init()
-                print(actor.id, self.cache[actor.id].instance)
+
                 await self.cbpi.bus.fire(topic="actor/%s/initialized" % actor.id, id=actor.id)
             else:
+
                 self.logger.error("Actor type '%s' not found (Available Actor Types: %s)" % (actor.type, ', '.join(self.types.keys())))
         except Exception as e:
+
             self.logger.error("Failed to init actor %s - Reason %s" % (actor.id, str(e)))
 
     async def _stop_actor(self, actor):
@@ -153,4 +156,5 @@ class ActorController(CRUDController):
             await self._stop_actor(actor)
 
     async def _post_update_callback(self, actor):
+
         await self._init_actor(actor)
diff --git a/cbpi/controller/crud_controller.py b/cbpi/controller/crud_controller.py
index 506bead..5d41e7e 100644
--- a/cbpi/controller/crud_controller.py
+++ b/cbpi/controller/crud_controller.py
@@ -95,11 +95,11 @@ class CRUDController(metaclass=ABCMeta):
         :return: 
         '''
 
-
-
+        self.logger.debug("Update Sensor %s - %s " % (id, data))
         id = int(id)
 
         if id not in self.cache:
+            self.logger.debug("Sensor %s Not in Cache" % (id,))
             raise CBPiException("%s with id %s not found" % (self.name,id))
 
         data["id"] = id
@@ -107,17 +107,18 @@ class CRUDController(metaclass=ABCMeta):
         try:
             ### DELETE INSTANCE BEFORE UPDATE
             del data["instance"]
-        except:
+        except Exception as e:
             pass
 
         if self.caching is True:
             await self._pre_update_callback(self.cache[id])
             self.cache[id].__dict__.update(**data)
-            m = await self.model.update(**self.cache[id].__dict__)
-            await self._post_update_callback(m)
-        else:
-            m = await self.model.update(**data)
+            m = self.cache[id] = await self.model.update(**self.cache[id].__dict__)
+            await self._post_update_callback(self.cache[id])
 
+        else:
+
+            m = await self.model.update(**data)
         return m
 
 
diff --git a/cbpi/controller/kettle_controller.py b/cbpi/controller/kettle_controller.py
index cbc1ac4..89ea966 100644
--- a/cbpi/controller/kettle_controller.py
+++ b/cbpi/controller/kettle_controller.py
@@ -53,11 +53,13 @@ class KettleController(CRUDController):
         match = re.match("kettle_logic_(\d+)", key)
         if match is not None:
             kid = match.group(1)
-            await self.cbpi.bus.fire(topic="kettle/%s/logic/stop" % kid)
+
 
             kettle = self.cache[int(kid)]
             kettle.instance = None
             kettle.state = False
+            print("FIRE")
+            await self.cbpi.bus.fire(topic="kettle/%s/logic/stop" % kid)
 
     @on_event(topic="kettle/+/automatic")
     async def handle_automtic_event(self, id, **kwargs):
@@ -89,7 +91,7 @@ class KettleController(CRUDController):
                     cfg.update(dict(cbpi=self.cbpi))
                     kettle.instance = clazz(**cfg)
 
-                await self.cbpi.job.start_job(kettle.instance.run(), "Kettle_logic_%s" % kettle.id, "kettle_logic%s" % id)
+                await self.cbpi.job.start_job(kettle.instance.run(), "kettle_logic_%s" % kettle.id, "kettle_logic%s" % id)
                 kettle.state = True
 
                 await self.cbpi.bus.fire(topic="kettle/%s/logic/start" % id)
diff --git a/cbpi/controller/sensor_controller.py b/cbpi/controller/sensor_controller.py
index 727838c..ea42e18 100644
--- a/cbpi/controller/sensor_controller.py
+++ b/cbpi/controller/sensor_controller.py
@@ -42,13 +42,14 @@ class SensorController(CRUDController):
             self.cache[sensor.id].instance.init()
             scheduler = get_scheduler_from_app(self.cbpi.app)
             self.cache[sensor.id].instance.job = await scheduler.spawn(self.cache[sensor.id].instance.run(self.cbpi), sensor.name, "sensor")
+            await self.cbpi.bus.fire(topic="sensor/%s/initialized" % sensor.id, id=sensor.id)
         else:
             self.logger.error("Sensor type '%s' not found (Available Sensor Types: %s)" % (sensor.type, ', '.join(self.types.keys())))
 
 
 
     async def stop_sensor(self, sensor):
-        print("STOP", sensor.id)
+
         sensor.instance.stop()
         await self.cbpi.bus.fire(topic="sensor/%s/stopped" % sensor.id, id=sensor.id)
 
@@ -78,4 +79,4 @@ class SensorController(CRUDController):
             await self.stop_sensor(sensor)
 
     async def _post_update_callback(self, sensor):
-        self.init_sensor(sensor)
\ No newline at end of file
+        await self.init_sensor(sensor)
\ No newline at end of file
diff --git a/cbpi/controller/step_controller.py b/cbpi/controller/step_controller.py
index dfa74bf..ec01b05 100644
--- a/cbpi/controller/step_controller.py
+++ b/cbpi/controller/step_controller.py
@@ -154,8 +154,12 @@ class StepController(CRUDController):
 
             if next_step is not None:
                 step_type = self.types[next_step.type]
+                print(step_type)
+                managed_fields = self._get_manged_fields_as_array(step_type)
+                config = dict(cbpi=self.cbpi, id=next_step.id, name=next_step.name, managed_fields=managed_fields)
+                config.update(**next_step.config)
+                self._set_default(step_type, config, managed_fields)
 
-                config = dict(cbpi=self.cbpi, id=next_step.id, name=next_step.name, managed_fields=self._get_manged_fields_as_array(step_type))
                 self.current_step = step_type["class"](**config)
 
                 next_step.state = 'A'
@@ -176,6 +180,12 @@ class StepController(CRUDController):
             self.logger.error("Process Already Running")
         print("----------- END")
 
+    def _set_default(self, step_type, config, managed_fields):
+        for key in managed_fields:
+            if key not in config:
+                config[key] = None
+
+
     @on_event("step/stop")
     async def stop(self, **kwargs):
 
@@ -204,7 +214,13 @@ class StepController(CRUDController):
 
         await self.model.reset_all_steps()
 
-    async def sort(self, data):
+    @on_event("step/clear")
+    async def clear_all(self, **kwargs):
+        await self.model.delete_all()
+        self.cbpi.notify(key="Steps Cleared", message="Steps cleared successfully", type="success")
+
+    @on_event("step/sort")
+    async def sort(self, topic, data, **kwargs):
         await self.model.sort(data)
 
     async def _pre_add_callback(self, data):
diff --git a/cbpi/controller/system_controller.py b/cbpi/controller/system_controller.py
index bc2aea6..7928eb3 100644
--- a/cbpi/controller/system_controller.py
+++ b/cbpi/controller/system_controller.py
@@ -1,5 +1,8 @@
 import datetime
+import re
+
 from aiohttp import web
+import os
 from aiojobs.aiohttp import get_scheduler_from_app
 
 from cbpi.api import *
@@ -49,7 +52,7 @@ class SystemController():
         return web.Response(text="NOT IMPLEMENTED")
 
     @request_mapping("/shutdown", method="POST", name="ShutdownSerer", auth_required=False)
-    def restart(self, request):
+    def shutdown(self, request):
         """
         ---
         description: Shutdown System - Not implemented
@@ -94,3 +97,50 @@ class SystemController():
         """
         return web.json_response(data=self.cbpi.bus.dump())
 
+    @request_mapping(path="/logs", auth_required=False)
+    async def http_get_log(self, request):
+        result = []
+        file_pattern = re.compile("^(\w+.).log(.?\d*)")
+        for filename in sorted(os.listdir("./logs"), reverse=True):#
+            if file_pattern.match(filename):
+                result.append(filename)
+
+        return web.json_response(result)
+
+    @request_mapping(path="/logs/{name}", method="DELETE", auth_required=False)
+    async def http_delete_log(self, request):
+        log_name = request.match_info['name']
+        file_patter = re.compile("^(\w+.).log(.?\d*)")
+        file_sensor_log = re.compile("^sensor_(\d).log(.?\d*)")
+
+        if file_patter.match(log_name):
+
+            pass
+
+
+
+    @request_mapping(path="/logs", method="DELETE", auth_required=False)
+    async def http_delete_logs(self, request):
+
+        sensor_log_pattern = re.compile("sensor_([\d]).log$")
+        sensor_log_pattern2 = re.compile("sensor_([\d]).log.[\d]*$")
+
+        app_log_pattern = re.compile("app.log$")
+
+        for filename in sorted(os.listdir("./logs"), reverse=True):#
+            if app_log_pattern.match(filename):
+                with open(os.path.join("./logs/%s" % filename), 'w'):
+                    pass
+                continue
+
+
+        for filename in sorted(os.listdir("./logs/sensors"), reverse=True):
+
+            if sensor_log_pattern.match(filename):
+                with open(os.path.join("./logs/sensors/%s" % filename), 'w'):
+                    pass
+                continue
+            elif sensor_log_pattern2.match(filename):
+                os.remove(os.path.join("./logs/sensors/%s" % filename))
+
+        return web.Response(status=204)
\ No newline at end of file
diff --git a/cbpi/database/model.py b/cbpi/database/model.py
index c4caa3c..057514a 100644
--- a/cbpi/database/model.py
+++ b/cbpi/database/model.py
@@ -38,6 +38,7 @@ class ConfigModel(DBModel):
     __table_name__ = "config"
     __json_fields__ = ["options"]
     __priamry_key__ = "name"
+    __order_by__ = "name"
 
 
 class KettleModel(DBModel):
@@ -53,6 +54,7 @@ class StepModel(DBModel):
 
     @classmethod
     async def update_step_state(cls, step_id, state):
+        print("NOW UPDATE", state)
         async with aiosqlite.connect(DATABASE_FILE) as db:
             cursor = await db.execute("UPDATE %s SET stepstate = ? WHERE id = ?" % cls.__table_name__, (json.dumps(state), step_id))
             await db.commit()
diff --git a/cbpi/database/orm_framework.py b/cbpi/database/orm_framework.py
index 3d52185..e38a358 100644
--- a/cbpi/database/orm_framework.py
+++ b/cbpi/database/orm_framework.py
@@ -95,6 +95,12 @@ class DBModel(object):
             await db.execute("DELETE FROM %s WHERE %s = ? " % (cls.__table_name__, cls.__priamry_key__), (id,))
             await db.commit()
 
+    @classmethod
+    async def delete_all(cls):
+        async with aiosqlite.connect(DATABASE_FILE) as db:
+            await db.execute("DELETE FROM %s" % cls.__table_name__)
+            await db.commit()
+
     @classmethod
     async def insert(cls, **kwargs):
 
diff --git a/cbpi/extension/dummylogic/__init__.py b/cbpi/extension/dummylogic/__init__.py
index 4373a9a..0237628 100644
--- a/cbpi/extension/dummylogic/__init__.py
+++ b/cbpi/extension/dummylogic/__init__.py
@@ -54,15 +54,15 @@ class CustomLogic(CBPiKettleLogic):
         result = await self.wait_for_event("sensor/1/data", callback=my_callback)
         '''
 
-
+        value = 0
 
 
         while self.running:
 
-            print("RUN", self.test)
-            value = await self.cbpi.sensor.get_value(1)
+            value = value + 1
             print(value)
             if value >= 10:
+
                 break
             await asyncio.sleep(1)
 
diff --git a/cbpi/extension/dummysensor/__init__.py b/cbpi/extension/dummysensor/__init__.py
index db4dfe1..3baaaa9 100644
--- a/cbpi/extension/dummysensor/__init__.py
+++ b/cbpi/extension/dummysensor/__init__.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import asyncio
 from aiohttp import web
 from cbpi.api import *
@@ -29,10 +30,15 @@ class CustomSensor(CBPiSensor):
     def get_state(self):
         return self.state
 
+
+
     def get_value(self):
 
         return self.value
 
+    def get_unit(self):
+        return "°%s" % self.get_parameter("TEMP_UNIT", "C")
+
     def stop(self):
         pass
 
@@ -40,9 +46,8 @@ class CustomSensor(CBPiSensor):
         self.value = 0
         while True:
             await asyncio.sleep(self.interval)
-            self.log_data(10)
             self.value = self.value + 1
-
+            self.log_data(self.value)
             await cbpi.bus.fire("sensor/%s/data" % self.id, value=self.value)
 
 cache = {}
diff --git a/cbpi/extension/dummystep/__init__.py b/cbpi/extension/dummystep/__init__.py
index 435dc92..0753bc9 100644
--- a/cbpi/extension/dummystep/__init__.py
+++ b/cbpi/extension/dummystep/__init__.py
@@ -1,26 +1,31 @@
 import asyncio
+import time
 
 from cbpi.api import *
 
 
 class CustomStepCBPi(CBPiSimpleStep):
 
-    name = Property.Number(label="Test")
-
+    name1 = Property.Number(label="Test", configurable=True)
+    timer_end = Property.Number(label="Test", default_value=None)
+    temp = Property.Number(label="Temperature", default_value=50, configurable=True)
     i = 0
     
     @action(key="name", parameters=None)
     def test(self, **kwargs):
         self.name="WOOHOO"
 
+
+
     async def run_cycle(self):
-        print("RUN", self.name)
+        print("RUN", self.name1, self.managed_fields, self.timer_end)
         self.i = self.i + 1
-        await asyncio.sleep(5)
-        print("WAIT")
-        self.next()
-        #if self.i == 5:
-        #    print("NEXT")
+
+        if self.timer_end is None:
+            self.timer_end = time.time() + 10
+
+        if self.i == 10:
+            self.next()
 
 
         #self.cbpi.notify(key="step", message="HELLO FROM STEP")
diff --git a/cbpi/http_endpoints/http_curd_endpoints.py b/cbpi/http_endpoints/http_curd_endpoints.py
index 2c31e69..fe0a55b 100644
--- a/cbpi/http_endpoints/http_curd_endpoints.py
+++ b/cbpi/http_endpoints/http_curd_endpoints.py
@@ -32,8 +32,6 @@ class HttpCrudEndpoints():
     @request_mapping(path="/", method="POST", auth_required=False)
     async def http_add(self, request):
         data = await request.json()
-
-
         obj = await self.controller.add(**data)
         return web.json_response(obj, dumps=json_dumps)
 
@@ -42,8 +40,7 @@ class HttpCrudEndpoints():
         id = int(request.match_info['id'])
         data = await request.json()
         obj = await self.controller.update(id, data)
-
-        return web.json_response(await self.controller.get_one(id), dumps=json_dumps)
+        return web.json_response(obj, dumps=json_dumps)
 
     @request_mapping(path="/{id}", method="DELETE", auth_required=False)
     async def http_delete_one(self, request):
diff --git a/cbpi/http_endpoints/http_sensor.py b/cbpi/http_endpoints/http_sensor.py
index c6981d6..c1b319b 100644
--- a/cbpi/http_endpoints/http_sensor.py
+++ b/cbpi/http_endpoints/http_sensor.py
@@ -144,6 +144,9 @@ class SensorHttpEndpoints(HttpCrudEndpoints):
         """
         return await super().http_delete_one(request)
 
+
+
+
     @request_mapping(path="/{id:\d+}/log", auth_required=False)
     async def http_get_log(self, request):
         sensor_id = request.match_info['id']
@@ -162,7 +165,7 @@ class SensorHttpEndpoints(HttpCrudEndpoints):
         sensor_id = request.match_info['id']
 
         for filename in sorted(os.listdir("./logs/sensors"), reverse=True):
-            print(filename)
+
             if filename == "sensor_%s.log" % sensor_id:
                 with open(os.path.join("./logs/sensors/%s" % filename), 'w'):
                     pass
@@ -170,4 +173,39 @@ class SensorHttpEndpoints(HttpCrudEndpoints):
             if filename.startswith("sensor_%s" % sensor_id):
                 os.remove(os.path.join("./logs/sensors/%s" % filename))
 
+        return web.Response(status=204)
+
+    @request_mapping(path="/{id:\d+}/action", method="POST", auth_required=False)
+    async def http_action(self, request) -> web.Response:
+        """
+
+        ---
+        description: Toogle an actor on or off
+        tags:
+        - Actor
+        parameters:
+        - name: "id"
+          in: "path"
+          description: "Actor ID"
+          required: true
+          type: "integer"
+          format: "int64"
+        - in: body
+          name: body
+          description: Update an actor
+          required: false
+          schema:
+            type: object
+            properties:
+              name:
+                type: string
+              config:
+                type: object
+        responses:
+            "204":
+                description: successful operation
+        """
+        sensor_id = int(request.match_info['id'])
+
+        await self.cbpi.bus.fire(topic="sensor/%s/action" % sensor_id, sensor_id=sensor_id, data=await request.json())
         return web.Response(status=204)
\ No newline at end of file
diff --git a/cbpi/http_endpoints/http_step.py b/cbpi/http_endpoints/http_step.py
index 197475e..e2aa310 100644
--- a/cbpi/http_endpoints/http_step.py
+++ b/cbpi/http_endpoints/http_step.py
@@ -162,7 +162,8 @@ class StepHttpEndpoints(HttpCrudEndpoints):
             "204":
                 description: successful operation
         """
-        self.cbpi.notify(key="step_delete_all", message="NOT IMPLEMENTE", type="danger")
+
+        await self.cbpi.bus.fire("step/clear")
         return web.Response(status=204)
 
 
@@ -243,5 +244,5 @@ class StepHttpEndpoints(HttpCrudEndpoints):
     @request_mapping(path="/sort", method="POST", auth_required=False)
     async def http_sort(self, request):
         data = await request.json()
-        await self.cbpi.step.sort(data)
+        await self.cbpi.bus.fire("step/sort", data=data)
         return web.Response(status=204)
\ No newline at end of file
diff --git a/cbpi/utils/encoder.py b/cbpi/utils/encoder.py
index 8aa8a52..b676206 100644
--- a/cbpi/utils/encoder.py
+++ b/cbpi/utils/encoder.py
@@ -23,6 +23,7 @@ class ComplexEncoder(JSONEncoder):
             elif isinstance(obj, SensorModel):
                 data =  dict(**obj.__dict__)
                 data["value"] = value=obj.instance.get_value()
+                data["unit"] = value = obj.instance.get_unit()
                 data["state"] = obj.instance.get_state()
                 del data["instance"]
                 return data
@@ -35,6 +36,6 @@ class ComplexEncoder(JSONEncoder):
             else:
                 raise TypeError()
         except Exception as e:
-
+            print(e)
             pass
         return None
diff --git a/craftbeerpi.db b/craftbeerpi.db
index 1c348ab04f9f669809550843e17caf1efabe1b42..d4ae9a202e622d1b962cba5cd6a5e0288c895fd4 100644
GIT binary patch
delta 3856
zcma)8eQXow8Gp}qlCynxZ#=L~0w!lWA#uJOI|)e$v^env42ffGXW3LL<HSes>e#7$
zfkNtCk;Xr())9GXC$v>a6Z-(F!7NRks%m4K`bRen(Q4X8w^dZAn&?!GRn`7Od*1s<
z>`<h}m+167zxVfi{hrr(>9X;q%f^eXhSuM$@0x(WH&0x{_y_f$YHM>D%Lp}lXK1q#
zIg{d<l7tXCroPclx{Yqs-?#=N^3I$Mr%R_63h82oHf?x}^`0h!5!sVsNou0B7nb=i
zaxn{Td>&`HAh(mVu%EDZd)c?RGu+p3Bll|@=YEPG;Qib^{2sG_f5yJZtg#8E!ge#)
zSOfE0=5A$xzh3>6m#nh$0FBI4i@{(wJSR$0PBh)1?&Mc<Imbb8n2AHRQ;#(JgnEG5
zJTOA=_OOblG`#U$#q5}RjK-wUA5v&!!v>GxzH)$VMa>YGrZpaiP)}gEPbmcK#1`CS
zJ<j;9hRY!v6bO7;fzFT;S*`e4tz?z*hg&G0uBU|1N^97EvNu_H-~$KHHkz_6XJ43F
zD|0OSId=qED9T0e@VYuGcYLmGxSd86veUG!fsApj?D7(O4109DQMKFMV1SNqWQsml
zI@JbdAOy3aR8ogQ?A-Sew>cnJCy?&0eAu&F=04>9K?>PP8|<f_6I*-^dr&PzpAGd$
zosAF7r~@)9N#aUsv5=RFh1^;hcO%?S9+P*RAlhikuOM>Sk~FgBk<PA&o_)M0mo6@e
zp0cZpu-g&xOQgQa&wFg4zv9;rehogCAW0ygfxt1geGHJ46Y?^o7o|eca6wUyUkPHM
zZ3{*5Oe&vV7SYF*CI5ho?;?B)VYAr<GEr)GJVjz{suHHGj0Co=e#(yh^+4*8;dK&h
z`>0}v6iQ;g1St#?D~o@O47iMN8UF@<gujVj#;K-nRUHFMcv~mcfI7V15J@;N7z_l1
z!Ad%~{TqQYq}STwwar9BbHeoGYDp?AE2y>d4nqS1Parr5Pn`!6-O~nayNnIUt)C^F
zbto2K6uyJ-9ef2}s5BpRReKJe!zM8IS1!(U(*1oTtB$_Pt(gwn;6RzhuR{S6!c{Ec
zBbDY@Yqcxp#KZV6XxNT0^7|1Wx?3>3+Az?lsRgvKN0rr|E-Ymi*UEv4l=2;D1d!cH
z@P14oL?jvr1ddV+dV14%DqG^=Sw73Bm(%C6`6XUus@zO<*j+6CI%?!@8}Z-p4LpQT
z;#auaRriUvIC+t7YQrsk=Npp3Oe{4QjU=Z^VoqF?lH&4;SWHW+MUkJ&XQgM>Jg3vS
zRYh)-o?fE41u;j&H|Z(&@-^P6I`5RH{48&3^x_t~eR3ieNhO6uGBp$^Nkz!A5-o5t
z>(hOE8XN6xEp7H_Xhw*IrUf2;HRJ>+l8=HSiAwmUt%QRCbsvfF38K@`=ymC|O32{h
z(Dd{ybWV*-+DL#Ml%vtxQilW)z*Bix*w);LuOj>q--Ger!f)cMRrkuPm}8A?)JDJP
z%A0Z*)l|7B^G=wQ5yuf;$8mfc7rE=~1M-1ZzsFV{d}mO`Yv>-;;yZ7~CX>%>h(i**
zHu(f>J~Sx1<{^6*fX<TipwSXcg7kTCfHYRhE{nyKn9qPIFg!H6H#jylI@CWpJP-(s
zj+Mj5qr)G;@4w-4fOB{q$!3Vx0E!jNahb#mr~-dHo+qFL(82}3Fx<$%$l%CO|Ik=4
zI67Jm9iKhfzM1f21Z8N*1w`*u5-<s7c?P~_`AGiDWf0iN;DEtOSYUmiiZA4dJShtx
zDetGO2)cmqNpfCk`j#d<@i=s$>^E8w42?v8!pz`!&6LW&xJWfOnSYPQ%rjhtzC1C&
zgqT&v#h9$0SZ`Rzt>3e@Sf6KemMa$7^3Y<n3|pQte_;8u^#k)o^ELAe=9%hx^ZT^y
z8#mdG;fy$0$md}rvxPh_75I`^JS`Uaq6o80FTfYUDKW!4_L*!w_0Z`8%(`XNWb-*Q
zVj>xeCsPw~VLlp(9!f~*qU0Pi**fjSH5;q(6jm&MKu#ZU$@Pc${$Z1C+@BE%3y`Fu
z!hC8r9v0%MMChwRI12komXzE*v&D>9><XG}e!#~<aaiXh;G(n1R6<C`(nV0X1V!Wv
z64WEL4?^}mwMfD!hc|(x^l35U83I_Rnm~$N5o+L#n?a%St5kZDq`H_8))Pxeg_RXC
z)84-o1?{OtL4QO!W6dB-U*B%1yLGS0=5~{239(ct92UZ4efV@HBWCslOt!wh&Av=U
zqLIYmO}43QUL8`8$=2b^h)0EF60SC-Y3e1-hvCYVAT6JomO5}*nRpJySR(*3RqOi*
z9@Y*sIvj~6d3P^N5{SdXG_;vl`8DQ@%G}xw%%Fp~aBPm;zlpiYNg<I)khZ$JKqJsr
z-8U7AObg+-C_leSu8XO3HkV<R5#3|kYvM*sHam!h#66tNOU^w|JLI9)oSL2ug+Uy=
zv!mX@>kdylbTR;)1RbdJOP&&WrJL~mrOesg?SX>E69hCZOeRzFk?<iQnNYr$_>KS6
z`T1;SNtD=LL=(Asy-)^-NChj3hD7witJqTI()9{;wbK8_Q!LYGvN_@0{OsY`+3MLh
zUN*>M)^{lUD*hLD7r%&aFzZa1J;B`OPBDwzAGuesfqUEfA9m3C4)-Z{h53xV&;Ae3
zaUAxr-(}A*SMi_lXDp3>g#XU`k~zms;6C;UyNf%HL+ovwXMe(-Wp*(^uAgawe{JkI
zjla#g*<Udq!yT#qR4+A8T4m6{G3v`K{kQ{WT8|{^*tZ>;2j;rH9<xJp6l3i@FlvKY
zC{|t7dw0vQ<Y3bGXUmcgYcYwtW(9{d^X956>K=502x`c5l?0F#WCRW(qmdnOO~AW$
zR^GfPf;GX&g`@4VpMk-_0cCJ~TD5iB@7)HQ28h~C>(R(`m1`T&t(iAgOwRLU<$PMh
zbhx?{U5{m?+#CH`oqB!x7VOz#*O#C}@B79Mv}@t!BOW4kUA<m?mbH7}sosBk*H``z
DYjzPB

delta 1908
zcmZuwdu&rx7(eIsLA&jquXpQh*FF27k+Mg*w`BvO2F4>mn9eXvOwdxcG8(%T*Ncd?
z786N~L;^Wc%uL7<5EFzbHZhBaME>&+Q67I_2nmqPs2DNCKm5a(_?>&ZtwnQlPwx4?
z-{bqfbI*}k+mTt@i8jgi(aDY>TrchU6ySHb3Rl_J>=OG#Je4+23CjM_%%Oro2w7)+
zF{h10h7WH_7xwSXr>Do6<FUP6?BQq9fcS!;BQscw$Gs;qjH{K`mQfo~1yW{r39#*r
zpun%}LwF0a>|6G?2Ufy!tjIoN+u2WSFWlrK!P9(CaAoCT&}ihhVt)QlPml)r^;j3}
z#<kNYyNTEBRw-2tl$C5#2Xnd3E|HQL<)LU7?J&{p=Gs=9Xf;EAbM=XY9p>m6o{n}<
zuLzb~Tm+>Fi5osed<G;*eK}(oxeWP@o)u0$6H*%|H$<ETWF(NNM3sV(IglF5PZ`ts
zoOG?LSYmfor%-EmN$RVXoOD!>RFB|vOD<*abmmZMs+^w8NY{!bctUjxf*<YEV@7_O
z-m_fbDdNQTn?*8!YL=K)nYTfRb)s0IP>tU!mYQuA)>Xv{Tlf)95l^Flw_v@K+1DId
zKv#&J!qK7x_E43u8@?ui>t5(9m&KW1+r=m1tIBxFPl`Hfwf$ANWQ{?<={<V3SVAz=
zfW2O;u7w_~{!}|gX+UzR(!$t9!7`F5+$L}vuE6{7CLDv*vbQU~RTB^`s&)ryi72|R
zZ#-Bq@{=3Hz>1}i%|QZ@h`CGfwC+u6rI1vOwVEG_nbc}&%c+BOS6Ny@*96g{m8=48
z61WK$;VAd4@2vE!e;xSj4m)U~H9~f((H`-i^H+ugZmqWmg`&|IzcRd>tuD!Mi%4J)
zI1L8(jI{CKh`q9ML`8*{ymSk{|Dvw}H75N4Bp&BRDyDh|X%n&bKnW4jn#M2fj>uXw
zLStr1A-tUGZ1KwQ0&zgn0q5ZdNWwcXQ3)ORgCzjtdOV=28;3@=rA9aJ98Kxk>g2$n
zzGm%!)~^rf$$@0Sn9fd32m>)|p3JW(v)Cf1+v!x>arexI;mun&@7VFIrdb4W`vf8A
za7JJeE-Vs{Awtv{QR)zyuGhQbm6M#2zADJ~SgC_+`V(uDN&YC`!W=M1;1S%1>-aCs
zRg@FwfX|gzPzS$X4*Fq?*g+?tLlN%4m+}Masf702kokl661_xmJ4Q2xb>=(qrs8C>
zq7D52C&?X`Kh_6!d!IRPt{qp);dQ~Vm`%8}Y4?`FUVOD;cnUA-QUZyb^f(#`RbvXW
z6}Me5>OG1kzXSPU^D=x@XO*zPc(CW{;(EDG1>4(7+ZRmI<NNj%#`o1BvchM3(_MV$
zv86H6ibYv1NlQh=saY%mLi$Ked|@El7F#S=n}-XewZ1aTHZC<1j9W^=pn41ct5g-j
z78|TNEw^J4?Isl`_P@<+D@IFU+hVN>wJr6q<WQ2nI6*zj<X#eLnrY;&*&#gdktRNK
zfzurCzxcE)pC`-@<C*8vxr3R?;fu$lEg^ZHzz6UPyA5x^=WIXwjvWVyU1ks2$MU@V
s7wlpT!tg!(31{FA8-hNz8#cfcJIwmw8&Dw)@3IgY&B&Gc%N@=C0){2}8~^|S

diff --git a/tests/test_config.py b/tests/test_config.py
index 331e47b..277b0c5 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -46,7 +46,7 @@ class ConfigTestCase(AioHTTPTestCase):
         await self.cbpi.config.set(key, value)
         assert self.cbpi.config.get(key, 1) == value
 
-        resp = await self.client.request("POST", "/config/%s/" % key, json={'value': '1'})
+        resp = await self.client.request("PUT", "/config/%s/" % key, json={'value': '1'})
         assert resp.status == 204
         assert self.cbpi.config.get(key, -1) == "1"
 
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index 2b657c5..6066130 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.py
@@ -60,7 +60,8 @@ class DashboardTestCase(AioHTTPTestCase):
         resp = await self.client.get(path="/dashboard/%s/content" % (dashboard_id))
         assert resp.status == 200
 
-        resp = await self.client.put(path="/dashboard/%s/content/%s/move" % (dashboard_id, content_id), json=dict(x=1,y=1))
+
+        resp = await self.client.post(path="/dashboard/%s/content/%s/move" % (dashboard_id, content_id), json=dict(x=1,y=1))
         assert resp.status == 200
 
         resp = await self.client.delete(path="/dashboard/%s/content/%s" % (dashboard_id, content_id))
diff --git a/tests/test_index.py b/tests/test_index.py
index 216a77d..06d8b20 100644
--- a/tests/test_index.py
+++ b/tests/test_index.py
@@ -22,7 +22,7 @@ class IndexTestCase(AioHTTPTestCase):
     async def test_404(self):
         # Test Index Page
         resp = await self.client.get(path="/abc")
-        assert resp.status == 200
+        assert resp.status == 500
 
     @unittest_run_loop
     async def test_wrong_login(self):
diff --git a/tests/test_kettle.py b/tests/test_kettle.py
index 3de97df..e93e576 100644
--- a/tests/test_kettle.py
+++ b/tests/test_kettle.py
@@ -37,14 +37,14 @@ class KettleTestCase(AioHTTPTestCase):
     @unittest_run_loop
     async def test_temp(self):
         resp = await self.client.get("/kettle/1/temp")
-        assert resp.status == 200
+        assert resp.status == 204
 
         resp = await self.client.get("/kettle/1/targettemp")
         assert resp.status == 200
 
     @unittest_run_loop
     async def test_automatic(self):
-        resp = await self.client.get("/kettle/1/automatic")
+        resp = await self.client.post("/kettle/1/automatic")
         assert resp.status == 204