From 28f87c6c3ff00d2cc934c26645c1db1ec5ada57c Mon Sep 17 00:00:00 2001
From: manuel83 <cUrrent2015>
Date: Sat, 29 Dec 2018 00:27:19 +0100
Subject: [PATCH] config controller added

---
 .idea/craftbeerpi4.iml                        |    4 +-
 .idea/dataSources.local.xml                   |    2 +-
 .idea/encodings.xml                           |    4 +
 .idea/markdown-exported-files.xml             |    8 +
 .idea/markdown-navigator.xml                  |   72 +
 .../markdown-navigator/profiles_settings.xml  |    3 +
 .idea/workspace.xml                           | 2176 +++++++----------
 config/config.yaml                            |    4 +
 core/api/__init__.py                          |    6 -
 core/api/actor.py                             |   48 -
 core/api/decorator.py                         |   96 -
 core/api/extension.py                         |   45 -
 core/api/kettle_logic.py                      |   38 -
 core/api/property.py                          |  113 -
 core/api/sensor.py                            |    9 -
 core/api/step.py                              |  134 -
 core/controller/actor_controller.py           |   27 +-
 core/controller/config_controller.py          |   60 +-
 core/controller/crud_controller.py            |    9 +-
 core/controller/kettle_controller.py          |   13 +-
 core/controller/notification_controller.py    |    3 +-
 core/controller/plugin_controller.py          |   35 +-
 core/controller/sensor_controller.py          |   14 +-
 core/controller/step_controller.py            |   18 +-
 core/controller/system_controller.py          |    6 +-
 core/craftbeerpi.py                           |   26 +-
 core/database/orm_framework.py                |    9 +-
 core/eventbus.py                              |    7 +-
 core/extension/comp/__init__.py               |    7 +-
 core/extension/dummyactor/__init__.py         |   10 +-
 core/extension/dummylogic/__init__.py         |   18 +-
 core/extension/dummysensor/__init__.py        |    6 +-
 core/extension/dummystep/__init__.py          |    5 +-
 core/http_endpoints/http_api.py               |    4 +-
 core/http_endpoints/http_login.py             |    2 +-
 core/job/_scheduler.py                        |    4 +-
 core/mqtt/mqtt_matcher.py                     |    2 +-
 core/utils/encoder.py                         |    8 +-
 core/utils/utils.py                           |   10 +-
 core/websocket.py                             |   10 +-
 craftbeerpi.db                                |  Bin 53248 -> 53248 bytes
 docs_src/source/actor.rst                     |    2 +-
 docs_src/source/kettle_controller.rst         |    2 +-
 docs_src/source/properties.rst                |    2 +-
 docs_src/source/sensor.rst                    |    2 +-
 docs_src/source/step.rst                      |    3 +-
 run.py                                        |    2 -
 sensor_None.log                               |    0
 tests/test_config.py                          |   56 +
 49 files changed, 1217 insertions(+), 1927 deletions(-)
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/markdown-exported-files.xml
 create mode 100644 .idea/markdown-navigator.xml
 create mode 100644 .idea/markdown-navigator/profiles_settings.xml
 delete mode 100644 core/api/__init__.py
 delete mode 100644 core/api/actor.py
 delete mode 100644 core/api/decorator.py
 delete mode 100644 core/api/extension.py
 delete mode 100644 core/api/kettle_logic.py
 delete mode 100644 core/api/property.py
 delete mode 100644 core/api/sensor.py
 delete mode 100644 core/api/step.py
 create mode 100644 sensor_None.log
 create mode 100644 tests/test_config.py

diff --git a/.idea/craftbeerpi4.iml b/.idea/craftbeerpi4.iml
index 325407e..7857219 100644
--- a/.idea/craftbeerpi4.iml
+++ b/.idea/craftbeerpi4.iml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/core" isTestSource="false" />
+    </content>
     <orderEntry type="jdk" jdkName="Python 3.7.1 virtualenv at ~/cbp42" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 5d2e8dd..0946b0f 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="dataSourceStorageLocal">
     <data-source name="craftbeerpi.db" uuid="5067e7fe-480d-4433-bc40-f2d1c38362a2">
-      <database-info product="SQLite" version="3.16.1" jdbc-version="2.1" driver-name="SQLiteJDBC" driver-version="native" />
+      <database-info product="SQLite" version="3.16.1" jdbc-version="2.1" driver-name="SQLiteJDBC" driver-version="native" dbms="SQLITE" exact-version="3.16.1" />
       <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
       <secret-storage>master_key</secret-storage>
       <auth-required>false</auth-required>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
new file mode 100644
index 0000000..5d1f129
--- /dev/null
+++ b/.idea/markdown-exported-files.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownExportedFiles">
+    <htmlFiles />
+    <imageFiles />
+    <otherFiles />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..dbe0e46
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
new file mode 100644
index 0000000..57927c5
--- /dev/null
+++ b/.idea/markdown-navigator/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="MarkdownNavigator.ProfileManager">
+  <settings default="" pdf-export="" />
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a3ed28a..983b802 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,99 +2,101 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream.len" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream.len" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.len" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.len" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.values.at" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.values.at" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i.len" afterPath="$PROJECT_DIR$/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i.len" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/craftbeerpi.db" afterPath="$PROJECT_DIR$/craftbeerpi.db" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/api/step.py" afterPath="$PROJECT_DIR$/core/api/step.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/step_controller.py" afterPath="$PROJECT_DIR$/core/controller/step_controller.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/craftbeerpi.py" afterPath="$PROJECT_DIR$/core/craftbeerpi.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/database/model.py" afterPath="$PROJECT_DIR$/core/database/model.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/database/orm_framework.py" afterPath="$PROJECT_DIR$/core/database/orm_framework.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" afterPath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/job/_scheduler.py" afterPath="$PROJECT_DIR$/core/job/_scheduler.py" />
+      <change afterPath="$PROJECT_DIR$/tests/test_config.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/craftbeerpi4.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/craftbeerpi4.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/config.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/__init__.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/actor.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/decorator.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/extension.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/kettle_logic.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/property.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/sensor.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/api/step.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/actor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/actor_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/config_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/config_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/crud_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/crud_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/kettle_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/kettle_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/notification_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/notification_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/plugin_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/plugin_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/sensor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/sensor_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/step_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/step_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/system_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/system_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/craftbeerpi.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/craftbeerpi.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/database/orm_framework.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/database/orm_framework.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/eventbus.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/eventbus.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/comp/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/comp/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/http_endpoints/http_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/http_endpoints/http_api.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/http_endpoints/http_login.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/http_endpoints/http_login.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/job/_scheduler.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/job/_scheduler.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/mqtt/mqtt_matcher.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/mqtt/mqtt_matcher.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/utils/encoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/utils/encoder.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/utils/utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/utils/utils.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/websocket.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/websocket.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/kettle_controller.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/kettle_controller.rst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs_src/source/properties.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/properties.rst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs_src/source/sensor.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/sensor.rst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs_src/source/step.rst" beforeDir="false" afterPath="$PROJECT_DIR$/docs_src/source/step.rst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/run.py" beforeDir="false" afterPath="$PROJECT_DIR$/run.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <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$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1544731743642" 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="1544992912838" 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_kettle.coverage" NAME="test kettle Coverage Results" MODIFIED="1544487077746" 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$main2.coverage" NAME="main2 Coverage Results" MODIFIED="1543663949310" 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_kettle.coverage" NAME="test kettle Coverage Results" MODIFIED="1546020780689" 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_in_test_config_py.coverage" NAME="pytest in test_config.py Coverage Results" MODIFIED="1546038141204" 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="1546020826753" 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="1546034207962" 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_KettleTestCase.coverage" NAME="pytest for test_config.KettleTestCase Coverage Results" MODIFIED="1546021043564" 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_config_ConfigTestCase.coverage" NAME="pytest for test_config.ConfigTestCase Coverage Results" MODIFIED="1546024160487" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
   </component>
   <component name="DatabaseView">
     <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
     <option name="GROUP_SCHEMA" value="true" />
     <option name="GROUP_CONTENTS" value="false" />
     <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_TABLE_DETAILS" value="true" />
     <option name="SHOW_EMPTY_GROUPS" value="false" />
     <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="craftbeerpi.db" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-    </PATH>
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="craftbeerpi.db" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="main" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-    </PATH>
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" />
-        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="craftbeerpi.db" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="main" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="step" />
-        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
-      </PATH_ELEMENT>
-    </PATH>
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="craftbeerpi.db" type="feb32156:DbDataSourceImpl" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="craftbeerpi.db" type="feb32156:DbDataSourceImpl" />
+        <item name="main: schema" type="981a47c2:SqliteImplModel$Schema" />
+      </path>
+    </expand>
+    <select />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FavoritesManager">
     <favorites_list name="craftbeerpi4" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="craftbeerpi.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="776">
-              <caret line="58" column="13" lean-forward="false" selection-start-line="58" selection-start-column="13" selection-end-line="58" selection-end-column="13" />
+            <state relative-caret-position="435">
+              <caret line="29" column="11" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -102,88 +104,80 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="step.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/api/step.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="960">
-              <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="-152">
+              <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
+              <folding>
+                <element signature="e#0#13#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.step" pinned="false" current-in-tab="false">
-        <entry file="dbDummy://dbtable:/a57e2371/5067e7fe-480d-4433-bc40-f2d1c38362a2/main.step">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="202">
+              <caret line="264" selection-start-line="264" selection-end-line="264" />
+              <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$/tests/test_app.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="413">
+              <caret line="36" column="8" lean-forward="true" selection-start-line="36" selection-start-column="8" selection-end-line="37" selection-end-column="33" />
+              <folding>
+                <element signature="e#0#65#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/tests/test_config.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="411">
+              <caret line="48" column="33" lean-forward="true" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
+              <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>
-          <provider editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
         </entry>
       </file>
-      <file leaf-file-name="_scheduler.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/job/_scheduler.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="301">
-              <caret line="84" column="15" lean-forward="true" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="15" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="aiohttp.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/job/aiohttp.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="630">
-              <caret line="46" column="4" lean-forward="true" selection-start-line="46" selection-start-column="4" selection-end-line="50" selection-end-column="37" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/extension/dummystep/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="22" column="23" lean-forward="false" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="_job.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/job/_job.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="455">
-              <caret line="111" column="52" lean-forward="true" selection-start-line="111" selection-start-column="52" selection-end-line="111" selection-end-column="52" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="actor_controller.py" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="405">
-              <caret line="34" column="61" lean-forward="false" selection-start-line="34" selection-start-column="61" selection-end-line="34" selection-end-column="61" />
+            <state relative-caret-position="180">
+              <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
               <folding>
-                <element signature="e#0#26#0" expanded="true" />
+                <element signature="e#0#11#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="step_controller.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="417">
-              <caret line="61" column="32" lean-forward="false" selection-start-line="61" selection-start-column="32" selection-end-line="61" selection-end-column="32" />
+            <state relative-caret-position="528">
+              <caret line="40" column="87" lean-forward="true" selection-start-line="40" selection-start-column="87" selection-end-line="40" selection-end-column="87" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -191,11 +185,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="model.py" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="209">
+              <caret line="29" column="14" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="14" />
+              <folding>
+                <element signature="e#0#25#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/database/model.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="601">
-              <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+            <state relative-caret-position="435">
+              <caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
                 <marker date="1544981620597" expanded="true" signature="1131:1171" ph="UPDATE missi... " />
@@ -222,16 +228,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>asy*bus.fire(</find>
-      <find>async*bus.fire(</find>
-      <find>async *bus.fire(</find>
-      <find>async * bus.fire(</find>
-      <find>async  bus.fire(</find>
-      <find>async bus.fire(</find>
-      <find>async. bus.fire(</find>
-      <find>async.* bus.fire(</find>
-      <find>async.*bus.fire(</find>
-      <find>bus.fire(</find>
       <find>@</find>
       <find>@on</find>
       <find>@on_</find>
@@ -252,6 +248,16 @@
       <find>schedul</find>
       <find>reset</find>
       <find>setup</find>
+      <find>load_plugins</find>
+      <find>ComplexEncoder</find>
+      <find>SET</find>
+      <find>log</find>
+      <find>logging</find>
+      <find>collections</find>
+      <find>Prefx</find>
+      <find>################</find>
+      <find>defaultdict</find>
+      <find>print</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -259,9 +265,9 @@
       <replace>from core.</replace>
     </replaceStrings>
     <dirStrings>
-      <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/core/controller</dir>
       <dir>$PROJECT_DIR$/core/api</dir>
+      <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/core</dir>
     </dirStrings>
   </component>
@@ -271,587 +277,325 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/docs_src/source/kettle_controller.rst" />
-        <option value="$PROJECT_DIR$/docs_src/source/actor.rst" />
-        <option value="$PROJECT_DIR$/core/api/decorator.py" />
-        <option value="$PROJECT_DIR$/core/job/__init__.py" />
-        <option value="$PROJECT_DIR$/core/eventbus2.py" />
-        <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
-        <option value="$PROJECT_DIR$/main2.py" />
-        <option value="$PROJECT_DIR$/core/controller/kettle_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/dummy_controller.py" />
-        <option value="$PROJECT_DIR$/core/sql/create_table_user.sql" />
-        <option value="$PROJECT_DIR$/core/extension/comp/static/index.html" />
-        <option value="$PROJECT_DIR$/core/extension/comp/static/index2.html" />
-        <option value="$PROJECT_DIR$/core/api/simplestep.py" />
         <option value="$PROJECT_DIR$/core/extension/dummystep/config.yaml" />
         <option value="$PROJECT_DIR$/core/extension/dummysensor/config.yaml" />
         <option value="$PROJECT_DIR$/core/extension/dummylogic/config.yaml" />
         <option value="$PROJECT_DIR$/core/extension/dummyactor/config.yaml" />
         <option value="$PROJECT_DIR$/core/extension/comp/config.yaml" />
-        <option value="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" />
-        <option value="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" />
         <option value="$PROJECT_DIR$/core/api/sensor.py" />
         <option value="$PROJECT_DIR$/core/api/kettle_logic.py" />
         <option value="$PROJECT_DIR$/docs_src/source/conf.py" />
         <option value="$PROJECT_DIR$/core/api/property.py" />
-        <option value="$PROJECT_DIR$/docs_src/source/properties.rst" />
-        <option value="$PROJECT_DIR$/docs_src/source/sensor.rst" />
-        <option value="$PROJECT_DIR$/core/controller/plugin_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/notification_controller.py" />
-        <option value="$PROJECT_DIR$/docs_src/source/step.rst" />
         <option value="$PROJECT_DIR$/docs_src/source/index.rst" />
         <option value="$PROJECT_DIR$/docs_src/source/standards.rst" />
-        <option value="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" />
-        <option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
-        <option value="$PROJECT_DIR$/core/controller/crud_controller.py" />
         <option value="$PROJECT_DIR$/core/api/actor.py" />
-        <option value="$PROJECT_DIR$/core/utils/encoder.py" />
         <option value="$PROJECT_DIR$/core/api/extension.py" />
         <option value="$PROJECT_DIR$/tests/test_kettle.py" />
-        <option value="$PROJECT_DIR$/core/extension/comp/__init__.py" />
-        <option value="$PROJECT_DIR$/core/websocket.py" />
-        <option value="$PROJECT_DIR$/core/eventbus.py" />
-        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
-        <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
         <option value="$PROJECT_DIR$/core/api/step.py" />
         <option value="$PROJECT_DIR$/core/database/model.py" />
         <option value="$PROJECT_DIR$/core/job/aiohttp.py" />
-        <option value="$PROJECT_DIR$/core/job/_scheduler.py" />
-        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
-        <option value="$PROJECT_DIR$/core/extension/dummystep/__init__.py" />
+        <option value="$PROJECT_DIR$/run.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
+        <option value="$PROJECT_DIR$/core/controller/notification_controller.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
+        <option value="$PROJECT_DIR$/docs_src/source/actor.rst" />
+        <option value="$PROJECT_DIR$/docs_src/source/kettle_controller.rst" />
+        <option value="$PROJECT_DIR$/docs_src/source/sensor.rst" />
+        <option value="$PROJECT_DIR$/docs_src/source/properties.rst" />
+        <option value="$PROJECT_DIR$/docs_src/source/step.rst" />
+        <option value="$PROJECT_DIR$/core/utils/encoder.py" />
+        <option value="$PROJECT_DIR$/config/config.yaml" />
         <option value="$PROJECT_DIR$/core/controller/step_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
+        <option value="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" />
+        <option value="$PROJECT_DIR$/core/extension/comp/__init__.py" />
+        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/plugin_controller.py" />
+        <option value="$PROJECT_DIR$/core/extension/dummylogic/__init__.py" />
+        <option value="$PROJECT_DIR$/core/extension/dummystep/__init__.py" />
+        <option value="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" />
+        <option value="$PROJECT_DIR$/core/utils/utils.py" />
+        <option value="$PROJECT_DIR$/core/controller/kettle_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
+        <option value="$PROJECT_DIR$/core/mqtt/mqtt_matcher.py" />
+        <option value="$PROJECT_DIR$/core/controller/crud_controller.py" />
+        <option value="$PROJECT_DIR$/core/job/_scheduler.py" />
+        <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
+        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
+        <option value="$PROJECT_DIR$/core/eventbus.py" />
+        <option value="$PROJECT_DIR$/core/websocket.py" />
+        <option value="$PROJECT_DIR$/tests/test_app.py" />
+        <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
+        <option value="$PROJECT_DIR$/core/controller/config_controller.py" />
+        <option value="$PROJECT_DIR$/tests/test_config.py" />
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="330" />
-    <option name="y" value="187" />
-    <option name="width" value="2371" />
-    <option name="height" value="1427" />
+    <option name="x" value="725" />
+    <option name="y" value="158" />
+    <option name="width" value="2037" />
+    <option name="height" value="1391" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
+    <navigator proportions="" version="1">
       <autoscrollFromSource ProjectPane="true" />
-      <sortByType />
-      <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="craftbeerpi4">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="craftbeerpi4">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="core">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="craftbeerpi4">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="core">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="utils">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="site-packages" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="site-packages" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="aiosqlite" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="site-packages" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="aiosqlite" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Connection" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="site-packages" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="aiosqlite" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="python3.7" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="CraftBeerPi" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="job" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="aiohttp.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="job" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="_scheduler.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Scheduler" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="job" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="_job.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Job" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="job" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="extension" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="extension" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dummystep" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="extension" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dummystep" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="__init__.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="database" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="controller" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="controller" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="step_controller.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="StepController" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="api" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="step.py" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyFileNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="CBPiSimpleStep" />
-              <option name="myItemType" value="com.jetbrains.python.projectView.PyElementNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="craftbeerpi4" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="core" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="api" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+          <expand>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="database" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="extension" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" 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="core" type="462c0819:PsiDirectoryNode" />
+              <item name="http_endpoints" type="462c0819:PsiDirectoryNode" />
+              <item name="http_api.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="http_endpoints" type="462c0819:PsiDirectoryNode" />
+              <item name="http_api.py" type="8704e2dd:PyFileNode" />
+              <item name="HttpAPI" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" 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="core" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="utils.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="craftbeerpi.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="craftbeerpi.py" type="8704e2dd:PyFileNode" />
+              <item name="CraftBeerPi" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="websocket.py" type="8704e2dd:PyFileNode" />
+            </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_app.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" />
+            </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_kettle.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="main2.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="main2.py" type="8704e2dd:PyFileNode" />
+              <item name="Name" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </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" />
+            </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_urldispatcher.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_urldispatcher.py" type="8704e2dd:PyFileNode" />
+              <item name="AbstractRoute" 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_urldispatcher.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_urldispatcher.py" type="8704e2dd:PyFileNode" />
+              <item name="AbstractRoute" 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="craftbeerpi4_api" 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="craftbeerpi4_api" type="462c0819:PsiDirectoryNode" />
+              <item name="cbpi_api" 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="craftbeerpi4_api" type="462c0819:PsiDirectoryNode" />
+              <item name="cbpi_api" type="462c0819:PsiDirectoryNode" />
+              <item name="config.py" type="8704e2dd:PyFileNode" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-    <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="run.code.analysis.last.selected.profile" value="aDefault" />
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="Sqlite (Xerial)" />
+    <property name="database.console.LAST_STATE" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
+    <property name="run.code.analysis.last.selected.profile" value="aDefault" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/tests" />
+      <recent name="$PROJECT_DIR$/core/extension/comp/static" />
+      <recent name="$PROJECT_DIR$/core/controller" />
+      <recent name="$PROJECT_DIR$/core/extension/dummystep" />
+      <recent name="$PROJECT_DIR$/docs_src/source" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/docs_src/source" />
       <recent name="$PROJECT_DIR$/docs_src/source/_images" />
@@ -859,13 +603,6 @@
       <recent name="$PROJECT_DIR$/docs_src" />
       <recent name="$PROJECT_DIR$/core/controller" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/core/extension/comp/static" />
-      <recent name="$PROJECT_DIR$/core/controller" />
-      <recent name="$PROJECT_DIR$/core/extension/dummystep" />
-      <recent name="$PROJECT_DIR$/docs_src/source" />
-      <recent name="$PROJECT_DIR$/tests" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -879,8 +616,9 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.run">
-    <configuration default="false" name="run" type="PythonConfigurationType" factoryName="Python" temporary="true">
+  <component name="RunManager" selected="Python tests.pytest in test_config.py">
+    <configuration name="run" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -891,32 +629,18 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/run.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
-      <method />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
     </configuration>
-    <configuration default="false" name="py.test in tests" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
+    <configuration name="test_app" type="PythonConfigurationType" factoryName="Python">
       <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method />
-    </configuration>
-    <configuration default="false" name="test_kettle" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -927,289 +651,157 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tests/test_kettle.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tests/test_app.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
-      <method />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
     </configuration>
-    <configuration default="false" name="main2" type="PythonConfigurationType" factoryName="Python" temporary="true">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main2.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="TARGET" value="" />
-      <option name="SETTINGS_FILE" value="" />
-      <option name="CUSTOM_SETTINGS" value="false" />
-      <option name="USE_OPTIONS" value="false" />
-      <option name="OPTIONS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
-      <node-interpreter value="project" />
-      <working-dir value="" />
-      <envs />
-      <scope-kind value="ALL" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="PyBehaveRunConfigurationType" factoryName="Behave">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="ADDITIONAL_ARGS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="PyLettuceRunConfigurationType" factoryName="Lettuce">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="ADDITIONAL_ARGS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Tox" factoryName="Tox">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <module name="craftbeerpi4" />
-      <method />
-    </configuration>
-    <configuration default="true" type="docs" factoryName="Docutils task">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="docutils_input_file" value="" />
-      <option name="docutils_output_file" value="" />
-      <option name="docutils_params" value="" />
-      <option name="docutils_task" value="" />
-      <option name="docutils_open_in_browser" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="docs" factoryName="Sphinx task">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="docutils_input_file" value="" />
-      <option name="docutils_output_file" value="" />
-      <option name="docutils_params" value="" />
-      <option name="docutils_task" value="" />
-      <option name="docutils_open_in_browser" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+    <configuration default="true" type="js.build_tools.gulp">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <gulpfile />
       <tasks />
       <arguments />
       <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="Doctests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_SCRIPT" />
-      <option name="PATTERN" value="" />
-      <option name="USE_PATTERN" value="false" />
-      <method />
+      <method v="2" />
     </configuration>
     <configuration default="true" type="tests" factoryName="Unittests">
+      <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs />
       <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
       <option name="_new_target" value="&quot;.&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method />
+      <method v="2" />
     </configuration>
     <configuration default="true" type="tests" factoryName="py.test">
+      <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs />
       <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_keywords" value="&quot;&quot;" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
       <option name="_new_target" value="&quot;.&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method />
+      <method v="2" />
     </configuration>
-    <configuration default="false" name="test_app" type="PythonConfigurationType" factoryName="Python">
+    <configuration name="py.test in tests" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="pytest for test_config.ConfigTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tests/test_app.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <method />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;test_config.ConfigTestCase&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
     </configuration>
-    <configuration default="false" name="test kettle" type="tests" factoryName="Unittests">
+    <configuration name="pytest for test_config.KettleTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;test_config.KettleTestCase&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="pytest in test_config.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_config.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="test kettle" type="tests" factoryName="Unittests">
+      <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <envs />
       <option name="SDK_HOME" value="$USER_HOME$/cbpi41/bin/python" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="craftbeerpi4" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_pattern" value="&quot;&quot;" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
       <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_kettle.py&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method />
+      <method v="2" />
     </configuration>
-    <list size="6">
-      <item index="0" class="java.lang.String" itemvalue="Python.test_app" />
-      <item index="1" class="java.lang.String" itemvalue="Python tests.test kettle" />
-      <item index="2" class="java.lang.String" itemvalue="Python.run" />
-      <item index="3" class="java.lang.String" itemvalue="Python tests.py.test in tests" />
-      <item index="4" class="java.lang.String" itemvalue="Python.test_kettle" />
-      <item index="5" class="java.lang.String" itemvalue="Python.main2" />
+    <list>
+      <item itemvalue="Python.test_app" />
+      <item itemvalue="Python.run" />
+      <item itemvalue="Python tests.test kettle" />
+      <item itemvalue="Python tests.py.test in tests" />
+      <item itemvalue="Python tests.pytest in test_config.py" />
+      <item itemvalue="Python tests.pytest for test_config.KettleTestCase" />
+      <item itemvalue="Python tests.pytest for test_config.ConfigTestCase" />
     </list>
     <recent_temporary>
-      <list size="4">
-        <item index="0" class="java.lang.String" itemvalue="Python.run" />
-        <item index="1" class="java.lang.String" itemvalue="Python tests.py.test in tests" />
-        <item index="2" class="java.lang.String" itemvalue="Python.main2" />
-        <item index="3" class="java.lang.String" itemvalue="Python.test_kettle" />
+      <list>
+        <item itemvalue="Python tests.pytest in test_config.py" />
+        <item itemvalue="Python.run" />
+        <item itemvalue="Python tests.pytest for test_config.ConfigTestCase" />
+        <item itemvalue="Python tests.pytest for test_config.KettleTestCase" />
+        <item itemvalue="Python tests.py.test in tests" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -1218,6 +810,13 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1541098050947</updated>
+      <workItem from="1545131638852" duration="44000" />
+      <workItem from="1545131718935" duration="11863000" />
+      <workItem from="1545649555591" duration="176000" />
+      <workItem from="1545649866457" duration="125000" />
+      <workItem from="1545814324660" duration="436000" />
+      <workItem from="1546003397332" duration="543000" />
+      <workItem from="1546006149688" duration="17935000" />
     </task>
     <task id="LOCAL-00001" summary="Lots of changes">
       <created>1541288846149</created>
@@ -1237,37 +836,40 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="py_test_in_tests - 2018.12.11 at 01h 00m 35s.xml">
-      <configuration name="py.test in tests" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 54m 33s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.01 at 13h 18m 48s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 55m 04s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 01m 44s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 55m 22s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 04m 01s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 55m 38s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 04m 42s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.28 at 23h 57m 43s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 05m 09s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 01m 03s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 10m 08s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 01m 20s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 10m 31s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 01m 39s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 10m 48s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 02m 05s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="test_kettle - 2018.12.11 at 01h 11m 34s.xml">
-      <configuration name="test kettle" configurationId="tests" />
+    <history-entry file="pytest_in_test_config_py - 2018.12.29 at 00h 02m 26s.xml">
+      <configuration name="pytest in test_config.py" configurationId="tests" />
     </history-entry>
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="31122000" />
+  </component>
   <component name="TodoView" selected-index="4">
     <todo-panel id="selected-file">
       <is-autoscroll-to-source value="true" />
@@ -1278,39 +880,40 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="330" y="187" width="2371" height="1427" extended-state="0" />
-    <editor active="true" />
+    <frame x="725" y="158" width="2037" height="1391" extended-state="0" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16659637" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286945" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43208432" sideWeight="0.2720238" order="0" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.06916913" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2952872" sideWeight="0.7279762" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286945" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290398" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24957556" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19955817" sideWeight="0.49761903" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39812645" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
-      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3256617" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1904762" />
+      <window_info id="Structure" order="1" weight="0.24957556" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.2720238" side_tool="true" weight="0.43208432" />
+      <window_info anchor="bottom" id="Version Control" order="1" weight="0.32762837" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7279762" visible="true" weight="0.49730563" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39731053" />
+      <window_info anchor="bottom" id="Python Console" order="4" weight="0.3290398" />
+      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.29946113" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3286945" />
+      <window_info anchor="bottom" id="Message" order="7" />
+      <window_info anchor="bottom" id="Find" order="8" weight="0.3256617" />
+      <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 Console" order="14" weight="0.32885087" />
+      <window_info anchor="right" id="Data View" order="0" />
+      <window_info anchor="right" id="Database" order="1" visible="true" weight="0.14135338" />
+      <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" />
+      <window_info anchor="right" id="SciView" order="5" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="processedProjectFiles" value="true" />
+    <option name="version" value="1" />
   </component>
   <component name="Vcs.Log.History.Properties">
     <option name="SHOW_OTHER_BRANCHES" value="true" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Lots of changes" />
     <option name="LAST_COMMIT_MESSAGE" value="Lots of changes" />
@@ -1327,6 +930,10 @@
           <url>file://$PROJECT_DIR$/core/controller/kettle_controller.py</url>
           <option name="timeStamp" value="21" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/core/eventbus.py</url>
+          <option name="timeStamp" value="22" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1335,7 +942,6 @@
           </properties>
         </breakpoint>
       </default-breakpoints>
-      <option name="time" value="22" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="PythonConfigurationType">
@@ -1344,351 +950,291 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/docs_src/source/conf.py">
+    <entry file="file://$PROJECT_DIR$/core/api/__init__.py" />
+    <entry file="file://$PROJECT_DIR$/core/extension/dummylogic/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/api/property.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="46" column="29" lean-forward="false" selection-start-line="46" selection-start-column="29" selection-end-line="46" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/sensor_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/sensor.rst">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-248">
-          <caret line="81" column="60" lean-forward="false" selection-start-line="81" selection-start-column="44" selection-end-line="81" selection-end-column="60" />
-          <folding />
+        <state relative-caret-position="105">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core/extension/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/notification_controller.py">
+    <entry file="file://$PROJECT_DIR$/run.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/kettle_controller.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
-          <caret line="5" column="36" lean-forward="false" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/actor.rst">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/install.rst">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt_matcher.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/sql/create_table_user.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="854">
-          <caret line="108" column="20" lean-forward="false" selection-start-line="108" selection-start-column="20" selection-end-line="108" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/index.rst">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="12" lean-forward="false" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/step.rst">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="11" lean-forward="false" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docs_src/source/standards.rst">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="38" column="89" lean-forward="false" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" column="28" lean-forward="false" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="702">
-          <caret line="63" column="68" lean-forward="true" selection-start-line="63" selection-start-column="68" selection-end-line="63" selection-end-column="68" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="28" column="45" lean-forward="false" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/json/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-46">
-          <caret line="182" column="23" lean-forward="false" selection-start-line="182" selection-start-column="23" selection-end-line="182" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/json/encoder.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="178" column="0" lean-forward="false" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummysensor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="27" column="20" lean-forward="true" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/utils/encoder.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1008">
-          <caret line="149" column="8" lean-forward="false" selection-start-line="149" selection-start-column="8" selection-end-line="149" selection-end-column="64" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_app.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" column="8" lean-forward="true" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="62" />
-          <folding>
-            <element signature="e#0#65#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/test_utils.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-210">
-          <caret line="316" column="6" lean-forward="false" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="dbDummy://dbtable:/a57e2371/5067e7fe-480d-4433-bc40-f2d1c38362a2/main.actor">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_kettle.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="27" column="31" lean-forward="true" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/api/actor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="660">
-          <caret line="46" column="17" lean-forward="false" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="582">
-          <caret line="40" column="38" lean-forward="true" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#15#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/api/extension.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="455">
-          <caret line="39" column="56" lean-forward="false" selection-start-line="39" selection-start-column="56" selection-end-line="39" selection-end-column="56" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
+          <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core/extension/comp/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+        <state relative-caret-position="30">
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/notification_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="22" selection-start-column="22" selection-end-column="22" />
+        </state>
+      </provider>
+    </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$/core/http_endpoints/http_login.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
           <folding>
             <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/websocket.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="25" column="8" lean-forward="false" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="8" />
-          <folding />
+    <entry file="file://$PROJECT_DIR$/docs_src/source/actor.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web_middlewares.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="105" column="0" lean-forward="false" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" />
+    <entry file="file://$PROJECT_DIR$/docs_src/source/kettle_controller.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/events.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1200">
-          <caret line="87" column="0" lean-forward="false" selection-start-line="87" selection-start-column="0" selection-end-line="87" selection-end-column="0" />
-          <folding />
+    <entry file="file://$PROJECT_DIR$/docs_src/source/standards.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="38" column="89" selection-start-line="38" selection-start-column="89" selection-end-line="38" selection-end-column="89" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/logger.conf" />
-    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
+    <entry file="file://$PROJECT_DIR$/docs_src/source/step.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docs_src/source/properties.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/docs_src/source/sensor.rst">
+      <provider selected="true" editor-type-id="restructured-text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/config.yaml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor>
+            <js_state />
+          </second_editor>
+        </state>
+      </provider>
+      <provider editor-type-id="text-editor" />
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor" />
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/test_utils.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="105" column="14" lean-forward="true" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
+        <state relative-caret-position="-322">
+          <caret line="316" column="6" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/cbpi_api/actor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummysensor/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" />
           <folding>
             <element signature="e#0#14#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="196">
-          <caret line="353" column="0" lean-forward="false" selection-start-line="353" selection-start-column="0" selection-end-line="353" selection-end-column="0" />
-          <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>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiosqlite/__init__.py">
+    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/events.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="188">
+          <caret line="279" column="8" selection-start-line="279" selection-start-column="8" selection-end-line="279" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiosqlite/core.py">
+    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/json/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2160">
-          <caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
+        <state relative-caret-position="305">
+          <caret line="182" column="4" selection-start-line="182" selection-start-column="4" selection-end-line="182" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/utils/encoder.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/sensor_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="27" />
           <folding>
-            <marker date="1543049363901" expanded="true" signature="4041:4067" ph="SELECT last_... " />
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_kettle.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/plugin_list.yaml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="6" lean-forward="true" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-39">
+          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/cbpi_api/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummystep/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" selection-start-line="2" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-99">
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core/database/orm_framework.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="133" column="14" lean-forward="false" selection-start-line="133" selection-start-column="14" selection-end-line="133" selection-end-column="14" />
+        <state relative-caret-position="336">
+          <caret line="86" column="12" selection-start-line="86" selection-start-column="12" selection-end-line="87" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../craftbeerpi4_api/cbpi_api/config.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web_urldispatcher.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="544">
+          <caret line="118" column="47" lean-forward="true" selection-start-line="118" selection-start-column="47" selection-end-line="118" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main2.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-69">
+          <caret line="51" column="24" lean-forward="true" selection-start-line="51" selection-end-line="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
-            <marker date="1544977190790" expanded="true" signature="1476:1509" ph="SELECT * FRO... missing_value" />
-            <marker date="1544977190790" expanded="true" signature="1613:1627" ph="SELECT * FRO... missing_value" />
-            <marker date="1544977190790" expanded="true" signature="2266:2295" ph="SELECT * FRO... missing_value" />
-            <marker date="1544977190790" expanded="true" signature="2664:2691" ph="DELETE FROM " />
-            <marker date="1544977190790" expanded="true" signature="2992:3030" ph="INSERT INTO missing_value... " />
-            <marker date="1544977190790" expanded="true" signature="3622:3653" ph="INSERT INTO missing_value... " />
-            <marker date="1544977190790" expanded="true" signature="4448:4477" ph="UPDATE missi... " />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
+    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="34" column="61" lean-forward="false" selection-start-line="34" selection-start-column="61" selection-end-line="34" selection-end-column="61" />
+        <state relative-caret-position="224">
+          <caret line="106" column="19" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="19" />
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/websocket.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="327">
+          <caret line="22" column="42" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core/database/model.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="601">
-          <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+        <state relative-caret-position="435">
+          <caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
             <marker date="1544981620597" expanded="true" signature="1131:1171" ph="UPDATE missi... " />
@@ -1703,73 +1249,87 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/job/_job.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="455">
-          <caret line="111" column="52" lean-forward="true" selection-start-line="111" selection-start-column="52" selection-end-line="111" selection-end-column="52" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/job/_scheduler.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="84" column="15" lean-forward="true" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/job/aiohttp.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="46" column="4" lean-forward="true" selection-start-line="46" selection-start-column="4" selection-end-line="50" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="776">
-          <caret line="58" column="13" lean-forward="false" selection-start-line="58" selection-start-column="13" selection-end-line="58" selection-end-column="13" />
+        <state relative-caret-position="202">
+          <caret line="264" selection-start-line="264" selection-end-line="264" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummystep/__init__.py">
+    <entry file="file://$PROJECT_DIR$/tests/test_app.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="22" column="23" lean-forward="false" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
-          <folding />
+        <state relative-caret-position="413">
+          <caret line="36" column="8" lean-forward="true" selection-start-line="36" selection-start-column="8" selection-end-line="37" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#65#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="dbDummy://dbtable:/a57e2371/5067e7fe-480d-4433-bc40-f2d1c38362a2/main.step">
+    <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>
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-152">
+          <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/api/step.py">
+    <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="960">
-          <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="180">
+          <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_api.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="417">
-          <caret line="61" column="32" lean-forward="false" selection-start-line="61" selection-start-column="32" selection-end-line="61" selection-end-column="32" />
+        <state relative-caret-position="528">
+          <caret line="40" column="87" lean-forward="true" selection-start-line="40" selection-start-column="87" selection-end-line="40" selection-end-column="87" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="29" column="14" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#25#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="435">
+          <caret line="29" column="11" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_config.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="411">
+          <caret line="48" column="33" lean-forward="true" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
diff --git a/config/config.yaml b/config/config.yaml
index e7df109..bbb0861 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -7,3 +7,7 @@ port: 8080
 
 username: cbpi
 password: 123
+
+test:
+  name: Manuel
+  name2: Manuel
\ No newline at end of file
diff --git a/core/api/__init__.py b/core/api/__init__.py
deleted file mode 100644
index 5ae16bb..0000000
--- a/core/api/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-__all__ = ["CBPiActor", "CBPiExtension","Property", "PropertyType", "on_websocket_message", "on_mqtt_message", "on_event", "on_startup", "action", "background_task"]
-
-from core.api.actor import *
-from core.api.extension import *
-from core.api.property import *
-from core.api.decorator import *
\ No newline at end of file
diff --git a/core/api/actor.py b/core/api/actor.py
deleted file mode 100644
index 4d44790..0000000
--- a/core/api/actor.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from abc import ABCMeta
-
-__all__ = ["CBPiActor"]
-
-import logging
-
-from core.api.extension import CBPiExtension
-
-logger = logging.getLogger(__file__)
-
-class CBPiActor(CBPiExtension, metaclass=ABCMeta):
-
-    def init(self):
-        pass
-
-    def stop(self):
-        pass
-
-    def on(self, power):
-        '''
-        Code to switch the actor on. Power is provided as integer value  
-        
-        :param power: power value between 0 and 100 
-        :return: None
-        '''
-        pass
-
-    def off(self):
-
-        '''
-        Code to switch the actor off
-        
-        :return: None 
-        '''
-        pass
-
-    def state(self):
-
-        '''
-        Return the current actor state
-        
-        :return: 
-        '''
-
-        pass
-
-    def reprJSON(self):
-        return dict(state=True)
\ No newline at end of file
diff --git a/core/api/decorator.py b/core/api/decorator.py
deleted file mode 100644
index 83a02c8..0000000
--- a/core/api/decorator.py
+++ /dev/null
@@ -1,96 +0,0 @@
-__all__ = ["request_mapping", "on_startup", "on_event", "on_mqtt_message", "on_websocket_message", "action", "background_task"]
-
-from aiohttp_auth import auth
-
-def composed(*decs):
-    def deco(f):
-        for dec in reversed(decs):
-            f = dec(f)
-        return f
-    return deco
-
-def request_mapping(path, name=None, method="GET", auth_required=True):
-
-    def on_http_request(path, name=None):
-        def real_decorator(func):
-            func.route = True
-            func.path = path
-            func.name = name
-            func.method = method
-            return func
-
-        return real_decorator
-
-    if auth_required is True:
-        return composed(
-            on_http_request(path,  name),
-            auth.auth_required
-        )
-    else:
-        return composed(
-            on_http_request(path, name)
-        )
-
-def on_websocket_message(path, name=None):
-    def real_decorator(func):
-        func.ws = True
-        func.key = path
-        func.name = name
-        return func
-
-    return real_decorator
-
-def on_event(topic):
-    def real_decorator(func):
-        func.eventbus = True
-        func.topic = topic
-        func.c = None
-        return func
-
-    return real_decorator
-
-def action(key, parameters):
-    def real_decorator(func):
-        func.action = True
-
-        func.key = key
-        func.parameters = parameters
-        return func
-
-    return real_decorator
-
-def on_mqtt_message(topic):
-    def real_decorator(func):
-        func.mqtt = True
-        func.topic = topic
-        return func
-
-    return real_decorator
-
-
-def background_task(name, interval):
-    def real_decorator(func):
-        func.background_task = True
-        func.name = name
-        func.interval = interval
-        return func
-
-    return real_decorator
-
-
-def on_startup(name, order=0):
-    def real_decorator(func):
-        func.on_startup = True
-        func.name = name
-        func.order = order
-        return func
-
-    return real_decorator
-
-
-def entry_exit(f):
-    def new_f():
-
-        f()
-
-    return new_f
\ No newline at end of file
diff --git a/core/api/extension.py b/core/api/extension.py
deleted file mode 100644
index bbc917a..0000000
--- a/core/api/extension.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import logging
-import os
-import sys
-
-
-__all__ = ["CBPiExtension"]
-
-
-logger = logging.getLogger(__file__)
-logging.basicConfig(level=logging.INFO)
-
-
-class CBPiExtension():
-
-    def init(self):
-        pass
-
-    def stop(self):
-        pass
-
-    def __init__(self, *args, **kwds):
-
-        for a in kwds:
-
-            super(CBPiExtension, self).__setattr__(a, kwds.get(a))
-        self.cbpi = kwds.get("cbpi")
-        self.id = kwds.get("id")
-        self.value = None
-        self.__dirty = False
-
-    def __setattr__(self, name, value):
-
-        if name != "_CBPiExtension__dirty":
-            self.__dirty = True
-            super(CBPiExtension, self).__setattr__(name, value)
-        else:
-            super(CBPiExtension, self).__setattr__(name, value)
-
-    def load_config(self):
-        from core.utils.utils import load_config as load
-        path = os.path.dirname(sys.modules[self.__class__.__module__].__file__)
-        try:
-            return load("%s/config.yaml" % path)
-        except:
-            logger.warning("Faild to load config %s/config.yaml" % path)
diff --git a/core/api/kettle_logic.py b/core/api/kettle_logic.py
deleted file mode 100644
index 0fb1634..0000000
--- a/core/api/kettle_logic.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-from core.api.extension import CBPiExtension
-
-class CBPiKettleLogic(CBPiExtension):
-
-    '''
-    Base Class for a Kettle logic. 
-    '''
-
-    def init(self):
-        '''
-        Code which will be executed when the logic is initialised. Needs to be overwritten by the implementing logic
-        
-        :return: None
-        '''
-        pass
-
-    def stop(self):
-        '''
-        Code which will be executed when the logic is stopped. Needs to be overwritten by the implementing logic
-        
-        
-        :return: None
-        '''
-        pass
-
-    def run(self):
-        '''
-        This method is running as background process when logic is started.
-        Typically a while loop responsible that the method keeps running 
-        
-            while self.running:
-                await asyncio.sleep(1)
-        
-        :return: None
-        '''
-
-        pass
\ No newline at end of file
diff --git a/core/api/property.py b/core/api/property.py
deleted file mode 100644
index 98f44ca..0000000
--- a/core/api/property.py
+++ /dev/null
@@ -1,113 +0,0 @@
-__all__ = ["PropertyType", "Property"]
-
-class PropertyType(object):
-    pass
-
-class Property(object):
-    class Select(PropertyType):
-
-        '''
-        Select Property. The user can select value from list set as options parameter
-        '''
-
-        def __init__(self, label, options, description=""):
-            '''
-            
-            :param label: 
-            :param options: 
-            :param description: 
-            '''
-            PropertyType.__init__(self)
-            self.label = label
-            self.options = options
-            self.description = description
-
-    class Number(PropertyType):
-
-        '''
-        The user can set a number value 
-        '''
-        def __init__(self, label, configurable=False, default_value=None, unit="", description=""):
-            '''
-            Test
-            
-            
-            :param label: 
-            :param configurable: 
-            :param default_value: 
-            :param unit: 
-            :param description: 
-            '''
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = configurable
-            self.default_value = default_value
-            self.description = description
-
-    class Text(PropertyType):
-
-        '''
-        The user can set a text value 
-        '''
-        def __init__(self, label, configurable=False, default_value="", description=""):
-            '''
-            
-            :param label: 
-            :param configurable: 
-            :param default_value: 
-            :param description: 
-            '''
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = configurable
-            self.default_value = default_value
-            self.description = description
-
-    class Actor(PropertyType):
-
-        '''
-        The user select an actor which is available in the system. The value of this variable will be the actor id
-        '''
-        def __init__(self, label, description=""):
-            '''
-            
-            :param label: 
-            :param description: 
-            '''
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = True
-            self.description = description
-
-    class Sensor(PropertyType):
-        '''
-        The user select a sensor which is available in the system. The value of this variable will be the sensor id
-        '''
-
-        def __init__(self, label, description=""):
-            '''
-            
-            :param label: 
-            :param description: 
-            '''
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = True
-            self.description = description
-
-    class Kettle(PropertyType):
-        '''
-        The user select a kettle which is available in the system. The value of this variable will be the kettle id
-        '''
-
-        def __init__(self, label, description=""):
-            '''
-            
-            :param label: 
-            :param description: 
-            '''
-
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = True
-            self.description = description
\ No newline at end of file
diff --git a/core/api/sensor.py b/core/api/sensor.py
deleted file mode 100644
index 239af02..0000000
--- a/core/api/sensor.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from core.api.extension import CBPiExtension
-
-class CBPiSensor(CBPiExtension):
-
-    async def run(self, cbpi):
-        print("RUN NOT IMPLEMENTED")
-
-    def state(self):
-        pass
\ No newline at end of file
diff --git a/core/api/step.py b/core/api/step.py
deleted file mode 100644
index f1f1425..0000000
--- a/core/api/step.py
+++ /dev/null
@@ -1,134 +0,0 @@
-import time
-import asyncio
-import logging
-from abc import abstractmethod,ABCMeta
-
-
-class CBPiSimpleStep(metaclass=ABCMeta):
-
-    __dirty = False
-    managed_fields = []
-    _interval = 1
-    _max_exceptions = 2
-    _exception_count = 0
-
-    def __init__(self, *args, **kwargs):
-        self.logger = logging.getLogger(__name__)
-        for a in kwargs:
-            super(CBPiSimpleStep, self).__setattr__(a, kwargs.get(a))
-        self.id = kwargs.get("id")
-        self.is_stopped = False
-        self.is_next = False
-        self.start = time.time()
-
-    def running(self):
-        '''
-        Method checks if the step should continue running. 
-        The method will return False if the step is requested to stop or the next step should start
-        
-        :return: True if the step is running. Otherwise False.
-        '''
-        if self.is_next is True:
-            return False
-
-        if self.is_stopped is True:
-            return False
-
-        return True
-
-    async def run(self):
-
-        '''
-        This method in running in the background. It invokes the run_cycle method in the configured interval
-        It checks if a managed variable was modified in the last exection cycle. If yes, the method will persisit the new value of the
-        managed property
-        
-        :return: None 
-        '''
-
-        while self.running():
-            try:
-                await self.run_cycle()
-            except Exception as e:
-                logging.exception("CBPiSimpleStep Error")
-                self._exception_count = self._exception_count + 1
-                if self._exception_count == self._max_exceptions:
-                    self.logger.error("Step Exception limit exceeded. Stopping Step")
-                    self.stop()
-            print("INTER",self._interval)
-            await asyncio.sleep(self._interval)
-
-            if self.is_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)
-                    print("STATE",state)
-                    await self.cbpi.step.model.update_step_state(self.id, state)
-
-                self.reset_dirty()
-
-    @abstractmethod
-    async def run_cycle(self):
-        '''
-        This method is executed in the defined interval. 
-        That the place to put your step logic.
-        The method need to be overwritten in the Ccstom step implementaion
-        
-        :return: None 
-        '''
-
-        print("NOTING IMPLEMENTED")
-        pass
-
-    def next(self):
-
-        '''
-        Request to stop the the step
-        
-        :return: None 
-        '''
-
-        self.is_next = True
-
-    def stop(self):
-        '''
-        Request to stop the step
-        
-        :return: None 
-        '''
-        self.is_stopped = True
-
-    def reset(self):
-        '''
-        Reset the step. This method needs to be overwritten by the custom step implementation
-        
-        :return: None 
-        '''
-        pass
-
-    def is_dirty(self):
-
-        '''
-        Check if a managed variable has a new value
-        
-        :return: True if at least one managed variable has a new value assigend. Otherwise False
-        '''
-        return self.__dirty
-
-    def reset_dirty(self):
-        '''
-        Reset the dirty flag
-        
-        :return: 
-        '''
-
-        self.__dirty = False
-
-    def __setattr__(self, name, value):
-        if name != "_Step__dirty" and name in self.managed_fields:
-            self.__dirty = True
-            super(CBPiSimpleStep, self).__setattr__(name, value)
-        else:
-            super(CBPiSimpleStep, self).__setattr__(name, value)
\ No newline at end of file
diff --git a/core/controller/actor_controller.py b/core/controller/actor_controller.py
index 80aa98a..72da40e 100644
--- a/core/controller/actor_controller.py
+++ b/core/controller/actor_controller.py
@@ -1,11 +1,13 @@
+import json
+import logging
 from asyncio import Future
 
 from aiohttp import web
-
-from core.api.decorator import on_event, request_mapping
+from cbpi_api import *
 from core.controller.crud_controller import CRUDController
 from core.database.model import ActorModel
 from core.http_endpoints.http_api import HttpAPI
+from utils.encoder import ComplexEncoder
 
 
 class ActorHttp(HttpAPI):
@@ -17,11 +19,11 @@ class ActorHttp(HttpAPI):
         :return: 
         """
         id = int(request.match_info['id'])
-        result = await self.cbpi.bus.fire2(topic="actor/%s/switch/on" % id, id=id, power=99)
-        print(result.timeout)
+        result = await self.cbpi.bus.fire(topic="actor/%s/switch/on" % id, id=id, power=99)
+
 
         for key, value in result.results.items():
-            print(key, value.result)
+            pass
         return web.Response(status=204)
 
 
@@ -42,7 +44,7 @@ class ActorHttp(HttpAPI):
         :return: 
         """
         id = int(request.match_info['id'])
-        print("ID", id)
+
         await self.cbpi.bus.fire(topic="actor/%s/toggle" % id, id=id)
         return web.Response(status=204)
 
@@ -57,11 +59,16 @@ class ActorController(ActorHttp, CRUDController):
         super(ActorController, self).__init__(cbpi)
         self.cbpi = cbpi
         self.state = False;
-
+        self.logger = logging.getLogger(__name__)
         self.cbpi.register(self, "/actor")
         self.types = {}
         self.actors = {}
 
+    def info(self):
+
+        return json.dumps(dict(name="ActorController", types=self.types), cls=ComplexEncoder)
+
+
     async def init(self):
         '''
         This method initializes all actors during startup. It creates actor instances
@@ -104,8 +111,8 @@ class ActorController(ActorHttp, CRUDController):
 
         id = int(id)
         if id in self.cache:
-            print("POWER ON")
-            actor = self.cache[id   ].instance
+            self.logger.debug("ON %s" % id)
+            actor = self.cache[id].instance
             await self.cbpi.bus.fire("actor/%s/on/ok" % id)
             actor.on(power)
 
@@ -122,6 +129,7 @@ class ActorController(ActorHttp, CRUDController):
         :return: 
         '''
 
+        self.logger.debug("TOGGLE %s" % id)
         id = int(id)
         if id in self.cache:
             actor = self.cache[id].instance
@@ -141,6 +149,7 @@ class ActorController(ActorHttp, CRUDController):
         :param kwargs: 
         """
 
+        self.logger.debug("OFF %s" % id)
         id = int(id)
 
         if id in self.cache:
diff --git a/core/controller/config_controller.py b/core/controller/config_controller.py
index 9b1b632..5baa859 100644
--- a/core/controller/config_controller.py
+++ b/core/controller/config_controller.py
@@ -1,8 +1,36 @@
+import logging
+import os
+
+from aiohttp import web
+from cbpi_api import request_mapping
+
 from core.controller.crud_controller import CRUDController
 from core.database.model import ConfigModel
+from utils import load_config, json_dumps
+from cbpi_api.config import ConfigType
 
+class ConfigHTTPController():
+    @request_mapping(path="/{name}/", method="POST", auth_required=False)
+    async def http_post(self, request) -> web.Response:
+        """
+        :param request:
+        :return:
+        """
+        name = request.match_info['name']
+        data = await request.json()
+        print(data)
+        await self.set(name=name, value=data.get("value"))
+        return web.Response(status=204)
 
-class ConfigController(CRUDController):
+    @request_mapping(path="/", auth_required=False)
+    async def http_get_all(self, request) -> web.Response:
+        """
+        :param request:
+        :return:
+        """
+        return web.json_response(self.cache, dumps=json_dumps)
+
+class ConfigController(ConfigHTTPController):
 
     '''
     The main actor controller
@@ -10,9 +38,35 @@ class ConfigController(CRUDController):
     model = ConfigModel
 
     def __init__(self, cbpi):
-        super(ConfigController, self).__init__(cbpi)
+        self.cache = {}
+        self.logger = logging.getLogger(__name__)
         self.cbpi = cbpi
-
         self.cbpi.register(self, "/config")
 
+    async def init(self):
+        this_directory = os.path.dirname(__file__)
+        self.static = load_config(os.path.join(this_directory, '../../config/config.yaml'))
+        items = await self.model.get_all()
+        for key, value in items.items():
+            self.cache[value.name] = value
 
+
+    async def get(self, name, default=None):
+        self.logger.info("GET CONFIG VALUE %s (default %s)" % (name,default))
+        if name in self.cache and self.cache[name].value is not None:
+            return self.cache[name].value
+        else:
+            return default
+
+    async def set(self, name, value):
+        self.logger.debug("SET %s = %s" % (name, value))
+        if name in self.cache:
+
+            self.cache[name].value = value
+            m = await self.model.update(**self.cache[name].__dict__)
+            await self.cbpi.bus.fire(topic="config/%s/update" % name, name=name, value=value)
+
+
+    async def add(self, name, value, type: ConfigType, description, options=None):
+        m = await self.model.insert(name=name, value=value, type=type.value, description=description, options=options)
+        await self.cbpi.bus.fire(topic="config/%s/add" % name, name=name, value=value)
diff --git a/core/controller/crud_controller.py b/core/controller/crud_controller.py
index aa1ef4b..29efbcf 100644
--- a/core/controller/crud_controller.py
+++ b/core/controller/crud_controller.py
@@ -1,8 +1,5 @@
-import json
 import pprint
-from abc import abstractmethod,ABCMeta
-
-from core.utils.encoder import ComplexEncoder
+from abc import ABCMeta
 
 
 class CRUDController(metaclass=ABCMeta):
@@ -141,10 +138,10 @@ class CRUDController(metaclass=ABCMeta):
         await self._post_delete_callback(id)
         try:
             if self.caching is True:
-                print("DELTE FROM ACHE")
+
                 del self.cache[int(id)]
         except Exception as e:
-            print(e)
+
             pass
         pprint.pprint(self.cache)
         await self.cbpi.bus.fire(topic="actor/%s/deleted" % id, id=id)
diff --git a/core/controller/kettle_controller.py b/core/controller/kettle_controller.py
index f6347e8..648d642 100644
--- a/core/controller/kettle_controller.py
+++ b/core/controller/kettle_controller.py
@@ -2,7 +2,8 @@ import re
 
 from aiohttp import web
 
-from core.api import request_mapping, on_event
+
+from cbpi_api import *
 from core.controller.crud_controller import CRUDController
 from core.database.model import KettleModel
 from core.http_endpoints.http_api import HttpAPI
@@ -84,7 +85,7 @@ class KettleController(CRUDController):
             kettle = self.cache[int(kid)]
             kettle.instance = None
 
-            print("STOP KETTLE LOGIC", kid)
+
 
     @on_event(topic="kettle/+/automatic")
     async def handle_automtic_event(self, id, **kwargs):
@@ -97,9 +98,9 @@ class KettleController(CRUDController):
         :return: None
         '''
         id = int(id)
-        print("WOOOHO", type(id), self.cache)
+
         if id in self.cache:
-            print("id", id)
+
             kettle = self.cache[id]
 
             if hasattr(kettle, "instance") is False:
@@ -111,7 +112,7 @@ class KettleController(CRUDController):
                     cfg = kettle.config.copy()
                     cfg.update(dict(cbpi=self.cbpi))
                     kettle.instance = clazz(**cfg)
-                print("START LOGIC")
+
                 await self.cbpi.start_job(kettle.instance.run(), "Kettle_logic_%s" % kettle.id, "kettle_logic%s"%id)
             else:
                 kettle.instance.running = False
@@ -120,7 +121,7 @@ class KettleController(CRUDController):
 
     def _is_logic_running(self, kettle_id):
         scheduler = get_scheduler_from_app(self.cbpi.app)
-        print("JOB KETTLE RUNNING", scheduler.is_running("Kettle_logic_%s"%kettle_id))
+
 
     async def heater_on(self, id):
         '''
diff --git a/core/controller/notification_controller.py b/core/controller/notification_controller.py
index 1af74d9..b79187d 100644
--- a/core/controller/notification_controller.py
+++ b/core/controller/notification_controller.py
@@ -1,5 +1,4 @@
-from core.api.decorator import on_event
-
+from cbpi_api import *
 
 class NotificationController():
     '''
diff --git a/core/controller/plugin_controller.py b/core/controller/plugin_controller.py
index 74366e5..bfc66d4 100644
--- a/core/controller/plugin_controller.py
+++ b/core/controller/plugin_controller.py
@@ -1,5 +1,8 @@
+import imp
+import importlib
 import logging
 import os
+import sys
 from importlib import import_module
 from pprint import pprint
 
@@ -7,17 +10,11 @@ import aiohttp
 import yaml
 from aiohttp import web
 
-from core.api.actor import CBPiActor
-from core.api.decorator import request_mapping
-from core.api.extension import CBPiExtension
-from core.api.kettle_logic import CBPiKettleLogic
-from core.api.property import Property
-from core.api.sensor import CBPiSensor
-from core.api.step import CBPiSimpleStep
+from cbpi_api import *
 from core.utils.utils import load_config, json_dumps
 
-logger = logging.getLogger(__file__)
-logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
 
 class PluginController():
 
@@ -64,6 +61,18 @@ class PluginController():
             except Exception as e:
                 logger.error(e)
 
+    def load_plugins_from_evn(self):
+
+
+        plugins = ["cbpi-actor"]
+
+
+        for p in plugins:
+
+            self.modules[p] = import_module(p)
+            self.modules[p].setup(self.cbpi)
+
+
     @request_mapping(path="/plugins", method="GET", auth_required=False)
     async def get_plugins(self, request):
         """
@@ -90,7 +99,7 @@ class PluginController():
         :param clazz: actor class
         :return: None
         '''
-        print("REGISTER", name, clazz)
+
         if issubclass(clazz, CBPiActor):
             self.cbpi.actor.types[name] = {"class": clazz, "config": self._parse_props(clazz)}
 
@@ -103,12 +112,12 @@ class PluginController():
 
         if issubclass(clazz, CBPiSimpleStep):
             self.cbpi.step.types[name] = self._parse_props(clazz)
-            print(self.cbpi.step.types)
+
         if issubclass(clazz, CBPiExtension):
             self.c  = clazz(self.cbpi)
 
     def _parse_props(self, cls):
-        print("PARSE", cls)
+
         name = cls.__name__
 
         result = {"name": name, "class": cls, "properties": [], "actions": []}
@@ -143,5 +152,5 @@ class PluginController():
                 key = method.__getattribute__("key")
                 parameters = method.__getattribute__("parameters")
                 result["actions"].append({"method": method_name, "label": key, "parameters": parameters})
-        pprint(result)
+
         return result
\ No newline at end of file
diff --git a/core/controller/sensor_controller.py b/core/controller/sensor_controller.py
index 8c0cfb5..e677813 100644
--- a/core/controller/sensor_controller.py
+++ b/core/controller/sensor_controller.py
@@ -1,10 +1,10 @@
+import json
 import logging
 import os
 from logging.handlers import TimedRotatingFileHandler
-
+from core.utils.encoder import ComplexEncoder
 from core.job.aiohttp import get_scheduler_from_app
-
-from core.api.decorator import background_task
+from cbpi_api import *
 from core.controller.crud_controller import CRUDController
 from core.database.model import SensorModel
 from core.http_endpoints.http_api import HttpAPI
@@ -22,7 +22,9 @@ class SensorController(CRUDController, HttpAPI):
 
         self.sensors = {}
 
+    def info(self):
 
+        return json.dumps(dict(name="SensorController", types=self.types), cls=ComplexEncoder)
 
     async def init(self):
         '''
@@ -31,9 +33,9 @@ class SensorController(CRUDController, HttpAPI):
         :return: 
         '''
         await super(SensorController, self).init()
-        print("INIT SENSOR")
+
         for name, clazz in self.types.items():
-            print("Type", name)
+            pass
 
         for id, value in self.cache.items():
             if value.type in self.types:
@@ -43,7 +45,7 @@ class SensorController(CRUDController, HttpAPI):
                 self.cache[id].instance = clazz(**cfg)
                 scheduler = get_scheduler_from_app(self.cbpi.app)
                 self.cache[id].instance.job = await scheduler.spawn(self.cache[id].instance.run(self.cbpi), value.name, "sensor")
-        print("------------")
+
 
     async def get_value(self, id):
 
diff --git a/core/controller/step_controller.py b/core/controller/step_controller.py
index c5bacbd..14d78b0 100644
--- a/core/controller/step_controller.py
+++ b/core/controller/step_controller.py
@@ -2,7 +2,7 @@ import asyncio
 
 import time
 from aiohttp import web
-from core.api import on_event, request_mapping
+from cbpi_api import *
 from core.controller.crud_controller import CRUDController
 from core.database.model import StepModel
 from core.http_endpoints.http_api import HttpAPI
@@ -36,7 +36,7 @@ class StepController(HttpAPI, CRUDController):
         :return: 
         '''
         await super(StepController, self).init()
-        print("INIT LAST STEP")
+
         await self.init_after_startup()
 
     async def init_after_startup(self):
@@ -45,14 +45,14 @@ class StepController(HttpAPI, CRUDController):
 
 
         if step is not None:
-            print("INIT LAST STEP", step.__dict__)
+
             # get the type
-            print(self.types)
+
             step_type = self.types.get(step.type)
 
             if step_type is None:
                 # step type not found. cant restart step
-                print("STEP TYPE NONT FOUND")
+
                 return
 
             if step.stepstate is not None:
@@ -201,10 +201,10 @@ class StepController(HttpAPI, CRUDController):
         :return: 
         '''
 
-        print("IS SHUTODONW", self.cbpi.shutdown)
+
         if self.cbpi.shutdown:
             return
-        print("JOB DONE STEP")
+
         self.cache[self.current_step.id].state = "D"
         step_id = self.current_step.id
         self.current_step = None
@@ -214,7 +214,7 @@ class StepController(HttpAPI, CRUDController):
 
 
     def _get_manged_fields_as_array(self, type_cfg):
-        print("tYPE", type_cfg)
+
         result = []
         for f in type_cfg.get("properties"):
             result.append(f.get("name"))
@@ -236,7 +236,7 @@ class StepController(HttpAPI, CRUDController):
             inactive = await self.model.get_by_state("I")
             active = await self.model.get_by_state("A")
 
-            print("STEPES", inactive, active)
+
 
             if active is not None:
                 active.state = 'D'
diff --git a/core/controller/system_controller.py b/core/controller/system_controller.py
index 57ad276..c24b03f 100644
--- a/core/controller/system_controller.py
+++ b/core/controller/system_controller.py
@@ -2,7 +2,7 @@ import datetime
 from aiohttp import web
 from aiojobs.aiohttp import get_scheduler_from_app
 
-from core.api.decorator import request_mapping
+from cbpi_api import *
 
 
 class SystemController():
@@ -28,9 +28,7 @@ class SystemController():
         result = []
         for j in scheduler:
             try:
-                print(datetime.datetime.fromtimestamp(
-                    j.start_time
-                ).strftime('%Y-%m-%d %H:%M:%S'))
+
                 result.append(dict(name=j.name, type=j.type, time=j.start_time))
             except:
                 pass
diff --git a/core/craftbeerpi.py b/core/craftbeerpi.py
index b7257ee..a8fc104 100644
--- a/core/craftbeerpi.py
+++ b/core/craftbeerpi.py
@@ -26,8 +26,11 @@ from core.eventbus import EventBus
 from core.http_endpoints.http_login import Login
 from core.utils import *
 from core.websocket import WebSocket
+from core.utils.encoder import ComplexEncoder
 
-logger = logging.getLogger(__file__)
+
+
+logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
 
 
@@ -72,12 +75,14 @@ class CraftBeerPi():
         self.kettle = KettleController(self)
         self.step = StepController(self)
         self.notification = NotificationController(self)
-        #self.dummy = MyComp(self)
+
+
 
 
         self.login = Login(self)
 
         self.plugin.load_plugins()
+        self.plugin.load_plugins_from_evn()
         self.register_events(self.ws)
 
 
@@ -193,7 +198,7 @@ class CraftBeerPi():
 
 
         if url_prefix is not None:
-            print("Prefx", url_prefix)
+            logger.debug("URL Prefix: %s "  % (url_prefix,))
             sub = web.Application()
             sub.add_routes(routes)
             if static is not None:
@@ -242,12 +247,13 @@ class CraftBeerPi():
         :return: 
         '''
 
-        print("INIT CONTROLLER")
+
 
         from pyfiglet import Figlet
         f = Figlet(font='big')
+        print("")
         print(f.renderText("%s %s" % (self.config.get("name"), self.config.get("version"))))
-
+        print("")
         async def init_database(app):
             await DBModel.test_connection()
 
@@ -256,14 +262,22 @@ class CraftBeerPi():
             await self.step.init()
             await self.actor.init()
             await self.kettle.init()
+            await self.config2.init()
 
+
+            print(self.sensor.info())
+
+            print(self.actor.info())
             import pprint
-            pprint.pprint(self.bus.dump())
+            #pprint.pprint(self.bus.dump())
 
 
         async def load_plugins(app):
             #await PluginController.load_plugin_list()
             #self.plugin.load_plugins()
+
+
+
             pass
 
         async def call_initializer(app):
diff --git a/core/database/orm_framework.py b/core/database/orm_framework.py
index 09cf051..e381269 100644
--- a/core/database/orm_framework.py
+++ b/core/database/orm_framework.py
@@ -36,13 +36,9 @@ class DBModel(object):
     @classmethod
     async def test_connection(self):
 
-
         async with aiosqlite.connect(TEST_DB) as db:
-
             assert isinstance(db, aiosqlite.Connection)
             this_directory = os.path.dirname(__file__)
-
-
             qry = open(os.path.join(this_directory, '../sql/create_table_user.sql'), 'r').read()
             cursor = await db.executescript(qry)
 
@@ -67,7 +63,8 @@ class DBModel(object):
                     if cls.__as_array__ is True:
                         result.append(cls(row))
                     else:
-                        result[row.get("id")] = cls(row)
+
+                        result[row.get(cls.__priamry_key__)] = cls(row)
                 await cursor.close()
 
         return result
@@ -121,7 +118,7 @@ class DBModel(object):
                     else:
                         data = data + (kwargs.get(f),)
 
-            print("INSERT DATA", query, data)
+
             cursor = await db.execute(query, data)
             await db.commit()
 
diff --git a/core/eventbus.py b/core/eventbus.py
index e42f2ac..b16d5f1 100644
--- a/core/eventbus.py
+++ b/core/eventbus.py
@@ -1,9 +1,6 @@
 import asyncio
 import inspect
 import logging
-import json
-
-import time
 
 
 class EventBus(object):
@@ -101,13 +98,13 @@ class EventBus(object):
         else:
             self.loop = asyncio.get_event_loop()
 
-        print(self.loop)
+
 
     def sync_fire(self,topic: str,timeout=1, **kwargs):
         self.loop.create_task(self.fire(topic=topic, timeout=timeout, **kwargs))
 
     async def fire(self, topic: str, timeout=1, **kwargs):
-
+        print("FIRE")
         futures = {}
 
         async def wait(futures):
diff --git a/core/extension/comp/__init__.py b/core/extension/comp/__init__.py
index 4d93574..0045bef 100644
--- a/core/extension/comp/__init__.py
+++ b/core/extension/comp/__init__.py
@@ -1,7 +1,6 @@
 from aiohttp import web
 
-from core.api.decorator import on_event, request_mapping
-from core.api.extension import CBPiExtension
+from cbpi_api import *
 from core.controller.crud_controller import CRUDController
 from core.database.orm_framework import DBModel
 from core.http_endpoints.http_api import HttpAPI
@@ -32,12 +31,12 @@ class MyComp(CBPiExtension, CRUDController, HttpAPI):
 
     @on_event(topic="actor/#")
     async def listen(self, **kwargs):
-        print("Test", kwargs)
+        pass
 
 
     @on_event(topic="kettle/+/automatic")
     async def listen2(self, **kwargs):
-        print("HANDLE AUTOMATIC", kwargs)
+
 
         await self.cbpi.bus.fire(topic="actor/%s/toggle" % 1, id=1)
 
diff --git a/core/extension/dummyactor/__init__.py b/core/extension/dummyactor/__init__.py
index 7b16688..3174333 100644
--- a/core/extension/dummyactor/__init__.py
+++ b/core/extension/dummyactor/__init__.py
@@ -1,6 +1,6 @@
 import logging
 
-from core.api import CBPiActor, Property, action
+from cbpi_api import *
 
 
 class CustomActor(CBPiActor):
@@ -9,10 +9,10 @@ class CustomActor(CBPiActor):
     gpio = Property.Number(label="Test")
 
     def init(self):
-        print("#########INIT MY CUSTOM ACTOR")
+        pass
 
     def stop(self):
-        print("#########STOP MY CUSTOM ACTOR")
+        pass
 
 
     @action(key="name", parameters={})
@@ -23,14 +23,14 @@ class CustomActor(CBPiActor):
         super().state()
 
     def off(self):
-        print("OFF", self.gpio)
+
 
         # Code to swtich the actor off goes here
 
         self.state = False
 
     def on(self, power=100):
-        print("ON", self.gpio)
+
 
         # Code to swtich the actor on goes here
 
diff --git a/core/extension/dummylogic/__init__.py b/core/extension/dummylogic/__init__.py
index f8ac7be..2f024b1 100644
--- a/core/extension/dummylogic/__init__.py
+++ b/core/extension/dummylogic/__init__.py
@@ -1,8 +1,6 @@
 import asyncio
 
-from core.api import Property, on_event
-from core.api.kettle_logic import CBPiKettleLogic
-
+from cbpi_api import *
 
 class CustomLogic(CBPiKettleLogic):
 
@@ -29,14 +27,14 @@ class CustomLogic(CBPiKettleLogic):
         if timeout is not None:
 
             try:
-                print("----> WAIT FOR FUTURE")
+
                 await asyncio.wait_for(future_obj, timeout=timeout)
-                print("------> TIMEOUT")
+
                 return future_obj.result()
             except asyncio.TimeoutError:
-                print('timeout!')
+                pass
         else:
-            print("----> WAIT FOR FUTURE")
+
             await future_obj
             return future_obj.result()
 
@@ -51,10 +49,10 @@ class CustomLogic(CBPiKettleLogic):
                 self.cbpi.bus.unregister(my_callback)
                 kwargs["future"].set_result("AMAZING")
             else:
-                print("OTHER VALUE", value)
+                pass
 
         result = await self.wait_for_event("sensor/1", callback=my_callback)
-        print("THE RESULT", result)
+
 
 
         '''
@@ -68,7 +66,7 @@ class CustomLogic(CBPiKettleLogic):
                 break
             await asyncio.sleep(1)
         '''
-        print("YES IM FINISHED STOP LOGIC")
+
 
 def setup(cbpi):
 
diff --git a/core/extension/dummysensor/__init__.py b/core/extension/dummysensor/__init__.py
index c751c98..4c54e79 100644
--- a/core/extension/dummysensor/__init__.py
+++ b/core/extension/dummysensor/__init__.py
@@ -2,9 +2,7 @@ import asyncio
 import logging
 import random
 
-from core.api import CBPiActor, Property, action, background_task
-from core.api.sensor import CBPiSensor
-
+from cbpi_api import *
 
 class CustomSensor(CBPiSensor):
 
@@ -38,7 +36,7 @@ class CustomSensor(CBPiSensor):
 
             self.value = self.value + 1
             await cbpi.bus.fire("sensor/%s" % self.id, value=self.value)
-            print("SENSOR IS RUNNING", self.value)
+
 
 
 
diff --git a/core/extension/dummystep/__init__.py b/core/extension/dummystep/__init__.py
index 93a1525..b2ae6e6 100644
--- a/core/extension/dummystep/__init__.py
+++ b/core/extension/dummystep/__init__.py
@@ -1,7 +1,6 @@
 import asyncio
 
-from core.api import Property, action
-from core.api.step import CBPiSimpleStep
+from cbpi_api import *
 
 
 class CustomStepCBPi(CBPiSimpleStep):
@@ -23,7 +22,7 @@ class CustomStepCBPi(CBPiSimpleStep):
         if self.i == 20:
             self.next()
         self.cbpi.notify(key="step", message="HELLO FROM STEP")
-        print("RUN STEP", self.id, self.name, self.__dict__)
+
 
 
 def setup(cbpi):
diff --git a/core/http_endpoints/http_api.py b/core/http_endpoints/http_api.py
index 3fc3a8b..72755ca 100644
--- a/core/http_endpoints/http_api.py
+++ b/core/http_endpoints/http_api.py
@@ -2,7 +2,9 @@ import logging
 
 from aiohttp import web
 
-from core.api.decorator import request_mapping
+
+from cbpi_api import *
+
 from core.utils.utils import json_dumps
 
 
diff --git a/core/http_endpoints/http_login.py b/core/http_endpoints/http_login.py
index 5ba9c7f..df3a73c 100644
--- a/core/http_endpoints/http_login.py
+++ b/core/http_endpoints/http_login.py
@@ -1,7 +1,7 @@
 from aiohttp import web
 from aiohttp_auth import auth
 
-from core.api.decorator import request_mapping
+from cbpi_api import *
 
 
 class Login():
diff --git a/core/job/_scheduler.py b/core/job/_scheduler.py
index 20d5706..28db254 100644
--- a/core/job/_scheduler.py
+++ b/core/job/_scheduler.py
@@ -86,7 +86,7 @@ class Scheduler(*bases):
         if self._closed:
             return
         self._closed = True  # prevent adding new jobs
-        print("####### CLOSE")
+
         jobs = self._jobs
         if jobs:
             # cleanup pending queue
@@ -113,7 +113,7 @@ class Scheduler(*bases):
 
     def _done(self, job):
 
-        print("JOB DONE")
+
         self.cbpi.bus.sync_fire("job/%s/done" % job.type, type=job.type, key=job.name)
         self._jobs.discard(job)
         if not self.pending_count:
diff --git a/core/mqtt/mqtt_matcher.py b/core/mqtt/mqtt_matcher.py
index 08a1914..cf9637b 100644
--- a/core/mqtt/mqtt_matcher.py
+++ b/core/mqtt/mqtt_matcher.py
@@ -55,7 +55,7 @@ class MQTTMatcher(object):
         self._root = self.Node()
 
     def __setitem__(self, key, value):
-        print("...",key, value)
+
         node = self._root
         for sym in key.split('/'):
 
diff --git a/core/utils/encoder.py b/core/utils/encoder.py
index 3f9eb29..1121bae 100644
--- a/core/utils/encoder.py
+++ b/core/utils/encoder.py
@@ -7,15 +7,13 @@ class ComplexEncoder(JSONEncoder):
 
     def default(self, obj):
 
-        from core.database.model import ActorModel
         from core.database.orm_framework import DBModel
-        from core.api.kettle_logic import CBPiKettleLogic
-        print("OBJECT", obj)
+
         try:
             if isinstance(obj, DBModel):
                 return obj.__dict__
-            elif callable(getattr(obj, "reprJSON")):
-                return obj.reprJSON()
+            #elif callable(getattr(obj, "reprJSON")):
+            #    return obj.reprJSON()
             #elif isinstance(obj, ActorModel):
             #    return None
             elif hasattr(obj, "callback"):
diff --git a/core/utils/utils.py b/core/utils/utils.py
index e89d254..15090c0 100644
--- a/core/utils/utils.py
+++ b/core/utils/utils.py
@@ -1,7 +1,6 @@
 from pprint import pprint
 
-
-from core.api.property import Property
+from cbpi_api import *
 from core.utils.encoder import ComplexEncoder
 
 __all__ = ['load_config',"json_dumps", "parse_props"]
@@ -16,10 +15,13 @@ from core.database.model import DBModel, ActorModel
 
 def load_config(fname):
     try:
+
         with open(fname, 'rt') as f:
             data = yaml.load(f)
+
         return data
-    except:
+    except Exception as e:
+
         pass
 
 
@@ -63,7 +65,7 @@ def parse_props(self, cls):
             key = method.__getattribute__("key")
             parameters = method.__getattribute__("parameters")
             result["actions"].append({"method": method_name, "label": key, "parameters": parameters})
-    pprint(result, width=200)
+
 
 
 
diff --git a/core/websocket.py b/core/websocket.py
index e76da9f..53bf6ed 100644
--- a/core/websocket.py
+++ b/core/websocket.py
@@ -5,8 +5,7 @@ import json
 import aiohttp
 from aiohttp import web
 from typing import Iterable, Callable
-
-from core.api import on_event
+from cbpi_api import *
 
 
 class WebSocket:
@@ -19,11 +18,12 @@ class WebSocket:
 
     @on_event(topic="#")
     async def listen(self, topic, **kwargs):
-        print("WS", topic)
-
         from core.utils.encoder import ComplexEncoder
+        data = json.dumps(dict(topic=topic, data=dict(**kwargs)),skipkeys=True, check_circular=True, cls=ComplexEncoder)
+        self.logger.info("PUSH %s " % data)
 
-        self.send(json.dumps(dict(topic=topic, data=dict(**kwargs)),skipkeys=True, check_circular=True, cls=ComplexEncoder))
+
+        self.send(data)
 
     def send(self, data):
 
diff --git a/craftbeerpi.db b/craftbeerpi.db
index be4384ba1e95df950066668bf67ccc764a2d5003..d697c7ac4f908b4df004794f9cd2fd204264ebfb 100644
GIT binary patch
delta 639
zcmZozz}&Ead4d!ZQ^rIYCm^{oVTry3BmW}?{zv??fG`XQh4_W|&H-W9W*LJCd@KwM
z3`&zX*g3!$@{@(_6%m|pWX^0D=YYKuuM8tAgQ&D>NNRD3Z{_Cq_CgB${1pr={EUqJ
ztN0oDP58q$3krPXt2bm~Q#O<o6?JwB@Qe>}4GxJnGBh<YGcdL=G%?k)G%z(ZFtsQy
zDay=C2bq;unv<iz!lulRqQ%4zqM`(*f)!nbF`5ega|}lMKr`yG*lT2>XKrk1XljgV
zts*0vvLK4JhDJuHN`RpSF&1H}F_LeLO^ghUOi-LEn8O9s!@_@%f&U}_L;j2W2Z6z|
zk>8)6S(y=GhzScS-<TDZZ^XpMtjvi}Z^+B9#lXV1l!5OB{|x?6zNJ7zr}7CovT!pn
zh-+H%v#^LVfI`z`^16N%UY8h&`@%r14hr1KFZ!HV_-`|4PuA;K74cwjWJc3t4ALV3
n)N}6xNFPX#BNJTB<mLU^f-W&)JC=eJfFyz5Q{8;OU(o>o>TIlO

delta 302
zcmZozz}&Ead4d!Z<Hd<GPC#;F!V-N69=;3){(Jm;_-FA~@Q3l6@C)&M;5)~+X0wdJ
z1U@DOuE`hd6egduQ({u!05gT`flM|qGYrIJ0W)WTm`orhlL8}%+T_5fu$Xay0zZEM
z0}I~^M!pyPbNIFRZ*LY9SjVTu@5129Ag*Z1&%z?g5R%G2gCUkdTocG;0C9^;Oq@%L
zOY(DrOHwDl=yPIGX69y?tk<s^;=>@SDGFBwS5)Ba6p)!$nv>%gBetUl#IR)IW&oSW
j05#DFRk1Bho`qrZ;(l#jkjAATjmj+C44d!wD>?uG>aSHY

diff --git a/docs_src/source/actor.rst b/docs_src/source/actor.rst
index 218d65b..02275e8 100644
--- a/docs_src/source/actor.rst
+++ b/docs_src/source/actor.rst
@@ -21,7 +21,7 @@ ActorController
 CBPiActor
 ^^^^^^^^^
 
-.. autoclass:: core.api.actor.CBPiActor
+.. autoclass:: cbpi_api.CBPiActor
   :members:
   :private-members:
   :undoc-members:
diff --git a/docs_src/source/kettle_controller.rst b/docs_src/source/kettle_controller.rst
index c44792d..99e18ff 100644
--- a/docs_src/source/kettle_controller.rst
+++ b/docs_src/source/kettle_controller.rst
@@ -16,7 +16,7 @@ CBPiKettleLogic
 ^^^^^^^^^^^^^^^
 
 
-.. autoclass:: core.api.kettle_logic.CBPiKettleLogic
+.. autoclass:: cbpi_api.CBPiKettleLogic
   :members:
   :show-inheritance:
   :inherited-members:
diff --git a/docs_src/source/properties.rst b/docs_src/source/properties.rst
index 0f17bda..36efa58 100644
--- a/docs_src/source/properties.rst
+++ b/docs_src/source/properties.rst
@@ -23,7 +23,7 @@ Custom Actor
 
 
 
-.. autoclass:: core.api.property.Property
+.. autoclass:: cbpi_api.Property
   :members:
   :private-members:
   :undoc-members:
diff --git a/docs_src/source/sensor.rst b/docs_src/source/sensor.rst
index c39b55f..79bf0c6 100644
--- a/docs_src/source/sensor.rst
+++ b/docs_src/source/sensor.rst
@@ -15,7 +15,7 @@ Sensor Controller
 CBPiSensor
 ^^^^^^^^^^
 
-.. autoclass:: core.api.sensor.CBPiSensor
+.. autoclass:: cbpi_api.CBPiSensor
   :members:
   :private-members:
   :undoc-members:
diff --git a/docs_src/source/step.rst b/docs_src/source/step.rst
index bd86e0a..9491107 100644
--- a/docs_src/source/step.rst
+++ b/docs_src/source/step.rst
@@ -16,7 +16,7 @@ StepController
 CBPiSimpleStep
 ^^^^^^^^^^^^^^
 
-.. autoclass:: core.api.step.CBPiSimpleStep
+.. autoclass:: cbpi_api.CBPiSimpleStep
   :members:
   :undoc-members:
   :show-inheritance:
@@ -30,7 +30,6 @@ This is an example of a custom step. The Step class need to extend Simple step.
 
 .. literalinclude:: ../../core/extension/dummystep/__init__.py
    :caption: __init__.py
-   :name: __init__-py
    :language: python
    :linenos:
 
diff --git a/run.py b/run.py
index 9c2a899..4ea12ed 100644
--- a/run.py
+++ b/run.py
@@ -1,5 +1,3 @@
-from core.api.decorator import on_event
-from core.controller.notification_controller import NotificationController
 from core.craftbeerpi import CraftBeerPi
 
 
diff --git a/sensor_None.log b/sensor_None.log
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_config.py b/tests/test_config.py
new file mode 100644
index 0000000..1457d72
--- /dev/null
+++ b/tests/test_config.py
@@ -0,0 +1,56 @@
+import asyncio
+import time
+
+import aiosqlite
+from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
+from core.craftbeerpi import CraftBeerPi
+from cbpi_api.config import ConfigType
+
+class ConfigTestCase(AioHTTPTestCase):
+
+
+    async def get_application(self):
+        self.cbpi = CraftBeerPi()
+        self.cbpi.setup()
+        return self.cbpi.app
+
+
+    @unittest_run_loop
+    async def test_get(self):
+
+        assert await self.cbpi.config2.get("CBPI_TEST_1", 1) == "22"
+
+    @unittest_run_loop
+    async def test_set_get(self):
+        value = str(time.time())
+
+        await self.cbpi.config2.set("CBPI_TEST_2", value)
+
+        assert await self.cbpi.config2.get("CBPI_TEST_2", 1) == value
+
+    @unittest_run_loop
+    async def test_add(self):
+        value = str(time.time())
+        key = "CBPI_TEST_3"
+        async with aiosqlite.connect("./craftbeerpi.db") as db:
+            await db.execute("DELETE FROM config WHERE name = ? ", (key,))
+            await db.commit()
+
+        await self.cbpi.config2.add(key, value, type=ConfigType.STRING, description="test")
+
+    @unittest_run_loop
+    async def test_http_set(self):
+        value = str(time.time())
+        key = "CBPI_TEST_3"
+        await self.cbpi.config2.set(key, value)
+        assert await self.cbpi.config2.get(key, 1) == value
+
+        resp = await self.client.request("POST", "/config/%s/" % key, json={'value': '1'})
+        assert resp.status == 204
+        assert await self.cbpi.config2.get(key, -1) == "1"
+
+    @unittest_run_loop
+    async def test_http_get(self):
+        resp = await self.client.request("GET", "/config/")
+        assert resp.status == 200
+        #print(await eresp.json())