From 83696fb556e893550bc84e1e375f1010388c5f3b Mon Sep 17 00:00:00 2001
From: Manuel83 <manuelfritsch@Manuels-MBP.fritz.box>
Date: Thu, 1 Nov 2018 21:25:42 +0100
Subject: [PATCH] config added

---
 .idea/dataSources.local.xml                   |  12 +
 .idea/dataSources.xml                         |  14 +
 .../5067e7fe-480d-4433-bc40-f2d1c38362a2.xml  | 317 +++++++++
 .../_metadata_/metadata                       | Bin 0 -> 65536 bytes
 .../_metadata_/metadata.keystream             | Bin 0 -> 4096 bytes
 .../_metadata_/metadata.keystream.len         | Bin 0 -> 8 bytes
 .../_metadata_/metadata.len                   | Bin 0 -> 8 bytes
 .../_metadata_/metadata_i                     | Bin 0 -> 32768 bytes
 .../_metadata_/metadata_i.len                 | Bin 0 -> 8 bytes
 .idea/workspace.xml                           | 661 +++++++++++++++++-
 config/config.yaml                            |   1 +
 core/__pycache__/cbpi.cpython-36.pyc          | Bin 6439 -> 0 bytes
 core/__pycache__/craftbeerpi.cpython-36.pyc   | Bin 0 -> 6572 bytes
 core/__pycache__/plugin.cpython-36.pyc        | Bin 1826 -> 2136 bytes
 core/__pycache__/websocket.cpython-36.pyc     | Bin 2638 -> 2640 bytes
 core/api/__pycache__/actor.cpython-36.pyc     | Bin 731 -> 0 bytes
 core/api/actor.py                             |   9 +-
 core/api/extension.py                         |  16 +
 core/api/sensor.py                            |   5 +-
 .../actor_controller.cpython-36.pyc           | Bin 2466 -> 2642 bytes
 .../crud_controller.cpython-36.pyc            | Bin 2880 -> 2881 bytes
 .../sensor_controller.cpython-36.pyc          | Bin 1567 -> 1569 bytes
 .../system_controller.cpython-36.pyc          | Bin 1059 -> 1061 bytes
 core/controller/actor_controller.py           |  48 +-
 core/controller/crud_controller.py            |  10 +-
 core/controller/sensor_controller.py          |   6 +-
 core/controller/system_controller.py          |  10 +-
 core/{cbpi.py => craftbeerpi.py}              |  26 +-
 .../database/__pycache__/model.cpython-36.pyc | Bin 4531 -> 653 bytes
 .../__pycache__/orm_framework.cpython-36.pyc  | Bin 0 -> 4104 bytes
 core/database/model.py                        | 151 +---
 core/database/orm_framework.py                | 142 ++++
 core/extension/dummy/__init__.py              |  26 +-
 .../dummy/__pycache__/__init__.cpython-36.pyc | Bin 1898 -> 1881 bytes
 core/extension/dummy/config.yaml              |   1 +
 .../__pycache__/jsondump.cpython-36.pyc       | Bin 855 -> 857 bytes
 core/helper/__pycache__/utils.cpython-36.pyc  | Bin 0 -> 329 bytes
 core/helper/utils.py                          |   8 +
 .../__pycache__/http_api.cpython-36.pyc       | Bin 1518 -> 1519 bytes
 .../__pycache__/http_login.cpython-36.pyc     | Bin 1296 -> 1525 bytes
 core/http_endpoints/http_api.py               |   4 +-
 core/http_endpoints/http_login.py             |  20 +-
 core/mqtt/mqtt.py                             |  10 +-
 core/plugin.py                                |  21 +-
 core/websocket.py                             |   8 +-
 craftbeerpi.db                                | Bin 49152 -> 49152 bytes
 logs/first_logfile2.log                       |  16 +-
 logs/first_logfile2.log.2018-11-01_17-21      |   4 -
 logs/first_logfile2.log.2018-11-01_17-23      |   2 -
 logs/first_logfile2.log.2018-11-01_17-24      |   1 -
 logs/first_logfile2.log.2018-11-01_17-27      |   2 -
 logs/first_logfile2.log.2018-11-01_17-32      |  61 --
 logs/first_logfile2.log.2018-11-01_21-20      |  60 ++
 logs/first_logfile2.log.2018-11-01_21-21      |  60 ++
 logs/first_logfile2.log.2018-11-01_21-22      |  59 ++
 logs/first_logfile2.log.2018-11-01_21-23      |  60 ++
 logs/first_logfile2.log.2018-11-01_21-24      |  60 ++
 run.py                                        |  10 +-
 tests/test_app.py                             |   2 +-
 59 files changed, 1592 insertions(+), 331 deletions(-)
 create mode 100644 .idea/dataSources.local.xml
 create mode 100644 .idea/dataSources.xml
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2.xml
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream.len
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.len
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i
 create mode 100644 .idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i.len
 create mode 100644 config/config.yaml
 delete mode 100644 core/__pycache__/cbpi.cpython-36.pyc
 create mode 100644 core/__pycache__/craftbeerpi.cpython-36.pyc
 delete mode 100644 core/api/__pycache__/actor.cpython-36.pyc
 create mode 100644 core/api/extension.py
 rename core/{cbpi.py => craftbeerpi.py} (93%)
 create mode 100644 core/database/__pycache__/orm_framework.cpython-36.pyc
 create mode 100644 core/extension/dummy/config.yaml
 create mode 100644 core/helper/__pycache__/utils.cpython-36.pyc
 create mode 100644 core/helper/utils.py
 delete mode 100644 logs/first_logfile2.log.2018-11-01_17-21
 delete mode 100644 logs/first_logfile2.log.2018-11-01_17-23
 delete mode 100644 logs/first_logfile2.log.2018-11-01_17-24
 delete mode 100644 logs/first_logfile2.log.2018-11-01_17-27
 delete mode 100644 logs/first_logfile2.log.2018-11-01_17-32
 create mode 100644 logs/first_logfile2.log.2018-11-01_21-20
 create mode 100644 logs/first_logfile2.log.2018-11-01_21-21
 create mode 100644 logs/first_logfile2.log.2018-11-01_21-22
 create mode 100644 logs/first_logfile2.log.2018-11-01_21-23
 create mode 100644 logs/first_logfile2.log.2018-11-01_21-24

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
new file mode 100644
index 0000000..5d2e8dd
--- /dev/null
+++ b/.idea/dataSources.local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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" />
+      <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
+      <secret-storage>master_key</secret-storage>
+      <auth-required>false</auth-required>
+      <introspection-schemas>*:main</introspection-schemas>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..52b9b2d
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="craftbeerpi.db" uuid="5067e7fe-480d-4433-bc40-f2d1c38362a2">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/craftbeerpi.db</jdbc-url>
+      <driver-properties>
+        <property name="enable_load_extension" value="true" />
+      </driver-properties>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2.xml b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2.xml
new file mode 100644
index 0000000..d63ecaa
--- /dev/null
+++ b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataSource name="craftbeerpi.db">
+  <database-model serializer="dbm" rdbms="SQLITE" format-version="4.1">
+    <root id="1"/>
+    <schema id="2" parent="1" name="main">
+      <Current>1</Current>
+      <Visible>1</Visible>
+    </schema>
+    <table id="3" parent="2" name="actor"/>
+    <table id="4" parent="2" name="config"/>
+    <table id="5" parent="2" name="dashboard"/>
+    <table id="6" parent="2" name="dashboard_content"/>
+    <table id="7" parent="2" name="kettle"/>
+    <table id="8" parent="2" name="sensor"/>
+    <table id="9" parent="2" name="sqlite_master"/>
+    <table id="10" parent="2" name="step"/>
+    <table id="11" parent="2" name="tank"/>
+    <table id="12" parent="2" name="translation"/>
+    <column id="13" parent="3" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="14" parent="3" name="name">
+      <Position>1</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="15" parent="3" name="type">
+      <Position>2</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="16" parent="3" name="config">
+      <Position>3</Position>
+      <DataType>VARCHAR(3000)|0</DataType>
+    </column>
+    <key id="17" parent="3">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="18" parent="4" name="name">
+      <DataType>VARCHAR(50)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="19" parent="4" name="value">
+      <Position>1</Position>
+      <DataType>VARCHAR(255)|0</DataType>
+    </column>
+    <column id="20" parent="4" name="type">
+      <Position>2</Position>
+      <DataType>VARCHAR(50)|0</DataType>
+    </column>
+    <column id="21" parent="4" name="description">
+      <Position>3</Position>
+      <DataType>VARCHAR(255)|0</DataType>
+    </column>
+    <column id="22" parent="4" name="options">
+      <Position>4</Position>
+      <DataType>VARCHAR(255)|0</DataType>
+    </column>
+    <index id="23" parent="4" name="sqlite_autoindex_config_1">
+      <ColNames>name</ColNames>
+      <Unique>1</Unique>
+    </index>
+    <key id="24" parent="4">
+      <ColNames>name</ColNames>
+      <Primary>1</Primary>
+      <UnderlyingIndexName>sqlite_autoindex_config_1</UnderlyingIndexName>
+    </key>
+    <column id="25" parent="5" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="26" parent="5" name="name">
+      <Position>1</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <key id="27" parent="5">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="28" parent="6" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="29" parent="6" name="dbid">
+      <Position>1</Position>
+      <DataType>INTEGER(80)|0</DataType>
+    </column>
+    <column id="30" parent="6" name="element_id">
+      <Position>2</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <column id="31" parent="6" name="type">
+      <Position>3</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="32" parent="6" name="x">
+      <Position>4</Position>
+      <DataType>INTEGER(5)|0</DataType>
+    </column>
+    <column id="33" parent="6" name="y">
+      <Position>5</Position>
+      <DataType>INTEGER(5)|0</DataType>
+    </column>
+    <column id="34" parent="6" name="config">
+      <Position>6</Position>
+      <DataType>VARCHAR(3000)|0</DataType>
+    </column>
+    <key id="35" parent="6">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="36" parent="7" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="37" parent="7" name="name">
+      <Position>1</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="38" parent="7" name="sensor">
+      <Position>2</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="39" parent="7" name="heater">
+      <Position>3</Position>
+      <DataType>VARCHAR(10)|0</DataType>
+    </column>
+    <column id="40" parent="7" name="automatic">
+      <Position>4</Position>
+      <DataType>VARCHAR(255)|0</DataType>
+    </column>
+    <column id="41" parent="7" name="logic">
+      <Position>5</Position>
+      <DataType>VARCHAR(50)|0</DataType>
+    </column>
+    <column id="42" parent="7" name="config">
+      <Position>6</Position>
+      <DataType>VARCHAR(1000)|0</DataType>
+    </column>
+    <column id="43" parent="7" name="agitator">
+      <Position>7</Position>
+      <DataType>VARCHAR(10)|0</DataType>
+    </column>
+    <column id="44" parent="7" name="target_temp">
+      <Position>8</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <column id="45" parent="7" name="height">
+      <Position>9</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <column id="46" parent="7" name="diameter">
+      <Position>10</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <key id="47" parent="7">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="48" parent="8" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="49" parent="8" name="name">
+      <Position>1</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="50" parent="8" name="type">
+      <Position>2</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="51" parent="8" name="config">
+      <Position>3</Position>
+      <DataType>VARCHAR(3000)|0</DataType>
+    </column>
+    <key id="52" parent="8">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="53" parent="9" name="type">
+      <DataType>text|0</DataType>
+    </column>
+    <column id="54" parent="9" name="name">
+      <Position>1</Position>
+      <DataType>text|0</DataType>
+    </column>
+    <column id="55" parent="9" name="tbl_name">
+      <Position>2</Position>
+      <DataType>text|0</DataType>
+    </column>
+    <column id="56" parent="9" name="rootpage">
+      <Position>3</Position>
+      <DataType>integer|0</DataType>
+    </column>
+    <column id="57" parent="9" name="sql">
+      <Position>4</Position>
+      <DataType>text|0</DataType>
+    </column>
+    <column id="58" parent="10" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="59" parent="10" name="order">
+      <Position>1</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <column id="60" parent="10" name="name">
+      <Position>2</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="61" parent="10" name="type">
+      <Position>3</Position>
+      <DataType>VARCHAR(100)|0</DataType>
+    </column>
+    <column id="62" parent="10" name="stepstate">
+      <Position>4</Position>
+      <DataType>VARCHAR(255)|0</DataType>
+    </column>
+    <column id="63" parent="10" name="state">
+      <Position>5</Position>
+      <DataType>VARCHAR(1)|0</DataType>
+    </column>
+    <column id="64" parent="10" name="start">
+      <Position>6</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <column id="65" parent="10" name="end">
+      <Position>7</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <column id="66" parent="10" name="config">
+      <Position>8</Position>
+      <DataType>VARCHAR(255)|0</DataType>
+    </column>
+    <column id="67" parent="10" name="kettleid">
+      <Position>9</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <key id="68" parent="10">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="69" parent="11" name="id">
+      <DataType>INTEGER|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="70" parent="11" name="name">
+      <Position>1</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="71" parent="11" name="brewname">
+      <Position>2</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="72" parent="11" name="sensor">
+      <Position>3</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="73" parent="11" name="sensor2">
+      <Position>4</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="74" parent="11" name="sensor3">
+      <Position>5</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+    </column>
+    <column id="75" parent="11" name="heater">
+      <Position>6</Position>
+      <DataType>VARCHAR(10)|0</DataType>
+    </column>
+    <column id="76" parent="11" name="logic">
+      <Position>7</Position>
+      <DataType>VARCHAR(50)|0</DataType>
+    </column>
+    <column id="77" parent="11" name="config">
+      <Position>8</Position>
+      <DataType>VARCHAR(1000)|0</DataType>
+    </column>
+    <column id="78" parent="11" name="cooler">
+      <Position>9</Position>
+      <DataType>VARCHAR(10)|0</DataType>
+    </column>
+    <column id="79" parent="11" name="target_temp">
+      <Position>10</Position>
+      <DataType>INTEGER|0</DataType>
+    </column>
+    <key id="80" parent="11">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="81" parent="12" name="language_code">
+      <DataType>VARCHAR(3)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="82" parent="12" name="key">
+      <Position>1</Position>
+      <DataType>VARCHAR(80)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="83" parent="12" name="text">
+      <Position>2</Position>
+      <DataType>VARCHAR(100)|0</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <index id="84" parent="12" name="sqlite_autoindex_translation_1">
+      <ColNames>language_code
+key</ColNames>
+      <Unique>1</Unique>
+    </index>
+    <key id="85" parent="12">
+      <ColNames>language_code
+key</ColNames>
+      <Primary>1</Primary>
+      <UnderlyingIndexName>sqlite_autoindex_translation_1</UnderlyingIndexName>
+    </key>
+  </database-model>
+</dataSource>
\ No newline at end of file
diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata
new file mode 100644
index 0000000000000000000000000000000000000000..bbf0401c192c9fb399ae206b28d0a76286ca6f2f
GIT binary patch
literal 65536
zcmeIuu?+wq3<I!o2A8sO7Xz;WT@eo;IZM?jlUto5?(~Rtl6Bt9J;}ekN*w_L1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
YAV7cs0RjXF5FkK+009C72z)890ZLX5egFUf

literal 0
HcmV?d00001

diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream
new file mode 100644
index 0000000000000000000000000000000000000000..08e7df176454f3ee5eeda13efa0adaa54828dfd8
GIT binary patch
literal 4096
ocmeIu0Sy2E0K%a6Pi+qe5hx58Fkrxd0RsjM7%*VKfPwdc0T2KH0RR91

literal 0
HcmV?d00001

diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream.len b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.keystream.len
new file mode 100644
index 0000000000000000000000000000000000000000..1b1cb4d44c57c2d7a5122870fa6ac3e62ff7e94e
GIT binary patch
literal 8
KcmZQzfB*mh2mk>9

literal 0
HcmV?d00001

diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.len b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata.len
new file mode 100644
index 0000000000000000000000000000000000000000..1b1cb4d44c57c2d7a5122870fa6ac3e62ff7e94e
GIT binary patch
literal 8
KcmZQzfB*mh2mk>9

literal 0
HcmV?d00001

diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i
new file mode 100644
index 0000000000000000000000000000000000000000..12f3be4dd3b5a2b5146f36630acbf7e99e490797
GIT binary patch
literal 32768
zcmeIufdBvi0Dz$VsTV1P3IhfV7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd
z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA
zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj
GFkoPS00031

literal 0
HcmV?d00001

diff --git a/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i.len b/.idea/dataSources/5067e7fe-480d-4433-bc40-f2d1c38362a2/_metadata_/metadata_i.len
new file mode 100644
index 0000000000000000000000000000000000000000..1b1cb4d44c57c2d7a5122870fa6ac3e62ff7e94e
GIT binary patch
literal 8
KcmZQzfB*mh2mk>9

literal 0
HcmV?d00001

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 964274c..11c41a2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="" />
+    <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/config.yaml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/api/extension.py" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/extension/dummy/config.yaml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/helper/utils.py" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-21" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-23" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-24" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-27" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/first_logfile2.log.2018-11-01_17-32" afterPath="" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/core/cbpi.py" afterPath="$PROJECT_DIR$/core/craftbeerpi.py" />
+      <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/actor.py" afterPath="$PROJECT_DIR$/core/api/actor.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/api/sensor.py" afterPath="$PROJECT_DIR$/core/api/sensor.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/actor_controller.py" afterPath="$PROJECT_DIR$/core/controller/actor_controller.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/crud_controller.py" afterPath="$PROJECT_DIR$/core/controller/crud_controller.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/sensor_controller.py" afterPath="$PROJECT_DIR$/core/controller/sensor_controller.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/controller/system_controller.py" afterPath="$PROJECT_DIR$/core/controller/system_controller.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/dummy/__init__.py" afterPath="$PROJECT_DIR$/core/extension/dummy/__init__.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/http_endpoints/http_api.py" afterPath="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/http_endpoints/http_login.py" afterPath="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/mqtt/mqtt.py" afterPath="$PROJECT_DIR$/core/mqtt/mqtt.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/plugin.py" afterPath="$PROJECT_DIR$/core/plugin.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/websocket.py" afterPath="$PROJECT_DIR$/core/websocket.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/logs/first_logfile2.log" afterPath="$PROJECT_DIR$/logs/first_logfile2.log" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/run.py" afterPath="$PROJECT_DIR$/run.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/test_app.py" afterPath="$PROJECT_DIR$/tests/test_app.py" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -10,28 +40,151 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1541098167062" 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$run.coverage" NAME="run Coverage Results" MODIFIED="1541103448346" 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_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>
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="requirements.txt" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <file leaf-file-name="http_login.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="375">
+              <caret line="25" column="14" lean-forward="false" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/config.yaml">
           <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" />
+              <caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="run.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/run.py">
+      <file leaf-file-name="utils.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/helper/utils.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="7" column="15" lean-forward="true" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="__init__.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/core/extension/dummy/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+              <folding>
+                <element signature="e#0#42#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="actor.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/api/actor.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="7" column="12" lean-forward="false" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+              <folding>
+                <element signature="e#1#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="extension.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/api/extension.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>
-                <element signature="e#0#16#0" expanded="true" />
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="sensor.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/api/sensor.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/extension/dummy/config.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="actor_controller.py" 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="260">
+              <caret line="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
+              <folding>
+                <element signature="e#0#23#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="craftbeerpi.py" 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="141">
+              <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -39,9 +192,87 @@
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>7//</find>
+      <find>7/</find>
+      <find>7</find>
+      <find>/</find>
+      <find>///</find>
+      <find>///7</find>
+      <find>///77</find>
+      <find>///777</find>
+      <find>///7777</find>
+      <find>///7777/</find>
+      <find>///7777//</find>
+      <find>///7777///</find>
+      <find>///7777///7</find>
+      <find>///7777///7|</find>
+      <find>///7777///7||</find>
+      <find>///7777///7|||</find>
+      <find>///7777///7|||6</find>
+      <find>\n\n</find>
+      <find>\n\n</find>
+      <find>cpre</find>
+      <find>cpr</find>
+      <find>cp</find>
+      <find>c</find>
+      <find>co</find>
+      <find>core</find>
+      <find>.core</find>
+      <find>from.cbpi.</find>
+      <find>pr</find>
+      <find>p</find>
+      <find>print</find>
+    </findStrings>
+    <replaceStrings>
+      <replace />
+      <replace>.cbpi</replace>
+      <replace>from core.</replace>
+    </replaceStrings>
+    <dirStrings>
+      <dir>$PROJECT_DIR$</dir>
+      <dir>$PROJECT_DIR$/core</dir>
+    </dirStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/run.py" />
+        <option value="$PROJECT_DIR$/core/cbpi.py" />
+        <option value="$PROJECT_DIR$/core/database/model.py" />
+        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
+        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/crud_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
+        <option value="$PROJECT_DIR$/core/mqtt/mqtt.py" />
+        <option value="$PROJECT_DIR$/core/plugin.py" />
+        <option value="$PROJECT_DIR$/core/websocket.py" />
+        <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
+        <option value="$PROJECT_DIR$/core/helper/utils.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
+        <option value="$PROJECT_DIR$/config/config.yaml" />
+        <option value="$PROJECT_DIR$/core/extension/dummy/config.yaml" />
+        <option value="$PROJECT_DIR$/core/extension/dummy/__init__.py" />
+        <option value="$PROJECT_DIR$/core/api/extension.py" />
+        <option value="$PROJECT_DIR$/core/api/actor.py" />
+        <option value="$PROJECT_DIR$/core/api/cbpiactor.py" />
+        <option value="$PROJECT_DIR$/core/api/sensor.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">
@@ -83,6 +314,128 @@
               <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="plugin.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="craftbeerpi.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="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="dummy" />
+              <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="api" />
+              <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="config" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -92,6 +445,8 @@
     <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)" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -292,27 +647,49 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="55" y="40" width="1767" height="968" extended-state="0" />
+    <editor active="true" />
     <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.24957556" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" 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.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" 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="-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.32925472" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3303671" sideWeight="0.5" order="2" 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.33" 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.33" sideWeight="0.5" order="-1" 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.25" sideWeight="0.5" order="1" 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.32925472" sideWeight="0.5" order="-1" 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.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24957556" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21335597" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="1" 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="1" 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.39933258" sideWeight="0.5" order="3" 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="-1" 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="-1" 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="4" 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="2" side_tool="false" content_ui="combo" />
       <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="0" 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="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" 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="1" 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="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="1" side_tool="false" content_ui="tabs" />
     </layout>
+    <layout-to-restore>
+      <window_info id="TODO" 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="10" 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="Event Log" 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="0" side_tool="true" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" 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.33" 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.33" 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.32925472" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" 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="1" side_tool="false" content_ui="combo" />
+      <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="Database" 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="Find" 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="5" 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="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 id="Debug" 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="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="1" side_tool="false" content_ui="tabs" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="processedProjectFiles" value="true" />
@@ -333,12 +710,266 @@
         </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="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>
+    <entry file="file://$PROJECT_DIR$/core/database/__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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-641">
+          <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>
     <entry file="file://$PROJECT_DIR$/run.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="20" lean-forward="false" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/5067e7fe-480d-4433-bc40-f2d1c38362a2/console.sql">
+      <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>
+      </provider>
+    </entry>
+    <entry file="dbDummy://dbtable:/a57e2371/5067e7fe-480d-4433-bc40-f2d1c38362a2/main.actor">
+      <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>
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/database/model.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+          <folding />
+        </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="105">
+          <caret line="7" column="24" lean-forward="false" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/fermentation_controller.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="27" lean-forward="false" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/helper/__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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/helper/jsondump.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>
-            <element signature="e#0#16#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </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="180">
+          <caret line="12" column="23" lean-forward="false" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="36" column="24" lean-forward="false" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#50#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/plugin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="11" lean-forward="true" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#25#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="105">
+          <caret line="13" column="27" lean-forward="false" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
+          <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="178">
+          <caret line="39" column="25" lean-forward="false" selection-start-line="39" selection-start-column="25" selection-end-line="39" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+            <marker date="1541102185698" expanded="true" signature="757:803" ph="..." />
+            <marker date="1541102185698" expanded="true" signature="944:1121" ph="..." />
+            <marker date="1541102185698" expanded="true" signature="1414:1447" ph="SELECT * FRO... missing_value" />
+            <marker date="1541102185698" expanded="true" signature="1551:1565" ph="SELECT * FRO... missing_value" />
+            <marker date="1541102185698" expanded="true" signature="2139:2168" ph="SELECT * FRO... missing_value" />
+            <marker date="1541102185698" expanded="true" signature="2537:2564" ph="DELETE FROM " />
+            <marker date="1541102185698" expanded="true" signature="2865:2903" ph="INSERT INTO missing_value... " />
+            <marker date="1541102185698" expanded="true" signature="3495:3526" ph="INSERT INTO missing_value... " />
+            <marker date="1541102185698" expanded="true" signature="4306:4335" ph="UPDATE missi... " />
+          </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="16" column="20" lean-forward="false" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/helper/utils.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="15" lean-forward="true" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="25" column="14" lean-forward="false" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="141">
+          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummy/config.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
+          <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="105">
+          <caret line="7" column="12" lean-forward="false" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+          <folding>
+            <element signature="e#1#15#0" expanded="true" />
+          </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="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>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/api/sensor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="12" lean-forward="true" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummy/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/config/config.yaml b/config/config.yaml
new file mode 100644
index 0000000..c1d358e
--- /dev/null
+++ b/config/config.yaml
@@ -0,0 +1 @@
+name: Manuel
\ No newline at end of file
diff --git a/core/__pycache__/cbpi.cpython-36.pyc b/core/__pycache__/cbpi.cpython-36.pyc
deleted file mode 100644
index a5406ffc5ef4afd25cd50843ce66188f21d6da4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6439
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
Oe@!igby<_K)BgvK?-WP?

diff --git a/core/__pycache__/craftbeerpi.cpython-36.pyc b/core/__pycache__/craftbeerpi.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bbb4638ea434125eaf24aef87467f7dbdd2b0cf5
GIT binary patch
literal 6572
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

literal 0
HcmV?d00001

diff --git a/core/__pycache__/plugin.cpython-36.pyc b/core/__pycache__/plugin.cpython-36.pyc
index e2fd4b0c694e8ab89a30e9a829a5c77200d9b0fc..6105439a6918b6a77882e164d09d31ebab641101 100644
GIT binary patch
delta 867
zcmZ8eO-~d-5bd6i-VYW;69Z8pqXu*^VN5U~K|(N`ybuDYaXpY>rh(P@vbs0QhJ*to
zp3PiMOg!n)|Dji7+JnEriw90t&9V@gq~26_zkc<q`qRkI(Z<~HaP!&oUoZZ?Z@fOV
z8Dq;B>K1}zZ633>74z8oz+*dhj-9q0yRkTCZ71d%%&(coTGHL^WRKP!uln2wkh%+5
zL^|}*pJD|=jUybem+Zhg;v5lke!v%5rDXMvn%<$;|JLPhM`;OO=w<Sa7e+b<PwyA9
zc}nmWiV(uo%feJHoSsvD@jObxUT;9ag;M8?zSRY9HO~h3u>PuVnbsDnE4fubUMS;I
zVddM#Q8L*v4%IPkrTm4#5H@u(A3RYKRFH;Q7dg<;D%uNnJ9@9X9YhfB=xr&X=sXCb
z9Ar>bBbzPuO&v}<t<iv->xit@<h?6rQ=J_!zJ6Y@TxcMn{9}C_s|rI4mnY4|1g90{
zX|Xh3{;=mqFX65cSvTF5;0tJ!6VA#Z-GpldR0VDjOcG2W7=gXXNN*CIHvcD@T3+Z*
zo~b_BtscbhySYF;lgm^NZShKKok%0X^0zZ~brhv>kRp|OFOT~-r^_Mt>Fugs<%#T6
z#*DKm-|Dv5sGPyg^4NXYf;zdiqeNj_-`u-%cZfbkFik+u;d2<HoQ4Ae;WCC=Mqrk(
zMy&F_Sa;C<O!-bs2E({rvHBAwf%DmdgG-W7l+^i1v-~dZ&76~}j0&0hVw%U@L@x0G
Iy=ArRe}t#avH$=8

delta 510
zcmZvZO-sWt9LBT0q}y<_6X$%x7Zh0)wu1~0jxiY?yvT4vp&n*!qYm4qCLQR>i+7QH
z0KuC#LGbA3koZk@GU-4jc=-Pa4^RHj6Y^!g<TKm3T=sGE`xHK9ZYl}@pecq<3m{;p
zJYXwc%2OVIt$Jz)SQ^i?{lR5F+-o1aPbn=0axHWM#BA+Zdj-Q9drK{DIDOosP7wL1
z>SBVbQF5gc-3_yKzfWTq2T`NIOnt{RL=uPLAUH?Ff<$L0dh1>nB9R?PQDR17R-z=p
zAw@oN<F2$z@vo5^IEwo?q$9KLxG^S{{-5=CT}Uyp;Wdh5A93igIan&D#cE6CFhKDY
z_C_HqY#$!4C3#6FStlvRwJy4iZP-bgkp=b%cXM15MK8GO`c%A2H_G)@>0g#ukuU|U
z6q%Igf&icBMGm2;7ZDuMj8JG(04Pw&tL)4;(hn_-tg{besaz9!vS18y2hjwe7%D$A
Rtui&eWy+v&A8VxNe*kqnaSi|g

diff --git a/core/__pycache__/websocket.cpython-36.pyc b/core/__pycache__/websocket.cpython-36.pyc
index 561bf6947e59e75665c6234d4a05941f68293d2e..27ad8588a8d706fbcfa28cfdff4995810ecdaa76 100644
GIT binary patch
delta 47
zcmX>nazTX6n3tC;C2}L%Vn*hqg3QTl7-utDP4-}t;Ylt^Oe;xBO)V<OG})ZT^ne`z
DTiFj<

delta 45
zcmca0a!!QJn3tEUUuz@VVn*itqSVQ27-utDO!i=s;Y!TRk1tNlEyzjTT)^~z9RNP(
B4!!^Y

diff --git a/core/api/__pycache__/actor.cpython-36.pyc b/core/api/__pycache__/actor.cpython-36.pyc
deleted file mode 100644
index df979be2e184974e883acbfd43e6ab4a65f9a4f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 731
zcmbtSy-ve05VoD9b<-9QZxIPK0}KoZ6)~_?LWrddmWdM@DSz0h5EUDJ86Jbz@XA{-
zapyo)5KNqO-)EhD-+i%jI39<WNA~8G5b_4O2@h6NNV5-cK@?GR4f)LGM6oLpc?r}v
z!C*CoGzS1FnNvmPOi{(wWbP?X`M|ykR1Y{%eZ_%$Y5+Q+4bGCb)(M493}lo$hctTt
ziart1A;>}tn^^$Ma%KHWmT5$-Z_*-rA-V_W-;d*KlWG%}vRXn}=dDQ=@m=07mbbCY
zYhh&B6lt8)I*nzM#}W-pnn%lp$g8{+BEaE30HHm)+HnpiUz-Wq!$3y6&MKaE_UO#n
zh?qtd8#MJps$HprK2}*>4S<c4qAT7_sH<<+@V7Q~+CN3TI?F~|s)J9}Ec=&iU|QLx
zyIaD;PT19FQ6KLOA3_Kl3Q^W-S>Spk#Qjnh-HztauS0|(0{YzYj}NEuW;A{@{(J@-
aIO9I|xaX>~h&ukQ&GM6O?y2jAR`LPT@P<tQ

diff --git a/core/api/actor.py b/core/api/actor.py
index 1f4e505..12cde68 100644
--- a/core/api/actor.py
+++ b/core/api/actor.py
@@ -1,8 +1,13 @@
 
+import logging
 
-class Actor():
+from core.api.extension import CBPiExtension
+from core.helper.utils import load_config as load
+logger = logging.getLogger(__file__)
 
-    def __init__(self):
+class CBPiActor(CBPiExtension):
+
+    def __init__(self, cbpi):
         self.id = "";
         self.name = ""
 
diff --git a/core/api/extension.py b/core/api/extension.py
new file mode 100644
index 0000000..c67f3e0
--- /dev/null
+++ b/core/api/extension.py
@@ -0,0 +1,16 @@
+import logging
+
+from core.helper.utils import load_config as load
+logger = logging.getLogger(__file__)
+logging.basicConfig(level=logging.INFO)
+
+class CBPiExtension():
+
+    def load_config(self):
+
+
+        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/sensor.py b/core/api/sensor.py
index a9fd077..a804e52 100644
--- a/core/api/sensor.py
+++ b/core/api/sensor.py
@@ -1,4 +1,7 @@
-class Sensor():
+from core.api.extension import CBPiExtension
+
+
+class CBPiSensor(CBPiExtension):
 
     def __init__(self):
         self.id = "";
diff --git a/core/controller/__pycache__/actor_controller.cpython-36.pyc b/core/controller/__pycache__/actor_controller.cpython-36.pyc
index a500f8b509bd64e0fb86efc27a4867214bebd388..ae970a5cd789191b176964835df3bdd8839ed36f 100644
GIT binary patch
delta 1471
zcmZWp&2Jk;6yKShU9Z=6;=~RdK*5Ov(NeWOv<)bw6@`{oG;&Z80xeRl&Ca;qvhkXk
zHGwV2h*aW2kgC0K-~fmV7ybz@C~!a=mm{bA1xQ@ry>UJ)7;E3my!Z5bU%&Bpjo+K?
zi?y12^v)me{#G)KKaH7X!}(?S)TfWz_m}rgfBu%iU0!))@QRohj+ooG{5r3`X?V5A
zUri?L#Qz2ygy9oz_*9sjaLUaCD%b;yv#$xaxc!Lj6W<0~=|47ym$j|LU4X3=<?CUZ
z$lGZ;%IwY{h~wlnj}~kcqyuR}7>^XT6zNzF!~9ED)j9lxIX?j+H8|NP#7M~lig7qQ
zpnz(1ee3r1t*z~&pTVi1+jjucR%wuqRl!p6Vd|NMHImUVl@vXkyF!hUp%NHciMU^s
zq<DWURQiJ<m%!uit<GCYNY%+dqf6CL2K{tL2sw%_<=@h^&7v|8ka=$}kuk4<zrt1-
z)FIi@X?+)Fd@`r=FyfzdlKcyH^@Z%R>$Z;9<|vTCZtFPwX6wu_?ZS*EKV;8L3L0^!
zCD{}5=vRp85jl^WRj_bp6cy&qSoy3UNuf)Xi)f^>0h?^1!1AU7J6e<mFp6F>M89bj
zr6$Q1W~!LlyPi`xy<YxTY2}`U5ZFkKE}z6x3&k0>K4Adqf~df!91sq5$s%)!)`p-s
zU5JTG-OE?V`Hcg@=Q(f(*o6eOfL)F#@hZ2$GS%1koMu+}bAuT^va6o|NFFxU00mQx
zhEdw<$z{0aSLy2dv<G+vj+J}8Fb<RghqF|l1KVo;3;k#EES#hUVhAHWxEEHGid`ia
z^f?T|fdF!SG!i<5d>+)ErGpe~80-q)f(ThApVIyx1o2qFu+G74CggdzqDtXx4B8}3
zGDn*E>umL+8{kXnoa-b*NZ3k~Q4}6=@ah6g74{I{3oh&(67Wv`jkRvFk6C_bwXb2G
zI;(;L!Zb6TjC>j_h5g=MAn&V!L^EU46T1xND|y>qt7Vnb9QytImc2f~=VoRb|Ko4O
zXNY>t>1lu&edfNg{r1hfH*d7IyI2Hf=$X^GV3*_uiZc>vf|^Oc{|e|85^iFYvWDj7
zs|h^jB#wo=01g0l3Cvzat{}uJiZ%-P3xvV#CS1f4$1Abn5}PHlO!*>+qIOJ%5FYgj
zAux-Rap|rg8<vqhY7T@$8LgJ9b%!k44$)NUdJFmY&fyhwoGC(=qbqS<f;`5txJD4A
Q4x&n`v`#?c&#X881%81-BLDyZ

delta 1262
zcmZ8hOK;Oa5cc{JJ8qh!Nq83&Q7YsjTJbyt#6yJ(5&@M1QaBhBZ(D<7n_Y)O8k9pT
z!KFgTS5Aln{0V*l;>3;R$f^GTae<jl8c^1n(eBQ-GvCh6_*?CLb?)5swEbq`#{<_?
zl%L9fBM0+qAUt_Hw^pPUEp8dDl5gKroT;}T2evW7^4HmQ{q#fM+)=6ZIPY8Uh@bcE
zZGDThY&zvn`Gp<g@AHe&Qu52&23QJX%W!|jugDYABV5(5ZR@S#D@9jYB?!4c`=D>u
zY=|i=*A1c|bzPyiA0<I{);K;ZbWX!nHVt-%h`j5zLyvRU{iOW9l`W{Vwim=M_c}>P
zvlaD3juikolWiJ*22(I&(y@+iSs7y(K}tJZ7zqoaR2Xfqy-tOmzDTHy!DcX!!77N=
zBd<dN6MDU#Py=5W&%Cfp9m1;Ux`t{Wsso^ofN<PW)EcRgBFTQ`=JM9kX5hbEilc0Y
z%x9m~r9rc2d+ju4OJ`trmjHgZ4a(7kL7&kmWyfFz{NfGDcE6&9h#XJ7w9A1P=0RwW
zy1b>Y28=Ql*VYQ<NgQ$Ns6*l=qffh(r$dTkp2A#DPo;?)M-Ck0Iw&ODJ8&HdEyoZ%
z4nxWo*Hekg4x2|RZ4F^C5RS5(HO-Tn*4MJ<=G?_Yup^TuRB)@y`0@&D9xQ?c6CBtg
zY%gZt%@dhzog64o0V<^A?w$KLS8m>@-)Ta2(Wj&Rb0u<5Haxb*CtL|Fj?P{HEXOP;
zYOgwZ53rBv<26v0LHI#XedVz-=&M_VD18+cq)#p@K0!jgExSG%D|9X3DP?u99?^}u
ze7ZW8%NWr}Jmz)kSSyW@9p{sFSw(vQS;T-C45Ks{O}i{=)SGei?_kqWTLl-qbLu86
zPPnY#y~NDI71&W!@_omT%u29#31s-brcHVWC-cHamvSt^P6N~_XP>qC2K*?X@;b3k
zL)k{Mt{MIgWSudr8g>d5)`5IUb_QpqjO43V$2|5LMD_+YAa<hc4NKFtf?X)uq@r7-
slCwzJkS*E-3b*rL&X0WzZ-pL&br~piLwW_9g%?2;NI@+V(D-S80oIWhz5oCK

diff --git a/core/controller/__pycache__/crud_controller.cpython-36.pyc b/core/controller/__pycache__/crud_controller.cpython-36.pyc
index 050551b157d173a0beb30a5fc237a8c5c7c801ef..825563c0a5560ed04a336f63a172785df4e4969c 100644
GIT binary patch
delta 768
zcmaJ;O-sW-5Y1PUG^JX_me|-rL4-gdpyEmE(Svv>=s`p!ZMQZwt!0zo*`FZ$E9%Xo
zCqM8Xco5Qm;>n%Kp@~Wld7GJ?_vX#)Yvrw??G%fKaXx#}n&KXn1VNYzG{=wcW9KX&
zG;l`lI3j+ZdSTEVI5%E6h&oP}y8W<22%UJlY#=@tfPy@#vZfRibcpi+278nmrPO_r
zoJqqBsV%o_P-II~;YY0W+|W%Fk*l&7nN-si;wW?7Ql<wb(1xzD>W#Vkkgh^T1}Ji{
zWfZ5&kXQjo`C^;7_C~4!GBO1ZxnZW@kAkUwT|u8%=j}sx+$E>BM$6DBaTQJYScFy}
zgDaX_Qxa=H|KA^6nCwKmSnT0L8#WeA!DZqyyVuK%=<nt_s3zWe#3$Ta6*4+I%v&||
z0z<|kNiPB_EOwWt+sHH$=C$kl^Py}pnJ2Yipw*dWTwdVl8pH(v17HaN9}wSc4MN-;
pF3W@v&7waG!aBfQAOBSLX&i0+PV&N7-yhxfBA>KG9tHdpegLPSf=&Pc

delta 744
zcmZuu%TB^j5bX<YX+=;23X~8Rnl#aktW12ajET`;+z}-W+y$XLatn#y;r$BY%B2ev
zT=)mBZukTLz?FBVi{26!J?+e#Idf+ESzeS$GoN>Uj>Q`}&<n!qjv1Y6EURhS?=`>F
zJtydoJ5ey4gp~L7cNZ#HW`rLak(-0q0dV=Nv0GH?adK%4Qcd?}s}3aJV3vFds~1dz
zSP^>(UzoJ2GW21pd~VH8H$WSvifn%rQ8r~;kTC()CHN+avmzum0Tf?+FVpgr0oaiu
zykrKuDq&SY3W^fH%a(XE`|$(=g)MzdgHe}0_=J^VVr*|Vk^51$4H>*u;?asdLi_(l
zp-|zsq@8lRYKDK2L5hHa>b^Jja;KVD>d}x&OEt8_FLJdyc7U$Xsd@-tc>FoXj&K<#
z?(76%nC#-~@fylNXlroKd2HjxHpFWHE<gbQe<1#|5`=g#yio;0G>iT`2pa&2K7JAY
Y?Og4zCM8kWC&O`X7Sc0aMv;89Ki%<q&;S4c

diff --git a/core/controller/__pycache__/sensor_controller.cpython-36.pyc b/core/controller/__pycache__/sensor_controller.cpython-36.pyc
index 89bb99ecd386e52025897869b1b3421257f9bbcc..31131c97ed99dc7034643c45d331aad83c5fff6e 100644
GIT binary patch
delta 196
zcmbQwvyg|)n3tF9Z^TBnY$m>>g3MbSMXBkT#U-glQIqSLrm@K~Ffjb`oh;2P!;@T;
zm{yXMnp#wlX)@W7xmy|}r^!?#1*C2<Wu_E?_z*&F@^j{8vZ5dfmdw1gd`(8MDijr~
oSQ1s_K{^yc1T%<G2N4KUz%04R`mBnKf|CPT=Lld({bf}G05=>ffB*mh

delta 194
zcmZ3;GoOden3tDpj@CxDY$m?^qSRX)MXBkT#U-glw<gy!O=FW|U|{&=Jz1JrhAS~M
zKfX9Iw;(5VvNLnHG)P91sYn_~-D1j2DFX2!g#6@}%*$lOKoTsOd1?8Yj9^tLD%P+h
mswjYTD1iuO5TOAg5T<}x@{<i&6&Zyl2eZx*z>xaSsssSEvnu)k

diff --git a/core/controller/__pycache__/system_controller.cpython-36.pyc b/core/controller/__pycache__/system_controller.cpython-36.pyc
index 4e5aa82da1c9fb13520057f6c0b9244ce3cc59c8..4c66f3c946a3134bc75b207191f8a0969304cbb5 100644
GIT binary patch
delta 48
zcmZ3?v6O?|n3tDJA@cS{c1K3$q=L-J-i-Q;zLTpNWq6W{64OeOQd5fxGEFuwWNcyr
E07OR)Y5)KL

delta 46
zcmZ3=v6zG1n3tDpkMgaJ?2e4g`9-Ody&3fxy(d>Q%5WuS=EoN&<`(3nZeGmT!~_61
C1r9d=

diff --git a/core/controller/actor_controller.py b/core/controller/actor_controller.py
index ed9127a..0cb1279 100644
--- a/core/controller/actor_controller.py
+++ b/core/controller/actor_controller.py
@@ -8,12 +8,29 @@ from core.http_endpoints.http_api import HttpAPI
 from core.plugin import PluginAPI
 
 
-class ActorController(HttpAPI, CRUDController, PluginAPI):
+class ActorHttp(HttpAPI):
 
+    @request_mapping(path="/hallo", auth_required=False)
+    async def hello_world(self, request) -> web.Response:
+        print("HALLO")
+        return web.Response(status=200, text="OK")
+
+    @request_mapping(path="/{id}/on", auth_required=False)
+    async def http_on(self, request) -> web.Response:
+        """
+
+        :param request: 
+        :return: 
+        """
+        self.cbpi.bus.fire(event="actor/1/on", id=1, power=99)
+        return web.Response(status=204)
+
+
+
+class ActorController(ActorHttp, CRUDController, PluginAPI):
 
     model = ActorModel
 
-
     def __init__(self, cbpi):
         super(ActorController, self).__init__(cbpi)
         self.cbpi = cbpi
@@ -23,7 +40,6 @@ class ActorController(HttpAPI, CRUDController, PluginAPI):
         self.types = {}
         self.actors = {}
 
-
     async def init(self):
 
         await super(ActorController, self).init()
@@ -38,33 +54,27 @@ class ActorController(HttpAPI, CRUDController, PluginAPI):
         print("CACHE", self.cache)
         print("ACTORS", self.actors)
 
-    @request_mapping(path="/{id}/on",auth_required=False)
-    async def http_on(self, request) -> web.Response:
-        self.cbpi.bus.fire(event="actor/1/on", id=1, power=99)
-        return web.Response(status=204)
+
 
     @on_event(topic="actor/+/on")
-    def on(self, id, power=100) -> None:
+    def on(self, id, power=100, **kwargs) -> None:
         print("ON-------------", id, power)
         if id in self.actors:
             i = self.actors[id]
             i.on(power)
 
-    @on_event(topic="actor/+/on")
-    def on2(self, id, **kwargs) -> None:
+    @on_event(topic="actor/+/off")
+    def off(self, id, **kwargs) -> None:
+        """
+
+        :param id: 
+        :param kwargs: 
+        """
         print("POWERED ON", id, kwargs)
 
 
 
-    def register(self, name, clazz) -> None:
-        '''
-        Register a new actor type
-        :param name: actor name
-        :param clazz: actor class
-        :return: None
-        '''
-        self._parse_props(clazz)
-        self.types[name] = clazz
+
 
 
 
diff --git a/core/controller/crud_controller.py b/core/controller/crud_controller.py
index 7079969..92c3588 100644
--- a/core/controller/crud_controller.py
+++ b/core/controller/crud_controller.py
@@ -4,8 +4,8 @@ class CRUDController(object):
     cache = {}
     caching = True
 
-    def __init__(self, core):
-        self.cbpi = core
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
         self.cache = {}
 
     async def init(self):
@@ -54,7 +54,7 @@ class CRUDController(object):
         except:
             pass
         m = await self.model.update(**data)
-        #self.core.push_ws("UPDATE_%s" % self.key, m)
+        #self.cbpi.push_ws("UPDATE_%s" % self.key, m)
 
         await self._post_update_callback(m)
         if self.caching is True:
@@ -77,10 +77,10 @@ class CRUDController(object):
         except Exception as e:
             pass
 
-        #self.core.push("DELETE_%s" % self.key, id)
+        #self.cbpi.push("DELETE_%s" % self.key, id)
 
     async def delete_all(self):
         self.model.delete_all()
         if self.caching is True:
             self.cache = {}
-        #self.core.push_ws("DELETE_ALL_%s" % self.key, None)
\ No newline at end of file
+        #self.cbpi.push_ws("DELETE_ALL_%s" % self.key, None)
\ No newline at end of file
diff --git a/core/controller/sensor_controller.py b/core/controller/sensor_controller.py
index 32f6b41..fe5710b 100644
--- a/core/controller/sensor_controller.py
+++ b/core/controller/sensor_controller.py
@@ -13,9 +13,9 @@ class SensorController(CRUDController, HttpAPI):
 
     model = SensorModel
 
-    def __init__(self, core):
-        self.core = core
-        self.core.register(self, "/sensor")
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.register(self, "/sensor")
         self.service = self
 
         self.sensors = {"S1": "S1", "S2": "S2"}
diff --git a/core/controller/system_controller.py b/core/controller/system_controller.py
index d4d7031..43a5c1f 100644
--- a/core/controller/system_controller.py
+++ b/core/controller/system_controller.py
@@ -7,14 +7,14 @@ from core.api.decorator import request_mapping
 class SystemController():
     name = "Manuel"
 
-    def __init__(self, core):
-        self.core = core
-        self.service = core.actor
-        self.core.register(self, "/system")
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.service = cbpi.actor
+        self.cbpi.register(self, "/system")
 
     @request_mapping("/jobs", method="GET", name="get_jobs", auth_required=True)
     def get_all_jobs(self, request):
-        scheduler = get_scheduler_from_app(self.core.app)
+        scheduler = get_scheduler_from_app(self.cbpi.app)
         print(scheduler.active_count, scheduler.pending_limit)
         for j in scheduler:
             print(j)
diff --git a/core/cbpi.py b/core/craftbeerpi.py
similarity index 93%
rename from core/cbpi.py
rename to core/craftbeerpi.py
index a1a2130..442d691 100644
--- a/core/cbpi.py
+++ b/core/craftbeerpi.py
@@ -12,13 +12,11 @@ from aiohttp_swagger import setup_swagger
 from aiojobs.aiohttp import setup, get_scheduler_from_app
 
 from core.controller.actor_controller import ActorController
+from core.controller.sensor_controller import SensorController
 from core.controller.system_controller import SystemController
 from core.database.model import DBModel
 from core.eventbus import EventBus
-
-
 from core.http_endpoints.http_login import Login
-from core.controller.sensor_controller import SensorController
 from core.websocket import WebSocket
 
 logger = logging.getLogger(__file__)
@@ -26,7 +24,6 @@ logging.basicConfig(level=logging.INFO)
 
 
 class CraftBeerPi():
-
     def __init__(self):
 
         logger.info("Init CraftBeerPI")
@@ -44,7 +41,7 @@ class CraftBeerPi():
 
     def register_events(self, obj):
 
-        for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f),"eventbus")]:
+        for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f), "eventbus")]:
             print(method.__getattribute__("topic"), method)
 
             doc = None
@@ -53,14 +50,13 @@ class CraftBeerPi():
                 doc["topic"] = method.__getattribute__("topic")
             self.bus.register(method.__getattribute__("topic"), method, doc)
 
-
     def register_background_task(self, obj):
         for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f), "background_task")]:
             name = method.__getattribute__("name")
             interval = method.__getattribute__("interval")
 
             async def job_loop(app, name, interval, method):
-                logger.info("Start Background Task %s Interval %s Method %s" % (name,interval, method))
+                logger.info("Start Background Task %s Interval %s Method %s" % (name, interval, method))
                 while True:
                     logger.info("Execute Task %s - interval(%s second(s)" % (name, interval))
                     await asyncio.sleep(interval)
@@ -70,16 +66,13 @@ class CraftBeerPi():
                 scheduler = get_scheduler_from_app(self.app)
                 await scheduler.spawn(job_loop(self.app, name, interval, method))
 
-
             self.app.on_startup.append(spawn_job)
 
-
-
     def register_ws(self, obj):
         if self.ws is None:
             return
 
-        for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f),"ws")]:
+        for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f), "ws")]:
             self.ws.add_callback(method, method.__getattribute__("key"))
 
     def register(self, obj, subapp=None):
@@ -88,13 +81,13 @@ class CraftBeerPi():
         self.register_ws(obj)
         self.register_background_task(obj)
 
-
     def register_http_endpoints(self, obj, subapp=None):
         routes = []
         for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f), "route")]:
-
             http_method = method.__getattribute__("method")
             path = method.__getattribute__("path")
+            class_name = method.__self__.__class__.__name__
+            logger.info("Register Endpoint : %s.%s %s %s%s " % (class_name, method.__name__, http_method, subapp, path))
 
             def add_post():
                 routes.append(web.post(method.__getattribute__("path"), method))
@@ -107,6 +100,7 @@ class CraftBeerPi():
 
             def add_put():
                 routes.append(web.put(path, method))
+
             switcher = {
                 "POST": add_post,
                 "GET": add_get,
@@ -131,7 +125,6 @@ class CraftBeerPi():
             my_module = importlib.import_module(extension)
             my_module.setup(self)
 
-
     def start(self):
 
         async def init_database(app):
@@ -140,13 +133,8 @@ class CraftBeerPi():
         async def init_controller(app):
             await self.actor.init()
 
-
-
-
         self.app.on_startup.append(init_database)
         self.app.on_startup.append(self._load_extensions)
         self.app.on_startup.append(init_controller)
         setup_swagger(self.app)
         web.run_app(self.app)
-
-
diff --git a/core/database/__pycache__/model.cpython-36.pyc b/core/database/__pycache__/model.cpython-36.pyc
index b12c5d4b0419a60b84c0a76dbfd203acdd0d7656..267ca374cb952adf043c0ed23e90fabb5d900556 100644
GIT binary patch
literal 653
zcmbtSy-ve05VjL14e9UB!rG-lf)PPMNKAC8kWd(`G<MoReu|w4b%vMW8F&*jGVuyb
z+@&paV8fC>-Q9Qoe0TOyx9h*%zTb^0As=LCF|fz5^&x;Df@UPAA*JMs2us*6MA(u(
z+o1(M6At)J<J-cWl40u;PLUxst;>t+QphYuf4gij#<2APfFvOmB(wxY-MJmwf`tq$
z8al!OE!X(xaaF2D$FL&GrD4@-DUBPKMUu{q6Cpo=OpkNqIX6D%c`51)?GERUb(H-w
zNh&j;f$4ExMKeg+aDC42by@Ij!YffdsIh^sv*1QcrGq>wYMCV}t#rHy=4rL4XF;r@
zq?$>omg#X2mr4dA0_jN00P2w0Xt`3@H_lbN03P)zqfP8z!)Z@tp*Pb}sID9Yyu!G;
z;b1b#!{8o*kI+WwAaoIanp|6bj12%Vceh%MO@=Jo#|}r^4o9WRd7@zOPo;WL7M{jl
X8;QTPjd!wsoKyIAL}S$*d*FTpKhTte

literal 4531
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

diff --git a/core/database/__pycache__/orm_framework.cpython-36.pyc b/core/database/__pycache__/orm_framework.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a303d09e93c69753f9e6824038753ffec62335e2
GIT binary patch
literal 4104
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
b;SYuG{jsG}XDNG^>r`jz<mm{<FwOq~99(^L

literal 0
HcmV?d00001

diff --git a/core/database/model.py b/core/database/model.py
index f1c8894..87e9e74 100644
--- a/core/database/model.py
+++ b/core/database/model.py
@@ -1,156 +1,13 @@
-import json
-
-import aiosqlite
-
-TEST_DB = "./craftbeerpi.db"
-
-
-
-class DBModel(object):
-
-    __priamry_key__ = "id"
-    __as_array__ = False
-    __order_by__ = None
-    __json_fields__ = []
-
-    def __init__(self, args):
-
-        self.__setattr__(self.__priamry_key__, args[self.__priamry_key__])
-        for f in self.__fields__:
-            if f in self.__json_fields__:
-                if args[f] is not None:
-
-                    if isinstance(args[f], dict) or isinstance(args[f], list):
-                        self.__setattr__(f, args[f])
-                    else:
-                        self.__setattr__(f, json.loads(args[f]))
-                else:
-                    self.__setattr__(f, None)
-            else:
-                print(f,args[f])
-                self.__setattr__(f, args[f])
-
-    @classmethod
-    async def test_connection(self):
-
-        print("CREATE DATABSE")
-        async with aiosqlite.connect(TEST_DB) as db:
-            print("DB OK")
-            assert isinstance(db, aiosqlite.Connection)
-            qry = open('./core/sql/create_table_user.sql', 'r').read()
-            cursor = await db.executescript(qry)
-
-
-
-
-
-    @classmethod
-    async def get_all(cls):
-        print("GET ALL")
-        if cls.__as_array__ is True:
-            result = []
-        else:
-            result = {}
-        async with aiosqlite.connect(TEST_DB) as db:
-
-            if cls.__order_by__ is not None:
-                sql = "SELECT * FROM %s ORDER BY %s.'%s'" % (cls.__table_name__,cls.__table_name__,cls.__order_by__)
-            else:
-                sql = "SELECT * FROM %s" % cls.__table_name__
-
-            db.row_factory = aiosqlite.Row
-            async with db.execute(sql) as cursor:
-                    async for row in cursor:
-                        if cls.__as_array__ is True:
-                            result.append(cls(row))
-                        else:
-                            result[row[0]] = cls(row)
-                    await cursor.close()
-
-        return result
-
-    @classmethod
-    async def get_one(cls, id):
-        async with aiosqlite.connect(TEST_DB) as db:
-            db.row_factory = aiosqlite.Row
-            async with db.execute("SELECT * FROM %s WHERE %s = ?" % (cls.__table_name__, cls.__priamry_key__), (id,)) as cursor:
-                row = await cursor.fetchone()
-                if row is not None:
-                    return cls(row)
-                else:
-                    return None
-
-    @classmethod
-    async def delete(cls, id):
-        async with aiosqlite.connect(TEST_DB) as db:
-            await db.execute("DELETE FROM %s WHERE %s = ? " % (cls.__table_name__, cls.__priamry_key__), (id,))
-            await db.commit()
-
-    @classmethod
-    async def insert(cls, **kwargs):
-
-        async with aiosqlite.connect(TEST_DB) as db:
-            if cls.__priamry_key__ is not None and cls.__priamry_key__ in kwargs:
-                query = "INSERT INTO %s (%s, %s) VALUES (?, %s)" % (
-                    cls.__table_name__,
-                    cls.__priamry_key__,
-                    ', '.join("'%s'" % str(x) for x in cls.__fields__),
-                    ', '.join(['?'] * len(cls.__fields__)))
-                data = ()
-                data = data + (kwargs.get(cls.__priamry_key__),)
-                for f in cls.__fields__:
-                    if f in cls.__json_fields__:
-                        data = data + (json.dumps(kwargs.get(f)),)
-                    else:
-                        data = data + (kwargs.get(f),)
-            else:
-
-                query = 'INSERT INTO %s (%s) VALUES (%s)' % (
-                    cls.__table_name__,
-                    ', '.join("'%s'" % str(x) for x in cls.__fields__),
-                    ', '.join(['?'] * len(cls.__fields__)))
-
-                data = ()
-                for f in cls.__fields__:
-                    if f in cls.__json_fields__:
-                        data = data + (json.dumps(kwargs.get(f)),)
-                    else:
-                        data = data + (kwargs.get(f),)
-
-            print(query, data)
-            cursor = await db.execute(query, data)
-            await db.commit()
-
-            i = cursor.lastrowid
-            kwargs["id"] = i
-
-            return cls(kwargs)
-
-    @classmethod
-    async def update(cls, **kwargs):
-        async with aiosqlite.connect(TEST_DB) as db:
-            query = 'UPDATE %s SET %s WHERE %s = ?' % (cls.__table_name__, ', '.join("'%s' = ?" % str(x) for x in cls.__fields__), cls.__priamry_key__)
-
-            data = ()
-            for f in cls.__fields__:
-                if f in cls.__json_fields__:
-                    data = data + (json.dumps(kwargs.get(f)),)
-                else:
-                    data = data + (kwargs.get(f),)
-
-            data = data + (kwargs.get(cls.__priamry_key__),)
-            cursor = await db.execute(query, data)
-            await db.commit()
-            return cls(kwargs)
+from core.database.orm_framework import DBModel
 
 
 class ActorModel(DBModel):
-    __fields__ = ["name","type","config"]
+    __fields__ = ["name", "type", "config"]
     __table_name__ = "actor"
     __json_fields__ = ["config"]
 
 
 class SensorModel(DBModel):
-    __fields__ = ["name","type", "config"]
+    __fields__ = ["name", "type", "config"]
     __table_name__ = "sensor"
-    __json_fields__ = ["config"]
\ No newline at end of file
+    __json_fields__ = ["config"]
diff --git a/core/database/orm_framework.py b/core/database/orm_framework.py
index e69de29..11500eb 100644
--- a/core/database/orm_framework.py
+++ b/core/database/orm_framework.py
@@ -0,0 +1,142 @@
+import json
+
+import aiosqlite
+
+# Thats the name of the database file
+TEST_DB = "./craftbeerpi.db"
+
+
+
+class DBModel(object):
+    __priamry_key__ = "id"
+    __as_array__ = False
+    __order_by__ = None
+    __json_fields__ = []
+
+    def __init__(self, args):
+
+        self.__setattr__(self.__priamry_key__, args[self.__priamry_key__])
+        for f in self.__fields__:
+            if f in self.__json_fields__:
+                if args[f] is not None:
+
+                    if isinstance(args[f], dict) or isinstance(args[f], list):
+                        self.__setattr__(f, args[f])
+                    else:
+                        self.__setattr__(f, json.loads(args[f]))
+                else:
+                    self.__setattr__(f, None)
+            else:
+
+                self.__setattr__(f, args[f])
+
+    @classmethod
+    async def test_connection(self):
+
+        print("CREATE DATABSE")
+        async with aiosqlite.connect(TEST_DB) as db:
+
+            assert isinstance(db, aiosqlite.Connection)
+            qry = open('./core/sql/create_table_user.sql', 'r').read()
+            cursor = await db.executescript(qry)
+
+    @classmethod
+    async def get_all(cls):
+        print("GET ALL")
+        if cls.__as_array__ is True:
+            result = []
+        else:
+            result = {}
+        async with aiosqlite.connect(TEST_DB) as db:
+
+            if cls.__order_by__ is not None:
+                sql = "SELECT * FROM %s ORDER BY %s.'%s'" % (cls.__table_name__, cls.__table_name__, cls.__order_by__)
+            else:
+                sql = "SELECT * FROM %s" % cls.__table_name__
+
+            db.row_factory = aiosqlite.Row
+            async with db.execute(sql) as cursor:
+                async for row in cursor:
+                    if cls.__as_array__ is True:
+                        result.append(cls(row))
+                    else:
+                        result[row[0]] = cls(row)
+                await cursor.close()
+
+        return result
+
+    @classmethod
+    async def get_one(cls, id):
+        async with aiosqlite.connect(TEST_DB) as db:
+            db.row_factory = aiosqlite.Row
+            async with db.execute("SELECT * FROM %s WHERE %s = ?" % (cls.__table_name__, cls.__priamry_key__), (id,)) as cursor:
+                row = await cursor.fetchone()
+                if row is not None:
+                    return cls(row)
+                else:
+                    return None
+
+    @classmethod
+    async def delete(cls, id):
+        async with aiosqlite.connect(TEST_DB) as db:
+            await db.execute("DELETE FROM %s WHERE %s = ? " % (cls.__table_name__, cls.__priamry_key__), (id,))
+            await db.commit()
+
+    @classmethod
+    async def insert(cls, **kwargs):
+
+        async with aiosqlite.connect(TEST_DB) as db:
+            if cls.__priamry_key__ is not None and cls.__priamry_key__ in kwargs:
+                query = "INSERT INTO %s (%s, %s) VALUES (?, %s)" % (
+                    cls.__table_name__,
+                    cls.__priamry_key__,
+                    ', '.join("'%s'" % str(x) for x in cls.__fields__),
+                    ', '.join(['?'] * len(cls.__fields__)))
+                data = ()
+                data = data + (kwargs.get(cls.__priamry_key__),)
+                for f in cls.__fields__:
+                    if f in cls.__json_fields__:
+                        data = data + (json.dumps(kwargs.get(f)),)
+                    else:
+                        data = data + (kwargs.get(f),)
+            else:
+
+                query = 'INSERT INTO %s (%s) VALUES (%s)' % (
+                    cls.__table_name__,
+                    ', '.join("'%s'" % str(x) for x in cls.__fields__),
+                    ', '.join(['?'] * len(cls.__fields__)))
+
+                data = ()
+                for f in cls.__fields__:
+                    if f in cls.__json_fields__:
+                        data = data + (json.dumps(kwargs.get(f)),)
+                    else:
+                        data = data + (kwargs.get(f),)
+
+            print(query, data)
+            cursor = await db.execute(query, data)
+            await db.commit()
+
+            i = cursor.lastrowid
+            kwargs["id"] = i
+
+            return cls(kwargs)
+
+    @classmethod
+    async def update(cls, **kwargs):
+        async with aiosqlite.connect(TEST_DB) as db:
+            query = 'UPDATE %s SET %s WHERE %s = ?' % (cls.__table_name__, ', '.join("'%s' = ?" % str(x) for x in cls.__fields__), cls.__priamry_key__)
+
+            data = ()
+            for f in cls.__fields__:
+                if f in cls.__json_fields__:
+                    data = data + (json.dumps(kwargs.get(f)),)
+                else:
+                    data = data + (kwargs.get(f),)
+
+            data = data + (kwargs.get(cls.__priamry_key__),)
+            cursor = await db.execute(query, data)
+            await db.commit()
+            return cls(kwargs)
+
+
diff --git a/core/extension/dummy/__init__.py b/core/extension/dummy/__init__.py
index e13f96d..242015b 100644
--- a/core/extension/dummy/__init__.py
+++ b/core/extension/dummy/__init__.py
@@ -1,14 +1,13 @@
 from core.database.model import ActorModel
 from core.api.decorator import action, background_task
 from core.api.property import Property
-print("##################")
 
-from core.api.actor import Actor
+
+from core.api.actor import CBPiActor
 import logging
 
 
-class MyActor(Actor):
-
+class MyActor(CBPiActor):
 
     name = Property.Number(label="Test")
     name1 = Property.Text(label="Test")
@@ -20,7 +19,7 @@ class MyActor(Actor):
 
     @action(key="name", parameters={})
     def myAction(self):
-        print("HALLO")
+        pass
 
     def state(self):
         super().state()
@@ -31,13 +30,18 @@ class MyActor(Actor):
     def on(self, power=100):
         super().on(power)
 
-    def __init__(self):
-        pass
+    def __init__(self,cbpi=None):
 
-    def __init__(self, core=None):
-        self.logger = logging.getLogger(__name__)
-        self.logger.info("WOOHOO MY ACTOR")
-        self.core = None
+        if cbpi is None:
+            return
+
+        self.cfg = self.load_config()
+        print(self.cfg)
+        self.logger = logging.getLogger(__file__)
+        logging.basicConfig(level=logging.INFO)
+
+        self.logger.info("########WOOHOO MY ACTOR")
+        self.cbpi = cbpi
 
 
 def setup(cbpi):
diff --git a/core/extension/dummy/__pycache__/__init__.cpython-36.pyc b/core/extension/dummy/__pycache__/__init__.cpython-36.pyc
index 0a078627a49790d854e45168f68b921bdc7ed690..3cf58a6f0e688c69be16d20566d9a7bd5dfa7048 100644
GIT binary patch
delta 817
zcmZuuO>fgc5ZzhZ@kiX?mh^)bL8=N`3qeKT)KjZUluB(<(F$5~uu`ubIk<MTF$Jnh
zJtR^&fJC%^hrhrT33G%KH%?rc4Fw^=uIBCA**CMJnQxU(m4$m_W7cE;^HW_V<O}(0
z;hn6a_4bDgx9W^AHPMd@&j5m4OH9w)Agsjn0bzP*^cBxy1~Ui5D>H4ExYqFX%J5?i
z-VA?q=cmp|1Z<p53{1~q)2zxS2jGpL6P0)qD4r4T;3aGdlU}t0-iq?WFy!6%zF4L%
zIO2e=idemC9=%!%@;FPY;wwGYrm?sg;VT=9Q^*P>iy{|z1vwrwc<@US90^wt=EMhO
z>ujW@S?bb}w9vZQi;({tF^3V?(0UYsz=^djKhOA`ENuiMAG+nKpsl0zb`Va1k!J?C
z8QCSLq(l0MKI9ZR^Z`hIrgYR?>jSz=xzf?m3<huU2_>bD$*7c_%6Cg9ag~M(g_eZJ
zVRACPaIu~=n-81K+V(+hZGEr#$SoJ;Bx^B0$kHfo7fKMd`52Z{=t<UY$7#DT+hM+i
z{4C^!;rmgXguY*t<THB8hpk>5tpAEuHyaO{g&L<(R;a;YH@;{UU&M^RditlaGFP0&
zx$n=*7RX)`YJf^Du)u~2wc*71-8m_pm0IlfEDBv{xR+&yv~`5lh=I00If;HQCp#J$
zms8+N;=6WzX*AK%Fm-fVXuSyp1HZsct7=uX6<eu@mD1kr|JJJY!u)x6Sw@ZqNO>K(
iYm4`#9Wky?m1}tAGCQw}x_;BKk=oz@<^@A>Zu|se6Rj2i

delta 821
zcmZWm%Wl&^6rCAA;-pUEr0FA2wJ8Bbrl=7D38_M;Q5NYUO%N0TW?|BdlR6}JG<JDZ
zMIbd&S1h7o#ZMqu@+X)jyZ!{+ajB@<vF@GYJLk^KIrB4fk}2Owr&FD~(TlGVLch_u
zAp_oo2wqOhYa332%10O@il{QwMoB9fV|AFaQVm2CRGT2GImsi*nxRRWnjlN3>SJWi
zOh0ZE4)WzoWBQ|nKTm&+&4pvs!!$?plcZ(PSz3VJ99^XIfUuQ2Ml!PUuv3u_@!LwH
z`Xq2zP#tx=eP`HXZWwg;s(m-y+uyBrT;C2lqw&z;X=36WzehGJ1Vq$@5FJv8C_dEz
zJCatUY}K00wuxDqe<Ec($G?%+$|4Yp{Fc<HEC7lmzt;ms1~5!Tm{?XML!>K^miQN`
zS&zBI_e>H~BW3KraoFXKCFodz2*kw@K1gl9t93)4t@|DykOv=Z+x6Vgwy&Mz7-yWb
z#a1`&28x(P#1chMhz2+$NB9ug(jgj11NlrcR1}J0;Ro5L?e<o?UD|$Ls?~Sek4!a6
z4E=uJedYC|WZwy!@Z+#Zvu&?4a%?+N#WGZ6*X#L_-1V9BPb#|($DVrf-<V~n-GB&G
zNC@ljffrW+o494pvQ<F*z4B~s9sm=T$6hjF4_oFZ%F4~y>e%H36jKmE0g@((&2&<b
z3$iZhQbyAFZFOfI?zB60FWe(i0w>%buZiZ^GQ!pYn`!=CeMsQh|ENVnJO>kJ#A__e
WOG<&?Po(qW&2?<RaT<Y;jMcx+kfc)p

diff --git a/core/extension/dummy/config.yaml b/core/extension/dummy/config.yaml
new file mode 100644
index 0000000..a356541
--- /dev/null
+++ b/core/extension/dummy/config.yaml
@@ -0,0 +1 @@
+name: Maneul
\ No newline at end of file
diff --git a/core/helper/__pycache__/jsondump.cpython-36.pyc b/core/helper/__pycache__/jsondump.cpython-36.pyc
index d5e9f2cc949f75115ed6d33052f8aaa67ff75562..573acf481da0e2772b153e65a9fbb12e2bf32224 100644
GIT binary patch
delta 40
wcmcc4c9V_Wn3tF9WyI}`><btf9VV|}l;KG(N=z$BN=+>)$TZn}j<J&w02Y)D`~Uy|

delta 38
ucmcb~cAbsgn3tF9RMYj1><btf?Iy2al;KLu%#SZl%q_@C-F$(ulMw*?7!6<m

diff --git a/core/helper/__pycache__/utils.cpython-36.pyc b/core/helper/__pycache__/utils.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..35907cbe61dc3354f24c3f9bd7aa57c615ae476d
GIT binary patch
literal 329
zcmYjNJx{|h5WRB@3WZ7x{Ru2t@BkwqB=$;xP*FM{H+GsJ=R>wLRBETPv+yVQOJ-zZ
zVrSyq0ddlMezJAX_wH;w9(~V0=5GM-N%$*9>YCstL<$rd$U!lcyg-f$?;+z~^a9fY
z<3W`W4hS~{cS7W0O?_MTdb~l8&uoob+^`wB-NGF_!kUo_o94{=ED5~pbsP9fHYRY>
zNkw;iWh)yUunb&DFW<qY<ok0e9-OvLG_oDEDQ)dtQHf>kt6?DuD@(u7+V=IiC_1Y}
zrA@D`7<_HqX}=1G(fz6D+Ol5qIP5+V;1N!k9g)hIjahbj_u)T^0YiGxbZRjADn@s4
HQ)%)GRBTJ3

literal 0
HcmV?d00001

diff --git a/core/helper/utils.py b/core/helper/utils.py
new file mode 100644
index 0000000..eb0bc36
--- /dev/null
+++ b/core/helper/utils.py
@@ -0,0 +1,8 @@
+import yaml
+
+
+def load_config(fname):
+    with open(fname, 'rt') as f:
+        data = yaml.load(f)
+    # TODO: add config validation
+    return data
\ No newline at end of file
diff --git a/core/http_endpoints/__pycache__/http_api.cpython-36.pyc b/core/http_endpoints/__pycache__/http_api.cpython-36.pyc
index 477fda1c9d49f570d373d90ea796bacd493ef67f..58170c2bb89f685d47ec5fc5bcadcddeaef1eb2e 100644
GIT binary patch
delta 302
zcmaFI{hpiCn3tE!H1c*d??%oojC@5r3=9k_8H)IT)Gv?8XBcI8l8X}4N|I7jiwZJL
zCVyi5$PJPMD=6Zh{En$rP87)3WV^+jnOAa)D>tzuIU_zZFD<`_38YSJ@<e7yQ3()J
z3a$@q0{`Uw%&vSwK*3vVxv3=?`6)%hlZ9Bq13>CRG#QITfHaVT7+)j<(k%`mAm)Nt
xvLJ#LNN6$_@q*ac?b*o^sVM-GW&shBAVLmAD1r!tZ=kNSW^ES05Io1K005L=IxYYJ

delta 321
zcmaFQ{f?W{n3tF9wdJj7{*9bl82N9pB<B~Uu4E|UXJBCX<u>^=qYPJKW`2BeVs1fB
z>g3OiAGtv?VCf=($?ut3eZ+u#O}1OinRz9*xN;Lqk~88n^V0H*m_X{pfy6EL^wg60
z{Jhj6R*+KWB3_V;B#4j(5y%D}V0Psb1`6I{%S|oG$WJK}nJml_9sp7oqRCh!3Z#J)
z#L6OBkZuVO0k^A24#XvF&n}ioO+k=S77!r?BIH4Y5{N)J2+R_gY{S|tfFXFERRI9T
CIzWT~

diff --git a/core/http_endpoints/__pycache__/http_login.cpython-36.pyc b/core/http_endpoints/__pycache__/http_login.cpython-36.pyc
index ec92fbac6ca957335ccf586768ab3ae0a344b2e4..afd03a844c0dcd178dca390ed1f692976b442383 100644
GIT binary patch
literal 1525
zcmZ8h&5j#I5bnPj&w9Pi?(!p&Mf{%TfPH`i2ZSO4n-Gu_5px-kMq_u|9%ug2-NR-r
z=YsdTZ@>%i9K1zyLY#O7PE_?|ofRW>b#+yDb=6m2&!<O6{p+9q{OK=2$lv7F$3edj
z!#n~ZiKGQdaApN9S;8plyx^rsgx5t8lwlHjJt%r*lth#~ATpG_D<XS4mK;d>l*G|L
z5RXh^>iC74!6dTQu3)~S)$>*vo0eJA<kb>Phee&qbY54Bd^yKsH(v<KeHi9z5Q-#J
zl7vYr*%e8+5|T?H1HAfL$VeVsksVC}u=gS9LpkvFBRTZ;P~L&Gj$QD5z09jQgNXQH
z{eTJi3Whlcv87v*k}X-2HE26ZiDi~su?{5N!PRGg#~Ijn^d+;Q6kE1KlzbY$F*w_k
z1nZwTI&xuG)aJ08N0(VyY{HNI=b|Pv=Azaz8Jf0HI=xxP%!$@0o%B09>T%@6eAeVH
z(rTF-tF#UvTgQ#nuGeICRpc`#o`B+lM(34vOwMBNgi*ypAHv>*&lk(ziGBn0e;<v1
zgs5g*W>t$Da%<+R@iMoob~c{tY++|g=_dbdJg>DHudHoSRmrA?$fjEs2;``_bWxh-
zRc_OC0Fg}}1fd}v(0i;;H$#v2=w{2NH->X{Ym*QhFgyO>o9Q$bPGAvER9UH9SSq`!
zr8`2>q{x_DE4gnPHV+&32MqHO2#d{vmV66zeMqonYcA<pNCqwA*GNb)aqRJTo1nFe
zPd-OJ&T4rX2O8tJa8c`}vKj-s=m%w*x-yW4s^+y+G1I5$=)Iz@N3aubq8<2)m88Gq
z>H-Z02}Rg3-JEpA-|}xltUs@yRga%e&-W$a5p1Y0=?auBU6UQ@3Ie9lEn6e?$&PuA
zp@z(RZGXwP9C*v0h5E(oJ!skTyW|<uFObE+Z@y!Dpu%-e@^vHy02LrmHe4U<$ggk{
zfEG?%gzUqn=mW?~pMltesNaQE+=tfHK*M8LIF2x$;7$)Lu(ed>4A_d$>i1B*kNb`u
zPNz@KYdy=QR8=fI!ukVrg-xcj(r6^o|Do=C@I2CY!ENwP!iMY~(5+A3=BM<OZI1V-
z=at_&iF-&=tRhWaKTXS8wgu{gG=1J?Md#6P;f>e{{UM4N1-_PB0{g4+zl7NtR3a8d
z?*!f!_w^7gu9xLCzL<_rgIB8*$=tzmijQiPHTg&?P%~R=e{XW)9V=D9|6tVGyfFTm
c`{=i_@JV^@MPGEad`U4MOe$gnI>5pI10*(i;Q#;t

literal 1296
zcmZux&5qne5bhuUWp-xREa4{{5aMPeG6ya>AQXhiZp3IdBFn`bTAu0NT|48Sbhoq0
z$dRHrM|cBXfal;X`ig|aD{!K!ogFq39(B2@y8OBNtIzY*Y&OxKx}X2zg#1ZvTo987
zu*?@=B$0GWDw<J>KHIX2XPlB_BDoCS5E%?C3uO3&q|x6{Pg3gmm0H6s$UA$v!QA!r
z4zeN{l_X=5O7@0iTm@w~Vh%KmWGExZ#xe%v#D&Y|qNq3QEfU@XSl_`i_rdhEBqc39
zSWikmK#ThvGzz%@a|kQr-&jvXC<#KZT=4kx$=NPiZ1EM2AAf(gi!o?A>ykD%=Bm*$
zo13mxT3p8|b3td6&L(3X{WNksZ(A2>cvNY3E0<Du-%UKYcwVS0cQ9g)0h4QlGHQG7
zf=#2<??m5*1O0Qd_z57*qRQ(IHg#dm=5ldS*voFc$csjpylS^<fzK>1t!;&>W!n_B
zHDl=Cc&~lo5+RDZutG%078*kDz;8ES;)(BFZ@<GXj_MDr{~U}3ZhJb=M<9U{LWyN1
zm$VEd8>r;JQs6OIId=NPF6`|2m-lh_>qfpvLyb5tI&buavKq(ck{^|6o7yNBse02$
zl`{PvZp2zW>y)wn{G&O7yq<wMfMsyvgdNh|?XmG2JnnnPnh=)n{TFah1p^s7f5|MB
za1J;D?HQ<rNis0+ar6cTs@dmX@}8rXo<{oBe>Irt`Camq=~osc+tZ#8Y|l(o#xf`q
z83HpAGGn9i)<9l^)PbdVwL3WZcDX$LY<YV8Xyp==O`TUt$Iz<217=U5{s5wM;)1p@
z)`hKx(K?Pa&au`Ln`l+3YOS=VR)2&WAA@nTle4qO4;#HMq*Qepc!u>|+=|*<=atb3
z7NgW|P(6k45SBsW37yk~enO{oLO<k3^oZ>a_rw>q*Y66xP0$w}K?pYyqH1KfMSm*9
zvo7C`JNkWq8(W^?zk<L~7g|X_T#c{2(TZ=%j~=Iq%d0kFNjMKR#;Y`RF?<B5`%zWX
bw~;`2|0ZAff2c0`dhGHWiqMERrBn7V!lyN<

diff --git a/core/http_endpoints/http_api.py b/core/http_endpoints/http_api.py
index e91a3c1..84e5f40 100644
--- a/core/http_endpoints/http_api.py
+++ b/core/http_endpoints/http_api.py
@@ -7,10 +7,10 @@ from core.helper.jsondump import json_dumps
 
 class HttpAPI():
 
-    def __init__(self, core):
+    def __init__(self,cbpi):
         self.logger = logging.getLogger(__name__)
         self.logger.info("WOOHOO MY ACTOR")
-        self.cbpi = core
+        self.cbpi =cbpi
 
     @request_mapping(path="/",  auth_required=False)
     async def http_get_all(self, request):
diff --git a/core/http_endpoints/http_login.py b/core/http_endpoints/http_login.py
index 8b3d48b..557add5 100644
--- a/core/http_endpoints/http_login.py
+++ b/core/http_endpoints/http_login.py
@@ -1,21 +1,31 @@
+import pathlib
+
 from aiohttp import web
 from aiohttp_auth import auth
 
+from core.api.decorator import request_mapping
+from core.helper.utils import load_config
+
+
 class Login():
 
-    def __init__(self, core):
-        core.app.router.add_route('POST', '/login', self.login_view)
-        core.app.router.add_route('GET', '/logout', self.logout_view)
+    def __init__(self,cbpi):
+        self.cbpi = cbpi
+        self.cbpi.register(self)
+        cfg = load_config(str(pathlib.Path('.') / 'config' / 'config.yaml'))
+
+        print("######", cfg)
         self.db = {'user': 'password', 'super_user': 'super_password'}
 
-    @auth.auth_required
+    @request_mapping(path="/logout", name="Logout", method="GET", auth_required=True)
     async def logout_view(self, request):
         await auth.forget(request)
         return web.Response(body='OK'.encode('utf-8'))
 
+    @request_mapping(path="/login",name="Login", method="POST", auth_required=False)
     async def login_view(self, request):
         params = await request.post()
-        print("HALLO LOGIN")
+
         print(params.get('username', None), params.get('password', None))
         user = params.get('username', None)
         if (user in self.db and
diff --git a/core/mqtt/mqtt.py b/core/mqtt/mqtt.py
index 7c7c47b..7b8b717 100644
--- a/core/mqtt/mqtt.py
+++ b/core/mqtt/mqtt.py
@@ -8,7 +8,7 @@ from core.mqtt_matcher import MQTTMatcher
 
 
 class MQTT():
-    def __init__(self, core):
+    def __init__(self,cbpi):
 
         self.config = {
             'listeners': {
@@ -30,16 +30,16 @@ class MQTT():
             },
             'auth': {
                 'allow-anonymous': True,
-                'password-file': '/Users/manuelfritsch/github/aio_sample/core/user.txt'
+                'password-file': '/Users/manuelfritsch/github/aio_sample.cbpi/user.txt'
             }
         }
 
-        self.core = core
+        self.cbpi = cbpi
         self.broker = Broker(self.config, plugin_namespace="hbmqtt.broker.plugins")
         self.client = MQTTClient()
         self.matcher = MQTTMatcher()
         self.mqtt_methods = {"test": self.ok_msg, "$SYS/broker/#": self.sysmsg}
-        self.core.app.on_startup.append(self.start_broker)
+        self.cbpi.app.on_startup.append(self.start_broker)
         self.count = 0
 
     def sysmsg(self, msg):
@@ -52,7 +52,7 @@ class MQTT():
 
     def publish(self, topic, message):
         print("PUSH NOW", topic)
-        self.core.app.loop.create_task(self.client.publish(topic, str.encode(message), QOS_0))
+        self.cbpi.app.loop.create_task(self.client.publish(topic, str.encode(message), QOS_0))
 
     def register_callback(self, func: Callable, topic) -> None:
 
diff --git a/core/plugin.py b/core/plugin.py
index cfdab18..4789dc3 100644
--- a/core/plugin.py
+++ b/core/plugin.py
@@ -4,7 +4,15 @@ from core.api.property import Property
 
 
 class PluginAPI():
-
+    def register(self, name, clazz) -> None:
+        '''
+        Register a new actor type
+        :param name: actor name
+        :param clazz: actor class
+        :return: None
+        '''
+        self._parse_props(clazz)
+        self.types[name] = clazz
 
     def _parse_props(self, cls):
 
@@ -12,7 +20,6 @@ class PluginAPI():
 
         result = {"name": name, "class": cls, "properties": [], "actions": []}
 
-
         tmpObj = cls()
         members = [attr for attr in dir(tmpObj) if not callable(getattr(tmpObj, attr)) and not attr.startswith("__")]
         for m in members:
@@ -39,8 +46,8 @@ class PluginAPI():
                 result["properties"].append({"name": m, "label": t.label, "type": "kettle", "configurable": t.configurable, "description": t.description})
 
         for method_name, method in cls.__dict__.items():
-                if hasattr(method, "action"):
-                    key = method.__getattribute__("key")
-                    parameters = method.__getattribute__("parameters")
-                    result["actions"].append({"method": method_name, "label": key, "parameters": parameters})
-        pprint(result, width=200)
\ No newline at end of file
+            if hasattr(method, "action"):
+                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 0157d37..ec74d63 100644
--- a/core/websocket.py
+++ b/core/websocket.py
@@ -11,12 +11,12 @@ from typing import Iterable, Callable
 
 class WebSocket:
 
-    def __init__(self, core) -> None:
-        self.core = core
+    def __init__(self, cbpi) -> None:
+        self.cbpi = cbpi
         self._callbacks = defaultdict(set)
         self._clients = weakref.WeakSet()
         self.logger = logging.getLogger(__name__)
-        self.core.app.add_routes([web.get('/ws', self.websocket_handler)])
+        self.cbpi.app.add_routes([web.get('/ws', self.websocket_handler)])
 
     def add_callback(self, func: Callable, event: str) -> None:
         self._callbacks[event].add(func)
@@ -51,7 +51,7 @@ class WebSocket:
 
 
 
-                        self.core.bus.fire(msg_obj["topic"], id=1, power=22)
+                        self.cbpi.bus.fire(msg_obj["topic"], id=1, power=22)
                         #await self.fire(msg_obj["key"], ws, msg)
 
                         #await ws.send_str(msg.data)
diff --git a/craftbeerpi.db b/craftbeerpi.db
index eb7b074f63b9f313a5bde99cecc79ad270c39bc3..4ee5d9a05b1e876a0a337bdce18b3338c5c6655c 100644
GIT binary patch
delta 62
zcmZo@U~Xt&o*>Q0HBrWym5V`-)p29W0(~|{{x=N#Z#D}GJmMD-Vq|3yl@<(1EiUn`
SbWASEFRHFxBw(<pAOHXdzY*R5

delta 35
rcmZo@U~Xt&o*>Q0IZ?)$m6Jh_S72kx0{z7-0t%a11pde`DhL1osJ99P

diff --git a/logs/first_logfile2.log b/logs/first_logfile2.log
index cb67ea3..c4032f1 100644
--- a/logs/first_logfile2.log
+++ b/logs/first_logfile2.log
@@ -1 +1,15 @@
-2018-11-01 19:49:28,690,1,WOOHO
+2018-11-01 21:25:19,670,1,WOOHO
+2018-11-01 21:25:20,673,1,WOOHO
+2018-11-01 21:25:21,677,1,WOOHO
+2018-11-01 21:25:22,682,1,WOOHO
+2018-11-01 21:25:23,686,1,WOOHO
+2018-11-01 21:25:24,690,1,WOOHO
+2018-11-01 21:25:25,693,1,WOOHO
+2018-11-01 21:25:26,698,1,WOOHO
+2018-11-01 21:25:27,702,1,WOOHO
+2018-11-01 21:25:28,707,1,WOOHO
+2018-11-01 21:25:29,710,1,WOOHO
+2018-11-01 21:25:30,713,1,WOOHO
+2018-11-01 21:25:31,715,1,WOOHO
+2018-11-01 21:25:32,719,1,WOOHO
+2018-11-01 21:25:33,723,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_17-21 b/logs/first_logfile2.log.2018-11-01_17-21
deleted file mode 100644
index 78e4ad5..0000000
--- a/logs/first_logfile2.log.2018-11-01_17-21
+++ /dev/null
@@ -1,4 +0,0 @@
-2018-11-01 17:20:45,660,1,WOOHO
-2018-11-01 17:20:46,666,1,WOOHO
-2018-11-01 17:21:25,509,1,WOOHO
-2018-11-01 17:21:26,512,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_17-23 b/logs/first_logfile2.log.2018-11-01_17-23
deleted file mode 100644
index bb81557..0000000
--- a/logs/first_logfile2.log.2018-11-01_17-23
+++ /dev/null
@@ -1,2 +0,0 @@
-2018-11-01 17:23:12,685,1,WOOHO
-2018-11-01 17:23:13,691,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_17-24 b/logs/first_logfile2.log.2018-11-01_17-24
deleted file mode 100644
index d02b320..0000000
--- a/logs/first_logfile2.log.2018-11-01_17-24
+++ /dev/null
@@ -1 +0,0 @@
-2018-11-01 17:24:28,706,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_17-27 b/logs/first_logfile2.log.2018-11-01_17-27
deleted file mode 100644
index ea071cf..0000000
--- a/logs/first_logfile2.log.2018-11-01_17-27
+++ /dev/null
@@ -1,2 +0,0 @@
-2018-11-01 17:27:21,293,1,WOOHO
-2018-11-01 17:27:22,302,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_17-32 b/logs/first_logfile2.log.2018-11-01_17-32
deleted file mode 100644
index a10c009..0000000
--- a/logs/first_logfile2.log.2018-11-01_17-32
+++ /dev/null
@@ -1,61 +0,0 @@
-2018-11-01 17:31:36,985,1,WOOHO
-2018-11-01 17:31:37,991,1,WOOHO
-2018-11-01 17:31:38,993,1,WOOHO
-2018-11-01 17:31:39,994,1,WOOHO
-2018-11-01 17:31:40,996,1,WOOHO
-2018-11-01 17:31:42,000,1,WOOHO
-2018-11-01 17:31:43,001,1,WOOHO
-2018-11-01 17:31:44,005,1,WOOHO
-2018-11-01 17:31:45,007,1,WOOHO
-2018-11-01 17:31:46,013,1,WOOHO
-2018-11-01 17:31:47,014,1,WOOHO
-2018-11-01 17:31:48,020,1,WOOHO
-2018-11-01 17:31:49,024,1,WOOHO
-2018-11-01 17:31:50,028,1,WOOHO
-2018-11-01 17:31:51,032,1,WOOHO
-2018-11-01 17:31:52,040,1,WOOHO
-2018-11-01 17:31:53,045,1,WOOHO
-2018-11-01 17:31:54,050,1,WOOHO
-2018-11-01 17:31:55,054,1,WOOHO
-2018-11-01 17:31:56,057,1,WOOHO
-2018-11-01 17:31:57,060,1,WOOHO
-2018-11-01 17:31:58,061,1,WOOHO
-2018-11-01 17:31:59,066,1,WOOHO
-2018-11-01 17:32:00,070,1,WOOHO
-2018-11-01 17:32:01,075,1,WOOHO
-2018-11-01 17:32:02,079,1,WOOHO
-2018-11-01 17:32:03,083,1,WOOHO
-2018-11-01 17:32:04,087,1,WOOHO
-2018-11-01 17:32:05,089,1,WOOHO
-2018-11-01 17:32:06,094,1,WOOHO
-2018-11-01 17:32:07,098,1,WOOHO
-2018-11-01 17:32:08,101,1,WOOHO
-2018-11-01 17:32:09,104,1,WOOHO
-2018-11-01 17:32:10,106,1,WOOHO
-2018-11-01 17:32:11,108,1,WOOHO
-2018-11-01 17:32:12,112,1,WOOHO
-2018-11-01 17:32:13,115,1,WOOHO
-2018-11-01 17:32:14,116,1,WOOHO
-2018-11-01 17:32:15,119,1,WOOHO
-2018-11-01 17:32:16,121,1,WOOHO
-2018-11-01 17:32:17,122,1,WOOHO
-2018-11-01 17:32:18,127,1,WOOHO
-2018-11-01 17:32:19,130,1,WOOHO
-2018-11-01 17:32:20,135,1,WOOHO
-2018-11-01 17:32:21,136,1,WOOHO
-2018-11-01 17:32:22,142,1,WOOHO
-2018-11-01 17:32:23,145,1,WOOHO
-2018-11-01 17:32:24,148,1,WOOHO
-2018-11-01 17:32:25,153,1,WOOHO
-2018-11-01 17:32:26,159,1,WOOHO
-2018-11-01 17:32:27,162,1,WOOHO
-2018-11-01 17:32:28,166,1,WOOHO
-2018-11-01 17:32:29,169,1,WOOHO
-2018-11-01 17:32:32,214,1,WOOHO
-2018-11-01 17:32:33,215,1,WOOHO
-2018-11-01 17:32:34,220,1,WOOHO
-2018-11-01 17:32:35,224,1,WOOHO
-2018-11-01 17:32:36,229,1,WOOHO
-2018-11-01 17:32:37,235,1,WOOHO
-2018-11-01 17:32:38,238,1,WOOHO
-2018-11-01 17:32:39,242,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_21-20 b/logs/first_logfile2.log.2018-11-01_21-20
new file mode 100644
index 0000000..cd16989
--- /dev/null
+++ b/logs/first_logfile2.log.2018-11-01_21-20
@@ -0,0 +1,60 @@
+2018-11-01 21:20:19,492,1,WOOHO
+2018-11-01 21:20:20,498,1,WOOHO
+2018-11-01 21:20:21,501,1,WOOHO
+2018-11-01 21:20:22,505,1,WOOHO
+2018-11-01 21:20:23,507,1,WOOHO
+2018-11-01 21:20:24,511,1,WOOHO
+2018-11-01 21:20:25,512,1,WOOHO
+2018-11-01 21:20:26,514,1,WOOHO
+2018-11-01 21:20:27,516,1,WOOHO
+2018-11-01 21:20:28,521,1,WOOHO
+2018-11-01 21:20:29,526,1,WOOHO
+2018-11-01 21:20:30,530,1,WOOHO
+2018-11-01 21:20:31,533,1,WOOHO
+2018-11-01 21:20:32,534,1,WOOHO
+2018-11-01 21:20:33,539,1,WOOHO
+2018-11-01 21:20:34,542,1,WOOHO
+2018-11-01 21:20:35,547,1,WOOHO
+2018-11-01 21:20:36,548,1,WOOHO
+2018-11-01 21:20:37,553,1,WOOHO
+2018-11-01 21:20:38,556,1,WOOHO
+2018-11-01 21:20:39,563,1,WOOHO
+2018-11-01 21:20:40,568,1,WOOHO
+2018-11-01 21:20:41,572,1,WOOHO
+2018-11-01 21:20:42,574,1,WOOHO
+2018-11-01 21:20:43,576,1,WOOHO
+2018-11-01 21:20:44,581,1,WOOHO
+2018-11-01 21:20:45,585,1,WOOHO
+2018-11-01 21:20:46,588,1,WOOHO
+2018-11-01 21:20:47,593,1,WOOHO
+2018-11-01 21:20:48,599,1,WOOHO
+2018-11-01 21:20:49,602,1,WOOHO
+2018-11-01 21:20:50,603,1,WOOHO
+2018-11-01 21:20:51,604,1,WOOHO
+2018-11-01 21:20:52,608,1,WOOHO
+2018-11-01 21:20:53,612,1,WOOHO
+2018-11-01 21:20:54,616,1,WOOHO
+2018-11-01 21:20:55,621,1,WOOHO
+2018-11-01 21:20:56,625,1,WOOHO
+2018-11-01 21:20:57,626,1,WOOHO
+2018-11-01 21:20:58,631,1,WOOHO
+2018-11-01 21:20:59,635,1,WOOHO
+2018-11-01 21:21:00,637,1,WOOHO
+2018-11-01 21:21:01,639,1,WOOHO
+2018-11-01 21:21:02,643,1,WOOHO
+2018-11-01 21:21:03,648,1,WOOHO
+2018-11-01 21:21:04,653,1,WOOHO
+2018-11-01 21:21:05,657,1,WOOHO
+2018-11-01 21:21:06,662,1,WOOHO
+2018-11-01 21:21:07,666,1,WOOHO
+2018-11-01 21:21:08,671,1,WOOHO
+2018-11-01 21:21:09,676,1,WOOHO
+2018-11-01 21:21:10,682,1,WOOHO
+2018-11-01 21:21:11,684,1,WOOHO
+2018-11-01 21:21:12,685,1,WOOHO
+2018-11-01 21:21:13,690,1,WOOHO
+2018-11-01 21:21:14,695,1,WOOHO
+2018-11-01 21:21:15,700,1,WOOHO
+2018-11-01 21:21:16,702,1,WOOHO
+2018-11-01 21:21:17,707,1,WOOHO
+2018-11-01 21:21:18,712,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_21-21 b/logs/first_logfile2.log.2018-11-01_21-21
new file mode 100644
index 0000000..9c9657f
--- /dev/null
+++ b/logs/first_logfile2.log.2018-11-01_21-21
@@ -0,0 +1,60 @@
+2018-11-01 21:21:19,716,1,WOOHO
+2018-11-01 21:21:20,721,1,WOOHO
+2018-11-01 21:21:21,726,1,WOOHO
+2018-11-01 21:21:22,731,1,WOOHO
+2018-11-01 21:21:23,735,1,WOOHO
+2018-11-01 21:21:24,740,1,WOOHO
+2018-11-01 21:21:25,744,1,WOOHO
+2018-11-01 21:21:26,749,1,WOOHO
+2018-11-01 21:21:27,752,1,WOOHO
+2018-11-01 21:21:28,757,1,WOOHO
+2018-11-01 21:21:29,760,1,WOOHO
+2018-11-01 21:21:30,763,1,WOOHO
+2018-11-01 21:21:31,768,1,WOOHO
+2018-11-01 21:21:32,769,1,WOOHO
+2018-11-01 21:21:33,771,1,WOOHO
+2018-11-01 21:21:34,777,1,WOOHO
+2018-11-01 21:21:35,779,1,WOOHO
+2018-11-01 21:21:36,783,1,WOOHO
+2018-11-01 21:21:37,786,1,WOOHO
+2018-11-01 21:21:38,790,1,WOOHO
+2018-11-01 21:21:39,794,1,WOOHO
+2018-11-01 21:21:40,799,1,WOOHO
+2018-11-01 21:21:41,803,1,WOOHO
+2018-11-01 21:21:42,808,1,WOOHO
+2018-11-01 21:21:43,809,1,WOOHO
+2018-11-01 21:21:44,812,1,WOOHO
+2018-11-01 21:21:45,814,1,WOOHO
+2018-11-01 21:21:46,818,1,WOOHO
+2018-11-01 21:21:47,822,1,WOOHO
+2018-11-01 21:21:48,825,1,WOOHO
+2018-11-01 21:21:49,831,1,WOOHO
+2018-11-01 21:21:50,836,1,WOOHO
+2018-11-01 21:21:51,838,1,WOOHO
+2018-11-01 21:21:52,843,1,WOOHO
+2018-11-01 21:21:53,847,1,WOOHO
+2018-11-01 21:21:54,851,1,WOOHO
+2018-11-01 21:21:55,855,1,WOOHO
+2018-11-01 21:21:56,861,1,WOOHO
+2018-11-01 21:21:57,864,1,WOOHO
+2018-11-01 21:21:58,867,1,WOOHO
+2018-11-01 21:21:59,871,1,WOOHO
+2018-11-01 21:22:00,876,1,WOOHO
+2018-11-01 21:22:01,881,1,WOOHO
+2018-11-01 21:22:02,887,1,WOOHO
+2018-11-01 21:22:03,891,1,WOOHO
+2018-11-01 21:22:04,895,1,WOOHO
+2018-11-01 21:22:05,899,1,WOOHO
+2018-11-01 21:22:06,900,1,WOOHO
+2018-11-01 21:22:07,904,1,WOOHO
+2018-11-01 21:22:08,909,1,WOOHO
+2018-11-01 21:22:09,915,1,WOOHO
+2018-11-01 21:22:10,916,1,WOOHO
+2018-11-01 21:22:11,922,1,WOOHO
+2018-11-01 21:22:12,924,1,WOOHO
+2018-11-01 21:22:13,927,1,WOOHO
+2018-11-01 21:22:14,930,1,WOOHO
+2018-11-01 21:22:15,934,1,WOOHO
+2018-11-01 21:22:16,936,1,WOOHO
+2018-11-01 21:22:17,940,1,WOOHO
+2018-11-01 21:22:18,943,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_21-22 b/logs/first_logfile2.log.2018-11-01_21-22
new file mode 100644
index 0000000..410c63d
--- /dev/null
+++ b/logs/first_logfile2.log.2018-11-01_21-22
@@ -0,0 +1,59 @@
+2018-11-01 21:22:19,948,1,WOOHO
+2018-11-01 21:22:20,954,1,WOOHO
+2018-11-01 21:22:21,960,1,WOOHO
+2018-11-01 21:22:22,964,1,WOOHO
+2018-11-01 21:22:23,967,1,WOOHO
+2018-11-01 21:22:24,971,1,WOOHO
+2018-11-01 21:22:25,977,1,WOOHO
+2018-11-01 21:22:26,981,1,WOOHO
+2018-11-01 21:22:27,986,1,WOOHO
+2018-11-01 21:22:28,990,1,WOOHO
+2018-11-01 21:22:29,995,1,WOOHO
+2018-11-01 21:22:31,000,1,WOOHO
+2018-11-01 21:22:32,004,1,WOOHO
+2018-11-01 21:22:33,010,1,WOOHO
+2018-11-01 21:22:34,014,1,WOOHO
+2018-11-01 21:22:35,020,1,WOOHO
+2018-11-01 21:22:36,024,1,WOOHO
+2018-11-01 21:22:37,028,1,WOOHO
+2018-11-01 21:22:38,033,1,WOOHO
+2018-11-01 21:22:39,036,1,WOOHO
+2018-11-01 21:22:40,041,1,WOOHO
+2018-11-01 21:22:41,045,1,WOOHO
+2018-11-01 21:22:42,049,1,WOOHO
+2018-11-01 21:22:43,053,1,WOOHO
+2018-11-01 21:22:44,057,1,WOOHO
+2018-11-01 21:22:45,061,1,WOOHO
+2018-11-01 21:22:46,065,1,WOOHO
+2018-11-01 21:22:47,069,1,WOOHO
+2018-11-01 21:22:48,074,1,WOOHO
+2018-11-01 21:22:49,078,1,WOOHO
+2018-11-01 21:22:50,082,1,WOOHO
+2018-11-01 21:22:51,086,1,WOOHO
+2018-11-01 21:22:52,090,1,WOOHO
+2018-11-01 21:22:53,092,1,WOOHO
+2018-11-01 21:22:54,097,1,WOOHO
+2018-11-01 21:22:55,100,1,WOOHO
+2018-11-01 21:22:56,102,1,WOOHO
+2018-11-01 21:22:57,105,1,WOOHO
+2018-11-01 21:22:58,109,1,WOOHO
+2018-11-01 21:22:59,115,1,WOOHO
+2018-11-01 21:23:00,120,1,WOOHO
+2018-11-01 21:23:01,121,1,WOOHO
+2018-11-01 21:23:02,125,1,WOOHO
+2018-11-01 21:23:03,126,1,WOOHO
+2018-11-01 21:23:04,131,1,WOOHO
+2018-11-01 21:23:05,136,1,WOOHO
+2018-11-01 21:23:06,141,1,WOOHO
+2018-11-01 21:23:07,146,1,WOOHO
+2018-11-01 21:23:08,151,1,WOOHO
+2018-11-01 21:23:09,157,1,WOOHO
+2018-11-01 21:23:10,164,1,WOOHO
+2018-11-01 21:23:11,167,1,WOOHO
+2018-11-01 21:23:12,170,1,WOOHO
+2018-11-01 21:23:13,175,1,WOOHO
+2018-11-01 21:23:14,180,1,WOOHO
+2018-11-01 21:23:15,184,1,WOOHO
+2018-11-01 21:23:16,188,1,WOOHO
+2018-11-01 21:23:17,194,1,WOOHO
+2018-11-01 21:23:18,198,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_21-23 b/logs/first_logfile2.log.2018-11-01_21-23
new file mode 100644
index 0000000..65d52a0
--- /dev/null
+++ b/logs/first_logfile2.log.2018-11-01_21-23
@@ -0,0 +1,60 @@
+2018-11-01 21:23:19,204,1,WOOHO
+2018-11-01 21:23:20,209,1,WOOHO
+2018-11-01 21:23:21,210,1,WOOHO
+2018-11-01 21:23:22,213,1,WOOHO
+2018-11-01 21:23:23,214,1,WOOHO
+2018-11-01 21:23:24,218,1,WOOHO
+2018-11-01 21:23:25,222,1,WOOHO
+2018-11-01 21:23:26,226,1,WOOHO
+2018-11-01 21:23:27,226,1,WOOHO
+2018-11-01 21:23:28,230,1,WOOHO
+2018-11-01 21:23:29,235,1,WOOHO
+2018-11-01 21:23:30,240,1,WOOHO
+2018-11-01 21:23:31,244,1,WOOHO
+2018-11-01 21:23:32,250,1,WOOHO
+2018-11-01 21:23:33,251,1,WOOHO
+2018-11-01 21:23:34,256,1,WOOHO
+2018-11-01 21:23:35,260,1,WOOHO
+2018-11-01 21:23:36,264,1,WOOHO
+2018-11-01 21:23:37,270,1,WOOHO
+2018-11-01 21:23:38,272,1,WOOHO
+2018-11-01 21:23:39,276,1,WOOHO
+2018-11-01 21:23:40,283,1,WOOHO
+2018-11-01 21:23:41,284,1,WOOHO
+2018-11-01 21:23:42,289,1,WOOHO
+2018-11-01 21:23:43,292,1,WOOHO
+2018-11-01 21:23:44,298,1,WOOHO
+2018-11-01 21:23:45,301,1,WOOHO
+2018-11-01 21:23:46,306,1,WOOHO
+2018-11-01 21:23:47,309,1,WOOHO
+2018-11-01 21:23:48,314,1,WOOHO
+2018-11-01 21:23:49,316,1,WOOHO
+2018-11-01 21:23:50,321,1,WOOHO
+2018-11-01 21:23:51,324,1,WOOHO
+2018-11-01 21:23:52,327,1,WOOHO
+2018-11-01 21:23:53,331,1,WOOHO
+2018-11-01 21:23:54,333,1,WOOHO
+2018-11-01 21:23:55,338,1,WOOHO
+2018-11-01 21:23:56,341,1,WOOHO
+2018-11-01 21:23:57,344,1,WOOHO
+2018-11-01 21:23:58,349,1,WOOHO
+2018-11-01 21:23:59,353,1,WOOHO
+2018-11-01 21:24:00,357,1,WOOHO
+2018-11-01 21:24:01,362,1,WOOHO
+2018-11-01 21:24:02,366,1,WOOHO
+2018-11-01 21:24:03,371,1,WOOHO
+2018-11-01 21:24:04,376,1,WOOHO
+2018-11-01 21:24:05,381,1,WOOHO
+2018-11-01 21:24:06,382,1,WOOHO
+2018-11-01 21:24:07,384,1,WOOHO
+2018-11-01 21:24:08,388,1,WOOHO
+2018-11-01 21:24:09,391,1,WOOHO
+2018-11-01 21:24:10,393,1,WOOHO
+2018-11-01 21:24:11,398,1,WOOHO
+2018-11-01 21:24:12,401,1,WOOHO
+2018-11-01 21:24:13,405,1,WOOHO
+2018-11-01 21:24:14,409,1,WOOHO
+2018-11-01 21:24:15,413,1,WOOHO
+2018-11-01 21:24:16,417,1,WOOHO
+2018-11-01 21:24:17,421,1,WOOHO
+2018-11-01 21:24:18,422,1,WOOHO
diff --git a/logs/first_logfile2.log.2018-11-01_21-24 b/logs/first_logfile2.log.2018-11-01_21-24
new file mode 100644
index 0000000..ec5b5bb
--- /dev/null
+++ b/logs/first_logfile2.log.2018-11-01_21-24
@@ -0,0 +1,60 @@
+2018-11-01 21:24:19,426,1,WOOHO
+2018-11-01 21:24:20,431,1,WOOHO
+2018-11-01 21:24:21,436,1,WOOHO
+2018-11-01 21:24:22,442,1,WOOHO
+2018-11-01 21:24:23,445,1,WOOHO
+2018-11-01 21:24:24,450,1,WOOHO
+2018-11-01 21:24:25,453,1,WOOHO
+2018-11-01 21:24:26,457,1,WOOHO
+2018-11-01 21:24:27,462,1,WOOHO
+2018-11-01 21:24:28,466,1,WOOHO
+2018-11-01 21:24:29,471,1,WOOHO
+2018-11-01 21:24:30,475,1,WOOHO
+2018-11-01 21:24:31,481,1,WOOHO
+2018-11-01 21:24:32,484,1,WOOHO
+2018-11-01 21:24:33,487,1,WOOHO
+2018-11-01 21:24:34,491,1,WOOHO
+2018-11-01 21:24:35,495,1,WOOHO
+2018-11-01 21:24:36,499,1,WOOHO
+2018-11-01 21:24:37,503,1,WOOHO
+2018-11-01 21:24:38,506,1,WOOHO
+2018-11-01 21:24:39,510,1,WOOHO
+2018-11-01 21:24:40,515,1,WOOHO
+2018-11-01 21:24:41,519,1,WOOHO
+2018-11-01 21:24:42,522,1,WOOHO
+2018-11-01 21:24:43,527,1,WOOHO
+2018-11-01 21:24:44,532,1,WOOHO
+2018-11-01 21:24:45,537,1,WOOHO
+2018-11-01 21:24:46,542,1,WOOHO
+2018-11-01 21:24:47,548,1,WOOHO
+2018-11-01 21:24:48,554,1,WOOHO
+2018-11-01 21:24:49,558,1,WOOHO
+2018-11-01 21:24:50,563,1,WOOHO
+2018-11-01 21:24:51,567,1,WOOHO
+2018-11-01 21:24:52,573,1,WOOHO
+2018-11-01 21:24:53,575,1,WOOHO
+2018-11-01 21:24:54,578,1,WOOHO
+2018-11-01 21:24:55,582,1,WOOHO
+2018-11-01 21:24:56,583,1,WOOHO
+2018-11-01 21:24:57,586,1,WOOHO
+2018-11-01 21:24:58,589,1,WOOHO
+2018-11-01 21:24:59,593,1,WOOHO
+2018-11-01 21:25:00,597,1,WOOHO
+2018-11-01 21:25:01,598,1,WOOHO
+2018-11-01 21:25:02,600,1,WOOHO
+2018-11-01 21:25:03,606,1,WOOHO
+2018-11-01 21:25:04,612,1,WOOHO
+2018-11-01 21:25:05,614,1,WOOHO
+2018-11-01 21:25:06,616,1,WOOHO
+2018-11-01 21:25:07,620,1,WOOHO
+2018-11-01 21:25:08,624,1,WOOHO
+2018-11-01 21:25:09,631,1,WOOHO
+2018-11-01 21:25:10,634,1,WOOHO
+2018-11-01 21:25:11,636,1,WOOHO
+2018-11-01 21:25:12,640,1,WOOHO
+2018-11-01 21:25:13,645,1,WOOHO
+2018-11-01 21:25:14,649,1,WOOHO
+2018-11-01 21:25:15,653,1,WOOHO
+2018-11-01 21:25:16,657,1,WOOHO
+2018-11-01 21:25:17,661,1,WOOHO
+2018-11-01 21:25:18,665,1,WOOHO
diff --git a/run.py b/run.py
index 0a391c3..a5a391a 100644
--- a/run.py
+++ b/run.py
@@ -1,12 +1,4 @@
-import importlib
-
-from aiohttp import web
-from aiohttp_auth import auth
-from core.cbpi import CraftBeerPi
+from core.craftbeerpi import CraftBeerPi
 
 cbpi = CraftBeerPi()
-
-
-
-
 cbpi.start()
\ No newline at end of file
diff --git a/tests/test_app.py b/tests/test_app.py
index 853472f..abba565 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -6,7 +6,7 @@ import json
 
 from hbmqtt.broker import Broker
 
-from core.cbpi import CraftBeerPi
+from core.craftbeerpi import CraftBeerPi
 from core.database.model import ActorModel