Merge pull request #24836 from home-assistant/rc

0.95.3
Bumped version to 0.95.3
2026-01-02 20:14:30 +01:00 · 2019-06-28 20:45:21 -07:00 · 2019-06-28 20:44:23 -07:00 · 2019-06-28 20:44:19 -07:00 · 2019-06-28 10:30:01 -07:00 · 2019-06-28 08:50:23 -07:00
5372 changed files with 248136 additions and 176750 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,272 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2.1
+
+executors:
+
+  python:
+    parameters:
+      tag:
+        type: string
+        default: latest
+    docker:
+      - image: circleci/python:<< parameters.tag >>
+      - image: circleci/buildpack-deps:stretch
+    working_directory: ~/repo
+
+commands:
+
+  docker-prereqs:
+    description: Set up docker prerequisite requirement
+    steps:
+      - run: sudo apt-get update && sudo apt-get install -y --no-install-recommends
+          libudev-dev libavformat-dev libavcodec-dev libavdevice-dev libavutil-dev
+          libswscale-dev libswresample-dev libavfilter-dev
+
+  install-requirements:
+    description: Set up venv and install requirements python packages with cache support
+    parameters:
+      python:
+        type: string
+        default: latest
+      all:
+        description: pip install -r requirements_all.txt
+        type: boolean
+        default: false
+      test:
+        description: pip install -r requirements_test.txt
+        type: boolean
+        default: false
+      test_all:
+        description: pip install -r requirements_test_all.txt
+        type: boolean
+        default: false
+    steps:
+      - restore_cache:
+          keys:
+            - v1-<< parameters.python >>-{{ checksum "homeassistant/package_constraints.txt" }}-<<# parameters.all >>{{ checksum "requirements_all.txt" }}<</ parameters.all>>-<<# parameters.test >>{{ checksum "requirements_test.txt" }}<</ parameters.test>>-<<# parameters.test_all >>{{ checksum "requirements_test_all.txt" }}<</ parameters.test_all>>
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -q -U pip
+            pip install -q -U setuptools
+            <<# parameters.all >>pip install -q --progress-bar off -r requirements_all.txt -c homeassistant/package_constraints.txt<</ parameters.all>>
+            <<# parameters.test >>pip install -q --progress-bar off -r requirements_test.txt -c homeassistant/package_constraints.txt<</ parameters.test>>
+            <<# parameters.test_all >>pip install -q --progress-bar off -r requirements_test_all.txt -c homeassistant/package_constraints.txt<</ parameters.test_all>>
+          no_output_timeout: 15m
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-<< parameters.python >>-{{ checksum "homeassistant/package_constraints.txt" }}-<<# parameters.all >>{{ checksum "requirements_all.txt" }}<</ parameters.all>>-<<# parameters.test >>{{ checksum "requirements_test.txt" }}<</ parameters.test>>-<<# parameters.test_all >>{{ checksum "requirements_test_all.txt" }}<</ parameters.test_all>>
+
+  install:
+    description: Install Home Assistant
+    steps:
+      - run:
+          name: install
+          command: |
+            . venv/bin/activate
+            pip install -q --progress-bar off -e .
+
+jobs:
+
+  static-check:
+    executor:
+      name: python
+      tag: 3.5.5-stretch
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: 3.5.5-stretch
+          test: true
+
+      - run:
+          name: run static check
+          command: |
+            . venv/bin/activate
+            flake8 homeassistant tests script
+
+      - run:
+          name: run static type check
+          command: |
+            . venv/bin/activate
+            TYPING_FILES=$(cat mypyrc)
+            mypy $TYPING_FILES
+
+      - install
+
+      - run:
+          name: validate manifests
+          command: |
+            . venv/bin/activate
+            python -m script.hassfest validate
+
+      - run:
+          name: run gen_requirements_all
+          command: |
+            . venv/bin/activate
+            python script/gen_requirements_all.py validate
+
+  pre-install-all-requirements:
+    executor:
+      name: python
+      tag: 3.5.5-stretch
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: 3.5.5-stretch
+          all: true
+          test: true
+
+  pylint:
+    executor:
+      name: python
+      tag: 3.5.5-stretch
+    parallelism: 2
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: 3.5.5-stretch
+          all: true
+          test: true
+      - install
+
+      - run:
+          name: run pylint
+          command: |
+            . venv/bin/activate
+            PYFILES=$(circleci tests glob "homeassistant/**/*.py" | circleci tests split)
+            pylint ${PYFILES}
+          no_output_timeout: 15m
+
+  pre-test:
+    parameters:
+      python:
+        type: string
+    executor:
+      name: python
+      tag: << parameters.python >>
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: << parameters.python >>
+          test_all: true
+
+  test:
+    parameters:
+      python:
+        type: string
+    executor:
+      name: python
+      tag: << parameters.python >>
+    parallelism: 2
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: << parameters.python >>
+          test_all: true
+      - install
+
+      - run:
+          name: run tests with code coverage
+          command: |
+            . venv/bin/activate
+            CC_SWITCH="--cov --cov-report="
+            TESTFILES=$(circleci tests glob "tests/**/test_*.py" | circleci tests split --split-by=timings)
+            pytest --timeout=9 --durations=10 --junitxml=test-reports/homeassistant/results.xml -qq -o junit_family=xunit2 -o junit_suite_name=homeassistant -o console_output_style=count -p no:sugar $CC_SWITCH -- ${TESTFILES}
+            script/check_dirty
+            codecov
+
+      - store_test_results:
+          path: test-reports
+
+      - store_artifacts:
+          path: htmlcov
+          destination: cov-reports
+
+      - store_artifacts:
+          path: test-reports
+          destination: test-reports
+
+  # This job use machine executor, e.g. classic CircleCI VM because we need both lokalise-cli and a Python runtime.
+  # Classic CircleCI included python 2.7.12 and python 3.5.2 managed by pyenv, the Python version may need change if
+  # CircleCI changed its VM in future.
+  upload-translations:
+    machine: true
+
+    steps:
+      - checkout
+
+      - run:
+          name: upload english translations
+          command: |
+            pyenv versions
+            pyenv global 3.5.2
+            docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21
+            script/translations_upload
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - static-check
+      - pre-install-all-requirements:
+          requires:
+            - static-check
+      - pylint:
+          requires:
+            - pre-install-all-requirements
+      - pre-test:
+          name: pre-test 3.5.5
+          requires:
+            - static-check
+          python: 3.5.5-stretch
+      - pre-test:
+          name: pre-test 3.6
+          requires:
+            - static-check
+          python: 3.6-stretch
+      - pre-test:
+          name: pre-test 3.7
+          requires:
+            - static-check
+          python: 3.7-stretch
+      - test:
+          name: test 3.5.5
+          requires:
+            - pre-test 3.5.5
+          python: 3.5.5-stretch
+      - test:
+          name: test 3.6
+          requires:
+            - pre-test 3.6
+          python: 3.6-stretch
+      - test:
+          name: test 3.7
+          requires:
+            - pre-test 3.7
+          python: 3.7-stretch
+      # CircleCI does not allow failure yet
+      # - test:
+      #     name: test 3.8
+      #     python: 3.8-rc-stretch
+      - upload-translations:
+          requires:
+            - static-check
+          filters:
+            branches:
+              only: dev
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -0,0 +1,16 @@
+codecov:
+  branch: dev
+coverage:
+  status:
+    project:
+      default:
+        target: 90
+        threshold: 0.09
+  notify:
+    # Notify codecov room in Discord. The webhook URL (encrypted below) ends in /slack which is why we configure a Slack notification.
+    slack:
+      default:
+        url: "secret:TgWDUM4Jw0w7wMJxuxNF/yhSOHglIo1fGwInJnRLEVPy2P2aLimkoK1mtKCowH5TFw+baUXVXT3eAqefbdvIuM8BjRR4aRji95C6CYyD0QHy4N8i7nn1SQkWDPpS8IthYTg07rUDF7s5guurkKv2RrgoCdnnqjAMSzHoExMOF7xUmblMdhBTWJgBpWEhASJy85w/xxjlsE1xoTkzeJu9Q67pTXtRcn+5kb5/vIzPSYg="
+comment:
+  require_changes: yes
+  branches: master
--- a/.coveragerc
+++ b/.coveragerc
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,13 @@
+## Breaking Change:
+
+<!-- What is breaking and why we have to break it. Remove this section only if it was NOT a breaking change. -->
+
 ## Description:


 **Related issue (if applicable):** fixes #<home-assistant issue number goes here>

-**Pull request in [home-assistant.io](https://github.com/home-assistant/home-assistant.io) with documentation (if applicable):** home-assistant/home-assistant.io#<home-assistant.io PR number goes here>
+**Pull request with documentation for [home-assistant.io](https://github.com/home-assistant/home-assistant.io) (if applicable):** home-assistant/home-assistant.io#<home-assistant.io PR number goes here>

 ## Example entry for `configuration.yaml` (if applicable):
 ```yaml
@@ -14,18 +18,18 @@
  - [ ] The code change is tested and works locally.
  - [ ] Local tests pass with `tox`. **Your PR cannot be merged unless tests pass**
  - [ ] There is no commented out code in this PR.
+  - [ ] I have followed the [development checklist][dev-checklist]

 If user exposed functionality or configuration variables are added/changed:
  - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)

 If the code communicates with devices, web services, or third-party tools:
-  - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).
-  - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).
-  - [ ] New or updated dependencies have been added to `requirements_all.txt` by running `script/gen_requirements_all.py`.
-  - [ ] New files were added to `.coveragerc`.
+  - [ ] [_The manifest file_][manifest-docs] has all fields filled out correctly. Update and include derived files by running `python3 -m script.hassfest`.
+  - [ ] New or updated dependencies have been added to `requirements_all.txt` by running `python3 -m script.gen_requirements_all`.
+  - [ ] Untested files have been added to `.coveragerc`.

 If the code does not interact with devices:
  - [ ] Tests have been added to verify that the new code works.

-[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard/__init__.py#L14
-[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard/__init__.py#L23
+[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
+[manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 config/*
+config2/*

 tests/testing_config/deps
 tests/testing_config/home-assistant.log
@@ -55,6 +56,7 @@ pip-log.txt
 .tox
 nosetests.xml
 htmlcov/
+test-reports/

 # Translations
 *.mo
@@ -83,7 +85,7 @@ Scripts/
 # vimmy stuff
 *.swp
 *.swo
-
+tags
 ctags.tmp

 # vagrant stuff
@@ -93,6 +95,7 @@ virtualization/vagrant/config

 # Visual Studio Code
 .vscode
+.devcontainer

 # Built docs
 docs/build
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,18 @@
 sudo: false
+dist: xenial
 addons:
  apt:
+    sources:
+      - sourceline: "ppa:jonathonf/ffmpeg-4"
    packages:
      - libudev-dev
+      - libavformat-dev
+      - libavcodec-dev
+      - libavdevice-dev
+      - libavutil-dev
+      - libswscale-dev
+      - libswresample-dev
+      - libavfilter-dev
 matrix:
  fast_finish: true
  include:
@@ -13,36 +23,11 @@ matrix:
    - python: "3.5.3"
      env: TOXENV=typing
    - python: "3.5.3"
-      env: TOXENV=cov
-      after_success: coveralls
-    - python: "3.6"
-      env: TOXENV=py36
+      env: TOXENV=py35
    - python: "3.7"
      env: TOXENV=py37
-      dist: xenial
-    - python: "3.8-dev"
-      env: TOXENV=py38
-      dist: xenial
-      if: branch = dev AND type = push
-  allow_failures:
-    - python: "3.8-dev"
-      env: TOXENV=py38
-      dist: xenial

-cache:
-  directories:
-    - $HOME/.cache/pip
-install: pip install -U tox coveralls
+cache: pip
+install: pip install -U tox
 language: python
 script: travis_wait 40 tox --develop
-services:
-  - docker
-before_deploy:
-  - docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21
-deploy:
-  skip_cleanup: true
-  provider: script
-  script: script/travis_deploy
-  on:
-    branch: dev
-    condition: $TOXENV = lint
--- a/426
+++ b/426
@@ -1,3 +1,4 @@
+# This file is generated by script/manifest/codeowners.py
 # People marked here will be automatically requested for a review
 # when the code that they own is touched.
 # https://github.com/blog/2392-introducing-code-owners
@@ -7,255 +8,298 @@ setup.py @home-assistant/core
 homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core
-homeassistant/components/api/* @home-assistant/core
-homeassistant/components/auth/* @home-assistant/core
-homeassistant/components/automation/* @home-assistant/core
-homeassistant/components/cloud/* @home-assistant/core
-homeassistant/components/config/* @home-assistant/core
-homeassistant/components/configurator/* @home-assistant/core
-homeassistant/components/conversation/* @home-assistant/core
-homeassistant/components/frontend/* @home-assistant/core
-homeassistant/components/group/* @home-assistant/core
-homeassistant/components/history/* @home-assistant/core
-homeassistant/components/http/* @home-assistant/core
-homeassistant/components/input_*.py @home-assistant/core
-homeassistant/components/introduction/* @home-assistant/core
-homeassistant/components/logger/* @home-assistant/core
-homeassistant/components/lovelace/* @home-assistant/core
-homeassistant/components/mqtt/* @home-assistant/core
-homeassistant/components/panel_custom/* @home-assistant/core
-homeassistant/components/panel_iframe/* @home-assistant/core
-homeassistant/components/onboarding/* @home-assistant/core
-homeassistant/components/persistent_notification/* @home-assistant/core
-homeassistant/components/scene/__init__.py @home-assistant/core
-homeassistant/components/scene/homeassistant.py @home-assistant/core
-homeassistant/components/script/* @home-assistant/core
-homeassistant/components/shell_command/* @home-assistant/core
-homeassistant/components/sun/* @home-assistant/core
-homeassistant/components/updater/* @home-assistant/core
-homeassistant/components/weblink/* @home-assistant/core
-homeassistant/components/websocket_api/* @home-assistant/core
-homeassistant/components/zone/* @home-assistant/core

-# Home Assistant Developer Teams
+# Virtualization
 Dockerfile @home-assistant/docker
 virtualization/Docker/* @home-assistant/docker

-homeassistant/components/zwave/* @home-assistant/z-wave
-homeassistant/components/*/zwave.py @home-assistant/z-wave
+# Other code
+homeassistant/scripts/check_config.py @kellerza

-homeassistant/components/hassio/* @home-assistant/hassio
-
-# Individual platforms
-homeassistant/components/alarm_control_panel/manual_mqtt.py @colinodell
-homeassistant/components/binary_sensor/hikvision.py @mezz64
-homeassistant/components/binary_sensor/threshold.py @fabaff
-homeassistant/components/binary_sensor/uptimerobot.py @ludeeus
-homeassistant/components/camera/yi.py @bachya
-homeassistant/components/climate/coolmaster.py @OnFreund
-homeassistant/components/climate/ephember.py @ttroy50
-homeassistant/components/climate/eq3btsmart.py @rytilahti
-homeassistant/components/climate/mill.py @danielhiversen
-homeassistant/components/climate/sensibo.py @andrey-git
-homeassistant/components/cover/brunt.py @eavanvalkenburg
-homeassistant/components/cover/group.py @cdce8p
-homeassistant/components/cover/template.py @PhracturedBlue
-homeassistant/components/device_tracker/asuswrt.py @kennedyshead
-homeassistant/components/device_tracker/automatic.py @armills
-homeassistant/components/device_tracker/huawei_router.py @abmantis
-homeassistant/components/device_tracker/quantum_gateway.py @cisasteelersfan
-homeassistant/components/device_tracker/tile.py @bachya
-homeassistant/components/device_tracker/traccar.py @ludeeus
-homeassistant/components/device_tracker/bt_smarthub.py @jxwolstenholme
-homeassistant/components/device_tracker/synology_srm.py @aerialls
-homeassistant/components/light/lifx_legacy.py @amelchio
-homeassistant/components/light/yeelight.py @rytilahti
-homeassistant/components/light/yeelightsunflower.py @lindsaymarkward
-homeassistant/components/lock/nello.py @pschmitt
-homeassistant/components/lock/nuki.py @pschmitt
-homeassistant/components/media_player/emby.py @mezz64
-homeassistant/components/media_player/kodi.py @armills
-homeassistant/components/media_player/liveboxplaytv.py @pschmitt
-homeassistant/components/media_player/mediaroom.py @dgomes
-homeassistant/components/media_player/monoprice.py @etsinko
-homeassistant/components/media_player/mpd.py @fabaff
-homeassistant/components/media_player/xiaomi_tv.py @fattdev
-homeassistant/components/media_player/yamaha_musiccast.py @jalmeroth
-homeassistant/components/notify/file.py @fabaff
-homeassistant/components/notify/flock.py @fabaff
-homeassistant/components/notify/mastodon.py @fabaff
-homeassistant/components/notify/smtp.py @fabaff
-homeassistant/components/notify/syslog.py @fabaff
-homeassistant/components/notify/xmpp.py @fabaff
-homeassistant/components/notify/yessssms.py @flowolf
-homeassistant/components/scene/lifx_cloud.py @amelchio
-homeassistant/components/sensor/airvisual.py @bachya
-homeassistant/components/sensor/alpha_vantage.py @fabaff
-homeassistant/components/sensor/bitcoin.py @fabaff
-homeassistant/components/sensor/cpuspeed.py @fabaff
-homeassistant/components/sensor/cups.py @fabaff
-homeassistant/components/sensor/darksky.py @fabaff
-homeassistant/components/sensor/file.py @fabaff
-homeassistant/components/sensor/filter.py @dgomes
-homeassistant/components/sensor/fixer.py @fabaff
-homeassistant/components/sensor/flunearyou.py @bachya
-homeassistant/components/sensor/gearbest.py @HerrHofrat
-homeassistant/components/sensor/gitter.py @fabaff
-homeassistant/components/sensor/glances.py @fabaff
-homeassistant/components/sensor/gpsd.py @fabaff
-homeassistant/components/sensor/integration.py @dgomes
-homeassistant/components/sensor/irish_rail_transport.py @ttroy50
-homeassistant/components/sensor/jewish_calendar.py @tsvi
-homeassistant/components/sensor/launch_library.py @ludeeus
-homeassistant/components/sensor/linux_battery.py @fabaff
-homeassistant/components/sensor/miflora.py @danielhiversen @ChristianKuehnel
-homeassistant/components/sensor/min_max.py @fabaff
-homeassistant/components/sensor/moon.py @fabaff
-homeassistant/components/sensor/netdata.py @fabaff
-homeassistant/components/sensor/nsw_fuel_station.py @nickw444
-homeassistant/components/sensor/pi_hole.py @fabaff
-homeassistant/components/sensor/pollen.py @bachya
-homeassistant/components/sensor/pvoutput.py @fabaff
-homeassistant/components/sensor/qnap.py @colinodell
-homeassistant/components/sensor/ruter.py @ludeeus
-homeassistant/components/sensor/scrape.py @fabaff
-homeassistant/components/sensor/serial.py @fabaff
-homeassistant/components/sensor/seventeentrack.py @bachya
-homeassistant/components/sensor/shodan.py @fabaff
-homeassistant/components/sensor/sma.py @kellerza
-homeassistant/components/sensor/sql.py @dgomes
-homeassistant/components/sensor/statistics.py @fabaff
-homeassistant/components/sensor/swiss*.py @fabaff
-homeassistant/components/sensor/sytadin.py @gautric
-homeassistant/components/sensor/tautulli.py @ludeeus
-homeassistant/components/sensor/time_date.py @fabaff
-homeassistant/components/sensor/version.py @fabaff
-homeassistant/components/sensor/waqi.py @andrey-git
-homeassistant/components/sensor/worldclock.py @fabaff
-homeassistant/components/switch/switchbot.py @danielhiversen
-homeassistant/components/switch/switchmate.py @danielhiversen
-homeassistant/components/vacuum/roomba.py @pschmitt
-homeassistant/components/weather/__init__.py @fabaff
-homeassistant/components/weather/darksky.py @fabaff
-homeassistant/components/weather/demo.py @fabaff
-homeassistant/components/weather/met.py @danielhiversen
-homeassistant/components/weather/openweathermap.py @fabaff
-
-# A
+# Integrations
+homeassistant/components/adguard/* @frenck
+homeassistant/components/airvisual/* @bachya
+homeassistant/components/alarm_control_panel/* @colinodell
+homeassistant/components/alpha_vantage/* @fabaff
+homeassistant/components/amazon_polly/* @robbiet480
+homeassistant/components/ambiclimate/* @danielhiversen
 homeassistant/components/ambient_station/* @bachya
+homeassistant/components/api/* @home-assistant/core
+homeassistant/components/aprs/* @PhilRW
 homeassistant/components/arduino/* @fabaff
+homeassistant/components/arest/* @fabaff
+homeassistant/components/asuswrt/* @kennedyshead
+homeassistant/components/auth/* @home-assistant/core
+homeassistant/components/automatic/* @armills
+homeassistant/components/automation/* @home-assistant/core
+homeassistant/components/awair/* @danielsjf
+homeassistant/components/aws/* @awarecan @robbiet480
 homeassistant/components/axis/* @kane610
-homeassistant/components/*/arest.py @fabaff
-
-# B
+homeassistant/components/azure_event_hub/* @eavanvalkenburg
+homeassistant/components/bitcoin/* @fabaff
+homeassistant/components/bizkaibus/* @UgaitzEtxebarria
 homeassistant/components/blink/* @fronzbot
 homeassistant/components/bmw_connected_drive/* @ChristianKuehnel
-homeassistant/components/*/broadlink.py @danielhiversen
-
-# C
+homeassistant/components/braviatv/* @robbiet480
+homeassistant/components/broadlink/* @danielhiversen
+homeassistant/components/brunt/* @eavanvalkenburg
+homeassistant/components/bt_smarthub/* @jxwolstenholme
+homeassistant/components/buienradar/* @ties
+homeassistant/components/cisco_ios/* @fbradyirl
+homeassistant/components/cisco_mobility_express/* @fbradyirl
+homeassistant/components/cisco_webex_teams/* @fbradyirl
+homeassistant/components/ciscospark/* @fbradyirl
+homeassistant/components/cloud/* @home-assistant/cloud
 homeassistant/components/cloudflare/* @ludeeus
+homeassistant/components/config/* @home-assistant/core
+homeassistant/components/configurator/* @home-assistant/core
+homeassistant/components/conversation/* @home-assistant/core
+homeassistant/components/coolmaster/* @OnFreund
 homeassistant/components/counter/* @fabaff
-
-# D
+homeassistant/components/cover/* @home-assistant/core
+homeassistant/components/cpuspeed/* @fabaff
+homeassistant/components/cups/* @fabaff
 homeassistant/components/daikin/* @fredrike @rofrantz
+homeassistant/components/darksky/* @fabaff
 homeassistant/components/deconz/* @kane610
+homeassistant/components/demo/* @home-assistant/core
+homeassistant/components/device_automation/* @home-assistant/core
 homeassistant/components/digital_ocean/* @fabaff
+homeassistant/components/discogs/* @thibmaek
+homeassistant/components/doorbird/* @oblogic7
 homeassistant/components/dweet/* @fabaff
-
-# E
 homeassistant/components/ecovacs/* @OverloadUT
 homeassistant/components/edp_redy/* @abmantis
-homeassistant/components/eight_sleep/* @mezz64
 homeassistant/components/egardia/* @jeroenterheerdt
-homeassistant/components/esphome/*.py @OttoWinter
-
-# F
-homeassistant/components/freebox/*.py @snoof85
-
-# G
+homeassistant/components/eight_sleep/* @mezz64
+homeassistant/components/elv/* @majuss
+homeassistant/components/emby/* @mezz64
+homeassistant/components/enigma2/* @fbradyirl
+homeassistant/components/enocean/* @bdurrer
+homeassistant/components/environment_canada/* @michaeldavie
+homeassistant/components/ephember/* @ttroy50
+homeassistant/components/epsonworkforce/* @ThaStealth
+homeassistant/components/eq3btsmart/* @rytilahti
+homeassistant/components/esphome/* @OttoWinter
+homeassistant/components/essent/* @TheLastProject
+homeassistant/components/evohome/* @zxdavb
+homeassistant/components/file/* @fabaff
+homeassistant/components/filter/* @dgomes
+homeassistant/components/fitbit/* @robbiet480
+homeassistant/components/fixer/* @fabaff
+homeassistant/components/flock/* @fabaff
+homeassistant/components/flunearyou/* @bachya
+homeassistant/components/foursquare/* @robbiet480
+homeassistant/components/freebox/* @snoof85
+homeassistant/components/frontend/* @home-assistant/frontend
+homeassistant/components/gearbest/* @HerrHofrat
+homeassistant/components/geniushub/* @zxdavb
+homeassistant/components/gitter/* @fabaff
+homeassistant/components/glances/* @fabaff
+homeassistant/components/gntp/* @robbiet480
+homeassistant/components/google_cloud/* @lufton
+homeassistant/components/google_translate/* @awarecan
+homeassistant/components/google_travel_time/* @robbiet480
 homeassistant/components/googlehome/* @ludeeus
-
-# H
+homeassistant/components/gpsd/* @fabaff
+homeassistant/components/group/* @home-assistant/core
+homeassistant/components/gtfs/* @robbiet480
 homeassistant/components/harmony/* @ehendrix23
+homeassistant/components/hassio/* @home-assistant/hass-io
+homeassistant/components/heos/* @andrewsayre
+homeassistant/components/hikvision/* @mezz64
+homeassistant/components/hikvisioncam/* @fbradyirl
+homeassistant/components/history/* @home-assistant/core
 homeassistant/components/history_graph/* @andrey-git
 homeassistant/components/hive/* @Rendili @KJonline
+homeassistant/components/homeassistant/* @home-assistant/core
 homeassistant/components/homekit/* @cdce8p
+homeassistant/components/homekit_controller/* @Jc2k
+homeassistant/components/homematic/* @pvizeli @danielperna84
+homeassistant/components/honeywell/* @zxdavb
+homeassistant/components/html5/* @robbiet480
+homeassistant/components/http/* @home-assistant/core
 homeassistant/components/huawei_lte/* @scop
-
-# I
-homeassistant/components/influx/* @fabaff
+homeassistant/components/huawei_router/* @abmantis
+homeassistant/components/hue/* @balloob
+homeassistant/components/ign_sismologia/* @exxamalte
+homeassistant/components/incomfort/* @zxdavb
+homeassistant/components/influxdb/* @fabaff
+homeassistant/components/input_boolean/* @home-assistant/core
+homeassistant/components/input_datetime/* @home-assistant/core
+homeassistant/components/input_number/* @home-assistant/core
+homeassistant/components/input_select/* @home-assistant/core
+homeassistant/components/input_text/* @home-assistant/core
+homeassistant/components/integration/* @dgomes
+homeassistant/components/ios/* @robbiet480
 homeassistant/components/ipma/* @dgomes
-
-# K
+homeassistant/components/iqvia/* @bachya
+homeassistant/components/irish_rail_transport/* @ttroy50
+homeassistant/components/jewish_calendar/* @tsvi
 homeassistant/components/knx/* @Julius2342
+homeassistant/components/kodi/* @armills
 homeassistant/components/konnected/* @heythisisnate
-
-# L
+homeassistant/components/lametric/* @robbiet480
+homeassistant/components/launch_library/* @ludeeus
+homeassistant/components/lcn/* @alengwenus
+homeassistant/components/life360/* @pnbruckner
 homeassistant/components/lifx/* @amelchio
+homeassistant/components/lifx_cloud/* @amelchio
+homeassistant/components/lifx_legacy/* @amelchio
+homeassistant/components/linky/* @tiste @Quentame
+homeassistant/components/linux_battery/* @fabaff
+homeassistant/components/liveboxplaytv/* @pschmitt
+homeassistant/components/logger/* @home-assistant/core
+homeassistant/components/logi_circle/* @evanjd
+homeassistant/components/lovelace/* @home-assistant/frontend
+homeassistant/components/luci/* @fbradyirl
 homeassistant/components/luftdaten/* @fabaff
-
-# M
+homeassistant/components/mastodon/* @fabaff
 homeassistant/components/matrix/* @tinloaf
+homeassistant/components/mcp23017/* @jardiamj
+homeassistant/components/mediaroom/* @dgomes
 homeassistant/components/melissa/* @kennedyshead
-homeassistant/components/*/melissa.py @kennedyshead
-homeassistant/components/*/mystrom.py @fabaff
-
-# N
+homeassistant/components/met/* @danielhiversen
+homeassistant/components/meteo_france/* @victorcerutti @oncleben31
+homeassistant/components/meteoalarm/* @rolfberkenbosch
+homeassistant/components/miflora/* @danielhiversen @ChristianKuehnel
+homeassistant/components/mill/* @danielhiversen
+homeassistant/components/min_max/* @fabaff
+homeassistant/components/mobile_app/* @robbiet480
+homeassistant/components/monoprice/* @etsinko
+homeassistant/components/moon/* @fabaff
+homeassistant/components/mpd/* @fabaff
+homeassistant/components/mqtt/* @home-assistant/core
+homeassistant/components/mystrom/* @fabaff
+homeassistant/components/nello/* @pschmitt
 homeassistant/components/ness_alarm/* @nickw444
-homeassistant/components/*/ness_alarm.py @nickw444
+homeassistant/components/nest/* @awarecan
+homeassistant/components/netdata/* @fabaff
+homeassistant/components/nextbus/* @vividboarder
 homeassistant/components/nissan_leaf/* @filcole
+homeassistant/components/nmbs/* @thibmaek
 homeassistant/components/no_ip/* @fabaff
-
-# O
+homeassistant/components/notify/* @home-assistant/core
+homeassistant/components/nsw_fuel_station/* @nickw444
+homeassistant/components/nuki/* @pschmitt
+homeassistant/components/ohmconnect/* @robbiet480
+homeassistant/components/onboarding/* @home-assistant/core
 homeassistant/components/openuv/* @bachya
-
-# P
+homeassistant/components/openweathermap/* @fabaff
+homeassistant/components/orangepi_gpio/* @pascallj
+homeassistant/components/owlet/* @oblogic7
+homeassistant/components/panel_custom/* @home-assistant/frontend
+homeassistant/components/panel_iframe/* @home-assistant/frontend
+homeassistant/components/persistent_notification/* @home-assistant/core
+homeassistant/components/philips_js/* @elupus
+homeassistant/components/pi_hole/* @fabaff
+homeassistant/components/plaato/* @JohNan
 homeassistant/components/plant/* @ChristianKuehnel
 homeassistant/components/point/* @fredrike
-
-# Q
+homeassistant/components/ps4/* @ktnrg45
+homeassistant/components/ptvsd/* @swamp-ig
+homeassistant/components/push/* @dgomes
+homeassistant/components/pvoutput/* @fabaff
+homeassistant/components/qld_bushfire/* @exxamalte
+homeassistant/components/qnap/* @colinodell
+homeassistant/components/quantum_gateway/* @cisasteelersfan
 homeassistant/components/qwikswitch/* @kellerza
-
-# R
+homeassistant/components/raincloud/* @vanstinator
 homeassistant/components/rainmachine/* @bachya
+homeassistant/components/random/* @fabaff
+homeassistant/components/repetier/* @MTrab
 homeassistant/components/rfxtrx/* @danielhiversen
-homeassistant/components/*/random.py @fabaff
-
-# S
+homeassistant/components/rmvtransport/* @cgtobi
+homeassistant/components/roomba/* @pschmitt
+homeassistant/components/ruter/* @ludeeus
+homeassistant/components/scene/* @home-assistant/core
+homeassistant/components/scrape/* @fabaff
+homeassistant/components/script/* @home-assistant/core
+homeassistant/components/sense/* @kbickar
+homeassistant/components/sensibo/* @andrey-git
+homeassistant/components/serial/* @fabaff
+homeassistant/components/seventeentrack/* @bachya
+homeassistant/components/shell_command/* @home-assistant/core
 homeassistant/components/shiftr/* @fabaff
+homeassistant/components/shodan/* @fabaff
 homeassistant/components/simplisafe/* @bachya
+homeassistant/components/sma/* @kellerza
+homeassistant/components/smarthab/* @outadoc
 homeassistant/components/smartthings/* @andrewsayre
+homeassistant/components/smarty/* @z0mbieprocess
+homeassistant/components/smtp/* @fabaff
+homeassistant/components/solaredge_local/* @drobtravels
+homeassistant/components/solax/* @squishykid
+homeassistant/components/somfy/* @tetienne
 homeassistant/components/sonos/* @amelchio
 homeassistant/components/spaceapi/* @fabaff
 homeassistant/components/spider/* @peternijssen
-
-# T
+homeassistant/components/sql/* @dgomes
+homeassistant/components/statistics/* @fabaff
+homeassistant/components/stiebel_eltron/* @fucm
+homeassistant/components/sun/* @Swamp-Ig
+homeassistant/components/supla/* @mwegrzynek
+homeassistant/components/swiss_hydrological_data/* @fabaff
+homeassistant/components/swiss_public_transport/* @fabaff
+homeassistant/components/switchbot/* @danielhiversen
+homeassistant/components/switcher_kis/* @tomerfi
+homeassistant/components/switchmate/* @danielhiversen
+homeassistant/components/syncthru/* @nielstron
+homeassistant/components/synology_srm/* @aerialls
+homeassistant/components/syslog/* @fabaff
+homeassistant/components/sytadin/* @gautric
 homeassistant/components/tahoma/* @philklei
-homeassistant/components/tellduslive/*.py @fredrike
+homeassistant/components/tautulli/* @ludeeus
+homeassistant/components/tellduslive/* @fredrike
+homeassistant/components/template/* @PhracturedBlue
 homeassistant/components/tesla/* @zabuldon
+homeassistant/components/tfiac/* @fredrike @mellado
 homeassistant/components/thethingsnetwork/* @fabaff
+homeassistant/components/threshold/* @fabaff
 homeassistant/components/tibber/* @danielhiversen
-homeassistant/components/tplink/* @rytilahti
-homeassistant/components/tradfri/* @ggravlingen
+homeassistant/components/tile/* @bachya
+homeassistant/components/time_date/* @fabaff
 homeassistant/components/toon/* @frenck
-
-# U
+homeassistant/components/tplink/* @rytilahti
+homeassistant/components/traccar/* @ludeeus
+homeassistant/components/tradfri/* @ggravlingen
+homeassistant/components/tts/* @robbiet480
+homeassistant/components/twilio_call/* @robbiet480
+homeassistant/components/twilio_sms/* @robbiet480
 homeassistant/components/unifi/* @kane610
 homeassistant/components/upcloud/* @scop
+homeassistant/components/updater/* @home-assistant/core
+homeassistant/components/upnp/* @robbiet480
+homeassistant/components/uptimerobot/* @ludeeus
 homeassistant/components/utility_meter/* @dgomes
-
-# V
 homeassistant/components/velux/* @Julius2342
-
-# W
+homeassistant/components/version/* @fabaff
+homeassistant/components/vizio/* @raman325
+homeassistant/components/vlc_telnet/* @rodripf
+homeassistant/components/waqi/* @andrey-git
+homeassistant/components/watson_tts/* @rutkai
+homeassistant/components/weather/* @fabaff
+homeassistant/components/weblink/* @home-assistant/core
+homeassistant/components/websocket_api/* @home-assistant/core
 homeassistant/components/wemo/* @sqldiablo
-
-# X
+homeassistant/components/worldclock/* @fabaff
+homeassistant/components/xfinity/* @cisasteelersfan
 homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
 homeassistant/components/xiaomi_miio/* @rytilahti @syssi
-
-# Z
+homeassistant/components/xiaomi_tv/* @simse
+homeassistant/components/xmpp/* @fabaff @flowolf
+homeassistant/components/yamaha_musiccast/* @jalmeroth
+homeassistant/components/yeelight/* @rytilahti @zewelor
+homeassistant/components/yeelightsunflower/* @lindsaymarkward
+homeassistant/components/yessssms/* @flowolf
+homeassistant/components/yi/* @bachya
+homeassistant/components/yr/* @danielhiversen
+homeassistant/components/zeroconf/* @robbiet480 @Kane610
+homeassistant/components/zha/* @dmulcahey @adminiuga
+homeassistant/components/zone/* @home-assistant/core
 homeassistant/components/zoneminder/* @rohankapoorcom
+homeassistant/components/zwave/* @home-assistant/z-wave

-# Other code
-homeassistant/scripts/check_config.py @kellerza
+# Individual files
+homeassistant/components/group/cover @cdce8p
+homeassistant/components/demo/weather @fabaff
--- a/2
+++ b/2
@@ -27,7 +27,7 @@ COPY requirements_all.txt requirements_all.txt
 # Uninstall enum34 because some dependencies install it but breaks Python 3.4+.
 # See PR #8103 for more info.
 RUN pip3 install --no-cache-dir -r requirements_all.txt && \
-    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop==0.11.3 cchardet cython tensorflow
+    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop==0.12.2 cchardet cython tensorflow

 # Copy source
 COPY . .
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-Home Assistant |Build Status| |Coverage Status| |Chat Status|
+Home Assistant |Chat Status|
 =================================================================================

 Home Assistant is a home automation platform running on Python 3. It is able to track and control all devices at home and offer a platform for automating control.
@@ -27,10 +27,6 @@ components <https://developers.home-assistant.io/docs/en/creating_component_inde
 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.

-.. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
-   :target: https://travis-ci.org/home-assistant/home-assistant
-.. |Coverage Status| image:: https://img.shields.io/coveralls/home-assistant/home-assistant.svg
-   :target: https://coveralls.io/r/home-assistant/home-assistant?branch=master
 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
   :target: https://discord.gg/c5DvZ4e
 .. |screenshot-states| image:: https://raw.github.com/home-assistant/home-assistant/master/docs/screenshots.png
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -0,0 +1,150 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dev
+pr: none
+
+resources:
+  containers:
+  - container: 35
+    image: homeassistant/ci-azure:3.5
+  - container: 36
+    image: homeassistant/ci-azure:3.6
+  - container: 37
+    image: homeassistant/ci-azure:3.7
+
+
+variables:
+  - name: ArtifactFeed
+    value: '2df3ae11-3bf6-49bc-a809-ba0d340d6a6d'
+  - name: PythonMain
+    value: '35'
+
+
+jobs:
+
+- job: 'Lint'
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: $[ variables['PythonMain'] ]
+  steps:
+  - script: |
+      python -m venv lint
+      
+      . lint/bin/activate
+      pip install flake8
+      flake8 homeassistant tests script
+    displayName: 'Run flake8'
+
+
+- job: 'Check'
+  dependsOn:
+  - Lint
+  pool:
+    vmImage: 'ubuntu-latest'
+  strategy:
+    maxParallel: 1
+    matrix:
+      Python35:
+        python.version: '3.5'
+        python.container: '35'
+      Python36:
+        python.version: '3.6'
+        python.container: '36'
+      Python37:
+        python.version: '3.7'
+        python.container: '37'
+  container: $[ variables['python.container'] ]
+  steps:
+  - script: |
+      echo "$(python.version)" > .cache
+    displayName: 'Set python $(python.version) for requirement cache'
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    displayName: 'Restore artifacts based on Requirements'
+    inputs:
+      keyfile: 'requirements_test_all.txt, .cache'
+      targetfolder: './venv'
+      vstsFeed: '$(ArtifactFeed)' 
+
+  - script: |
+      set -e
+      python -m venv venv
+      
+      . venv/bin/activate
+      pip install -U pip setuptools
+      pip install -r requirements_test_all.txt -c homeassistant/package_constraints.txt
+    displayName: 'Create Virtual Environment & Install Requirements'
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+    displayName: 'Save artifacts based on Requirements'
+    inputs:
+      keyfile: 'requirements_test_all.txt, .cache'
+      targetfolder: './venv'
+      vstsFeed: '$(ArtifactFeed)'
+
+  - script: | 
+      . venv/bin/activate
+      pip install -e .
+    displayName: 'Install Home Assistant for python $(python.version)' 
+  
+  - script: | 
+      . venv/bin/activate
+      pytest --timeout=9 --durations=10 --junitxml=junit/test-results.xml -qq -o console_output_style=count -p no:sugar tests
+    displayName: 'Run pytest for python $(python.version)'
+
+  - task: PublishTestResults@2
+    condition: succeededOrFailed()
+    inputs:
+      testResultsFiles: '**/test-*.xml'
+      testRunTitle: 'Publish test results for Python $(python.version)'
+
+- job: 'FullCheck'
+  dependsOn:
+  - Check
+  pool:
+    vmImage: 'ubuntu-latest'
+  container: $[ variables['PythonMain'] ]
+  steps:
+  - script: |
+      echo "$(PythonMain)" > .cache
+    displayName: 'Set python $(python.version) for requirement cache'
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    displayName: 'Restore artifacts based on Requirements'
+    inputs:
+      keyfile: 'requirements_all.txt, requirements_test.txt, .cache'
+      targetfolder: './venv'
+      vstsFeed: '$(ArtifactFeed)' 
+
+  - script: |
+      set -e
+      python -m venv venv
+      
+      . venv/bin/activate
+      pip install -U pip setuptools
+      pip install -r requirements_all.txt -c homeassistant/package_constraints.txt
+      pip install -r requirements_test.txt -c homeassistant/package_constraints.txt
+    displayName: 'Create Virtual Environment & Install Requirements'
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+    displayName: 'Save artifacts based on Requirements'
+    inputs:
+      keyfile: 'requirements_all.txt, requirements_test.txt, .cache'
+      targetfolder: './venv'
+      vstsFeed: '$(ArtifactFeed)'
+
+  - script: | 
+      . venv/bin/activate
+      pip install -e .
+    displayName: 'Install Home Assistant for python $(python.version)' 
+  
+  - script: |
+      . venv/bin/activate
+      pylint homeassistant
+    displayName: 'Run pylint'
+
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -0,0 +1,168 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  tags:
+    include:
+    - '*'
+pr: none
+variables:
+  - name: versionBuilder
+    value: '4.5'
+  - group: docker
+  - group: github
+  - group: twine
+
+
+jobs:
+
+
+- job: 'VersionValidate'
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - task: UsePythonVersion@0
+    displayName: 'Use Python 3.7'
+    inputs:
+      versionSpec: '3.7'
+  - script: |
+      setup_version="$(python setup.py -V)"
+      branch_version="$(Build.SourceBranchName)"
+
+      if [ "${setup_version}" != "${branch_version}" ]; then
+        echo "Version of tag ${branch_version} don't match with ${setup_version}!"
+        exit 1
+      fi
+    displayName: 'Check version of branch/tag'
+  - script: |
+      sudo apt-get install -y --no-install-recommends \
+        jq curl
+
+      release="$(Build.SourceBranchName)"
+      created_by="$(curl -s https://api.github.com/repos/home-assistant/home-assistant/releases/tags/${release} | jq --raw-output '.author.login')"
+
+      if [[ "${created_by}" =~ ^(balloob|pvizeli|fabaff|robbiet480)$ ]]; then
+        exit 0
+      fi
+
+      echo "${created_by} is not allowed to create an release!"
+      exit 1
+    displayName: 'Check rights'
+
+
+- job: 'ReleasePython'
+  condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags'), succeeded('VersionValidate'))
+  dependsOn:
+  - 'VersionValidate'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - task: UsePythonVersion@0
+    displayName: 'Use Python 3.7'
+    inputs:
+      versionSpec: '3.7'
+  - script: pip install twine wheel
+    displayName: 'Install tools'
+  - script: python setup.py sdist bdist_wheel
+    displayName: 'Build package'
+  - script: |
+      export TWINE_USERNAME="$(twineUser)"
+      export TWINE_PASSWORD="$(twinePassword)"
+      
+      twine upload dist/* --skip-existing
+    displayName: 'Upload pypi'
+
+
+- job: 'ReleaseDocker'
+  condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags'), succeeded('VersionValidate'))
+  dependsOn:
+  - 'VersionValidate'
+  timeoutInMinutes: 240
+  pool:
+    vmImage: 'ubuntu-latest'
+  strategy:
+    maxParallel: 5
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+        buildMachine: 'qemux86-64,intel-nuc'
+      i386:
+        buildArch: 'i386'
+        buildMachine: 'qemux86'
+      armhf:
+        buildArch: 'armhf'
+        buildMachine: 'qemuarm,raspberrypi'
+      armv7:
+        buildArch: 'armv7'
+        buildMachine: 'raspberrypi2,raspberrypi3,odroid-xu,tinker'
+      aarch64:
+        buildArch: 'aarch64'
+        buildMachine: 'qemuarm-64,raspberrypi3-64,odroid-c2,orangepi-prime'
+  steps:
+  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
+    displayName: 'Docker hub login'
+  - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
+    displayName: 'Install Builder'
+  - script: |
+      set -e
+
+      sudo docker run --rm --privileged \
+        -v ~/.docker:/root/.docker \
+        -v /run/docker.sock:/run/docker.sock:rw \
+        homeassistant/amd64-builder:$(versionBuilder) \
+        --homeassistant $(Build.SourceBranchName) "--$(buildArch)" \
+        -r https://github.com/home-assistant/hassio-homeassistant \
+        -t generic --docker-hub homeassistant
+
+      sudo docker run --rm --privileged \
+        -v ~/.docker:/root/.docker \
+        -v /run/docker.sock:/run/docker.sock:rw \
+        homeassistant/amd64-builder:$(versionBuilder) \
+        --homeassistant-machine "$(Build.SourceBranchName)=$(buildMachine)" \
+        -r https://github.com/home-assistant/hassio-homeassistant \
+        -t machine --docker-hub homeassistant
+    displayName: 'Build Release'
+
+
+- job: 'ReleaseHassio'
+  condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags'), succeeded('ReleaseDocker'))
+  dependsOn:
+    - 'ReleaseDocker'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - script: |
+      sudo apt-get install -y --no-install-recommends \
+        git jq curl
+
+      git config --global user.name "Pascal Vizeli"
+      git config --global user.email "pvizeli@syshack.ch"
+      git config --global credential.helper store
+
+      echo "https://$(githubToken):x-oauth-basic@github.com" > $HOME/.git-credentials
+    displayName: 'Install requirements'
+  - script: |
+      set -e
+
+      version="$(Build.SourceBranchName)"
+
+      git clone https://github.com/home-assistant/hassio-version
+      cd hassio-version
+
+      dev_version="$(jq --raw-output '.homeassistant.default' dev.json)"
+      beta_version="$(jq --raw-output '.homeassistant.default' beta.json)"
+      stable_version="$(jq --raw-output '.homeassistant.default' stable.json)"
+
+      if [[ "$version" =~ b ]]; then
+        sed -i "s|$dev_version|$version|g" dev.json
+        sed -i "s|$beta_version|$version|g" beta.json
+      else
+        sed -i "s|$dev_version|$version|g" dev.json
+        sed -i "s|$beta_version|$version|g" beta.json
+        sed -i "s|$stable_version|$version|g" stable.json
+      fi
+
+      git commit -am "Bump Home Assistant $version"
+      git push
+    displayName: 'Update version files'
--- a/azure-pipelines-wheels.yml
+++ b/azure-pipelines-wheels.yml
@@ -0,0 +1,100 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dev
+  paths:
+    include:
+    - requirements_all.txt
+pr: none
+variables:
+  - name: versionWheels
+    value: '0.7'
+  - group: wheels
+
+
+jobs:
+
+- job: 'Wheels'
+  condition: or(eq(variables['Build.SourceBranchName'], 'dev'), eq(variables['Build.SourceBranchName'], 'master'))
+  timeoutInMinutes: 360
+  pool:
+    vmImage: 'ubuntu-latest'
+  strategy:
+    maxParallel: 3
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+      i386:
+        buildArch: 'i386'
+      armhf:
+        buildArch: 'armhf'
+      armv7:
+        buildArch: 'armv7'
+      aarch64:
+        buildArch: 'aarch64'
+  steps:
+  - script: |
+      sudo apt-get update
+      sudo apt-get install -y --no-install-recommends \
+        qemu-user-static \
+        binfmt-support \
+        curl
+
+      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+      sudo update-binfmts --enable qemu-arm
+      sudo update-binfmts --enable qemu-aarch64
+    displayName: 'Initial cross build'
+  - script: |
+      mkdir -p .ssh
+      echo -e "-----BEGIN RSA PRIVATE KEY-----\n$(wheelsSSH)\n-----END RSA PRIVATE KEY-----" >> .ssh/id_rsa
+      ssh-keyscan -H $(wheelsHost) >> .ssh/known_hosts
+      chmod 600 .ssh/*
+    displayName: 'Install ssh key'
+  - script: sudo docker pull homeassistant/$(buildArch)-wheels:$(versionWheels)
+    displayName: 'Install wheels builder'
+  - script: |
+      cp requirements_all.txt requirements_wheels.txt
+      if [[ "$(Build.Reason)" =~ (Schedule|Manual) ]]; then
+        touch requirements_diff.txt
+      else
+        curl -s -o requirements_diff.txt https://raw.githubusercontent.com/home-assistant/home-assistant/master/requirements_all.txt
+      fi
+
+      requirement_files="requirements_wheels.txt requirements_diff.txt"
+      for requirement_file in ${requirement_files}; do
+        sed -i "s|# pytradfri|pytradfri|g" ${requirement_file}
+        sed -i "s|# pybluez|pybluez|g" ${requirement_file}
+        sed -i "s|# bluepy|bluepy|g" ${requirement_file}
+        sed -i "s|# beacontools|beacontools|g" ${requirement_file}
+        sed -i "s|# RPi.GPIO|RPi.GPIO|g" ${requirement_file}
+        sed -i "s|# raspihats|raspihats|g" ${requirement_file}
+        sed -i "s|# rpi-rf|rpi-rf|g" ${requirement_file}
+        sed -i "s|# blinkt|blinkt|g" ${requirement_file}
+        sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
+        sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
+        sed -i "s|# evdev|evdev|g" ${requirement_file}
+        sed -i "s|# smbus-cffi|smbus-cffi|g" ${requirement_file}
+        sed -i "s|# i2csense|i2csense|g" ${requirement_file}
+        sed -i "s|# python-eq3bt|python-eq3bt|g" ${requirement_file}
+        sed -i "s|# pycups|pycups|g" ${requirement_file}
+        sed -i "s|# homekit|homekit|g" ${requirement_file}
+        sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
+        sed -i "s|# decora|decora|g" ${requirement_file}
+        sed -i "s|# PySwitchbot|PySwitchbot|g" ${requirement_file}
+        sed -i "s|# pySwitchmate|pySwitchmate|g" ${requirement_file}
+        sed -i "s|# face_recognition|face_recognition|g" ${requirement_file}
+      done
+    displayName: 'Prepare requirements files for Hass.io'
+  - script: |
+      sudo docker run --rm -v $(pwd):/data:ro -v $(pwd)/.ssh:/root/.ssh:rw \
+        homeassistant/$(buildArch)-wheels:$(versionWheels) \
+        --apk "build-base;cmake;git;linux-headers;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;autoconf;automake;cups-dev;linux-headers;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev" \
+        --index $(wheelsIndex) \
+        --requirement requirements_wheels.txt \
+        --requirement-diff requirements_diff.txt \
+        --upload rsync \
+        --remote wheels@$(wheelsHost):/opt/wheels
+    displayName: 'Run wheels build'
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -7,8 +7,9 @@ import platform
 import subprocess
 import sys
 import threading
-from typing import List, Dict, Any  # noqa pylint: disable=unused-import
-
+from typing import (  # noqa pylint: disable=unused-import
+    List, Dict, Any, TYPE_CHECKING
+)

 from homeassistant import monkey_patch
 from homeassistant.const import (
@@ -18,6 +19,9 @@ from homeassistant.const import (
    RESTART_EXIT_CODE,
 )

+if TYPE_CHECKING:
+    from homeassistant import core
+

 def set_loop() -> None:
    """Attempt to use uvloop."""
@@ -86,10 +90,12 @@ def ensure_config_path(config_dir: str) -> None:
            sys.exit(1)


-def ensure_config_file(config_dir: str) -> str:
+async def ensure_config_file(hass: 'core.HomeAssistant', config_dir: str) \
+        -> str:
    """Ensure configuration file exists."""
    import homeassistant.config as config_util
-    config_path = config_util.ensure_config_exists(config_dir)
+    config_path = await config_util.async_ensure_config_exists(
+        hass, config_dir)

    if config_path is None:
        print('Error getting configuration path')
@@ -261,6 +267,7 @@ def cmdline() -> List[str]:
 async def setup_and_run_hass(config_dir: str,
                             args: argparse.Namespace) -> int:
    """Set up HASS and run."""
+    # pylint: disable=redefined-outer-name
    from homeassistant import bootstrap, core

    hass = core.HomeAssistant()
@@ -275,7 +282,7 @@ async def setup_and_run_hass(config_dir: str,
            skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days,
            log_file=args.log_file, log_no_color=args.log_no_color)
    else:
-        config_file = ensure_config_file(config_dir)
+        config_file = await ensure_config_file(hass, config_dir)
        print('Config directory:', config_dir)
        await bootstrap.async_from_config_file(
            config_file, hass, verbose=args.verbose, skip_pip=args.skip_pip,
@@ -390,7 +397,7 @@ def main() -> int:
    if exit_code == RESTART_EXIT_CODE and not args.runner:
        try_to_restart()

-    return exit_code  # type: ignore # mypy cannot yet infer it
+    return exit_code  # type: ignore


 if __name__ == "__main__":
--- a/homeassistant/auth/init.py
+++ b/homeassistant/auth/init.py
@@ -100,9 +100,21 @@ class AuthManager:
        """Return a list of available auth modules."""
        return list(self._mfa_modules.values())

+    def get_auth_provider(self, provider_type: str, provider_id: str) \
+            -> Optional[AuthProvider]:
+        """Return an auth provider, None if not found."""
+        return self._providers.get((provider_type, provider_id))
+
+    def get_auth_providers(self, provider_type: str) \
+            -> List[AuthProvider]:
+        """Return a List of auth provider of one type, Empty if not found."""
+        return [provider
+                for (p_type, _), provider in self._providers.items()
+                if p_type == provider_type]
+
    def get_auth_mfa_module(self, module_id: str) \
            -> Optional[MultiFactorAuthModule]:
-        """Return an multi-factor auth module, None if not found."""
+        """Return a multi-factor auth module, None if not found."""
        return self._mfa_modules.get(module_id)

    async def async_get_users(self) -> List[models.User]:
@@ -113,6 +125,11 @@ class AuthManager:
        """Retrieve a user."""
        return await self._store.async_get_user(user_id)

+    async def async_get_owner(self) -> Optional[models.User]:
+        """Retrieve the owner."""
+        users = await self.async_get_users()
+        return next((user for user in users if user.is_owner), None)
+
    async def async_get_group(self, group_id: str) -> Optional[models.Group]:
        """Retrieve all groups."""
        return await self._store.async_get_group(group_id)
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -11,13 +11,14 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import dt as dt_util

 from . import models
-from .const import GROUP_ID_ADMIN, GROUP_ID_READ_ONLY
+from .const import GROUP_ID_ADMIN, GROUP_ID_USER, GROUP_ID_READ_ONLY
 from .permissions import PermissionLookup, system_policies
 from .permissions.types import PolicyType  # noqa: F401

 STORAGE_VERSION = 1
 STORAGE_KEY = 'auth'
 GROUP_NAME_ADMIN = 'Administrators'
+GROUP_NAME_USER = "Users"
 GROUP_NAME_READ_ONLY = 'Read Only'


@@ -38,6 +39,7 @@ class AuthStore:
        self._perm_lookup = None  # type: Optional[PermissionLookup]
        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
                                                 private=True)
+        self._lock = asyncio.Lock()

    async def async_get_groups(self) -> List[models.Group]:
        """Retrieve all users."""
@@ -272,8 +274,16 @@ class AuthStore:

    async def _async_load(self) -> None:
        """Load the users."""
-        [ent_reg, data] = await asyncio.gather(
+        async with self._lock:
+            if self._users is not None:
+                return
+            await self._async_load_task()
+
+    async def _async_load_task(self) -> None:
+        """Load the users."""
+        [ent_reg, dev_reg, data] = await asyncio.gather(
            self.hass.helpers.entity_registry.async_get_registry(),
+            self.hass.helpers.device_registry.async_get_registry(),
            self._store.async_load(),
        )

@@ -282,7 +292,9 @@ class AuthStore:
        if self._users is not None:
            return

-        self._perm_lookup = perm_lookup = PermissionLookup(ent_reg)
+        self._perm_lookup = perm_lookup = PermissionLookup(
+            ent_reg, dev_reg
+        )

        if data is None:
            self._set_defaults()
@@ -297,6 +309,7 @@ class AuthStore:
        # 1. Data from a recent version which has a single group without policy
        # 2. Data from old version which has no groups
        has_admin_group = False
+        has_user_group = False
        has_read_only_group = False
        group_without_policy = None

@@ -314,6 +327,13 @@ class AuthStore:
                policy = system_policies.ADMIN_POLICY
                system_generated = True

+            elif group_dict['id'] == GROUP_ID_USER:
+                has_user_group = True
+
+                name = GROUP_NAME_USER
+                policy = system_policies.USER_POLICY
+                system_generated = True
+
            elif group_dict['id'] == GROUP_ID_READ_ONLY:
                has_read_only_group = True

@@ -361,6 +381,10 @@ class AuthStore:
            read_only_group = _system_read_only_group()
            groups[read_only_group.id] = read_only_group

+        if not has_user_group:
+            user_group = _system_user_group()
+            groups[user_group.id] = user_group
+
        for user_dict in data['users']:
            # Collect the users group.
            user_groups = []
@@ -475,7 +499,7 @@ class AuthStore:
                'name': group.name
            }  # type: Dict[str, Any]

-            if group.id not in (GROUP_ID_READ_ONLY, GROUP_ID_ADMIN):
+            if not group.system_generated:
                g_dict['policy'] = group.policy

            groups.append(g_dict)
@@ -528,6 +552,8 @@ class AuthStore:
        groups = OrderedDict()  # type: Dict[str, models.Group]
        admin_group = _system_admin_group()
        groups[admin_group.id] = admin_group
+        user_group = _system_user_group()
+        groups[user_group.id] = user_group
        read_only_group = _system_read_only_group()
        groups[read_only_group.id] = read_only_group
        self._groups = groups
@@ -543,6 +569,16 @@ def _system_admin_group() -> models.Group:
    )


+def _system_user_group() -> models.Group:
+    """Create system user group."""
+    return models.Group(
+        name=GROUP_NAME_USER,
+        id=GROUP_ID_USER,
+        policy=system_policies.USER_POLICY,
+        system_generated=True,
+    )
+
+
 def _system_read_only_group() -> models.Group:
    """Create read only group."""
    return models.Group(
--- a/homeassistant/auth/const.py
+++ b/homeassistant/auth/const.py
@@ -5,4 +5,5 @@ ACCESS_TOKEN_EXPIRATION = timedelta(minutes=30)
 MFA_SESSION_EXPIRATION = timedelta(minutes=5)

 GROUP_ID_ADMIN = 'system-admin'
+GROUP_ID_USER = 'system-users'
 GROUP_ID_READ_ONLY = 'system-read-only'
--- a/homeassistant/auth/mfa_modules/notify.py
+++ b/homeassistant/auth/mfa_modules/notify.py
@@ -2,6 +2,7 @@

 Sending HOTP through notify service
 """
+import asyncio
 import logging
 from collections import OrderedDict
 from typing import Any, Dict, Optional, List
@@ -17,7 +18,7 @@ from homeassistant.helpers import config_validation as cv
 from . import MultiFactorAuthModule, MULTI_FACTOR_AUTH_MODULES, \
    MULTI_FACTOR_AUTH_MODULE_SCHEMA, SetupFlow

-REQUIREMENTS = ['pyotp==2.2.6']
+REQUIREMENTS = ['pyotp==2.2.7']

 CONF_MESSAGE = 'message'

@@ -90,6 +91,7 @@ class NotifyAuthModule(MultiFactorAuthModule):
        self._include = config.get(CONF_INCLUDE, [])
        self._exclude = config.get(CONF_EXCLUDE, [])
        self._message_template = config[CONF_MESSAGE]
+        self._init_lock = asyncio.Lock()

    @property
    def input_schema(self) -> vol.Schema:
@@ -98,15 +100,19 @@ class NotifyAuthModule(MultiFactorAuthModule):

    async def _async_load(self) -> None:
        """Load stored data."""
-        data = await self._user_store.async_load()
+        async with self._init_lock:
+            if self._user_settings is not None:
+                return

-        if data is None:
-            data = {STORAGE_USERS: {}}
+            data = await self._user_store.async_load()

-        self._user_settings = {
-            user_id: NotifySetting(**setting)
-            for user_id, setting in data.get(STORAGE_USERS, {}).items()
-        }
+            if data is None:
+                data = {STORAGE_USERS: {}}
+
+            self._user_settings = {
+                user_id: NotifySetting(**setting)
+                for user_id, setting in data.get(STORAGE_USERS, {}).items()
+            }

    async def _async_save(self) -> None:
        """Save data."""
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -1,4 +1,5 @@
 """Time-based One Time Password auth module."""
+import asyncio
 import logging
 from io import BytesIO
 from typing import Any, Dict, Optional, Tuple  # noqa: F401
@@ -11,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from . import MultiFactorAuthModule, MULTI_FACTOR_AUTH_MODULES, \
    MULTI_FACTOR_AUTH_MODULE_SCHEMA, SetupFlow

-REQUIREMENTS = ['pyotp==2.2.6', 'PyQRCode==1.2.1']
+REQUIREMENTS = ['pyotp==2.2.7', 'PyQRCode==1.2.1']

 CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({
 }, extra=vol.PREVENT_EXTRA)
@@ -68,6 +69,7 @@ class TotpAuthModule(MultiFactorAuthModule):
        self._users = None  # type: Optional[Dict[str, str]]
        self._user_store = hass.helpers.storage.Store(
            STORAGE_VERSION, STORAGE_KEY, private=True)
+        self._init_lock = asyncio.Lock()

    @property
    def input_schema(self) -> vol.Schema:
@@ -76,12 +78,16 @@ class TotpAuthModule(MultiFactorAuthModule):

    async def _async_load(self) -> None:
        """Load stored data."""
-        data = await self._user_store.async_load()
+        async with self._init_lock:
+            if self._users is not None:
+                return

-        if data is None:
-            data = {STORAGE_USERS: {}}
+            data = await self._user_store.async_load()

-        self._users = data.get(STORAGE_USERS, {})
+            if data is None:
+                data = {STORAGE_USERS: {}}
+
+            self._users = data.get(STORAGE_USERS, {})

    async def _async_save(self) -> None:
        """Save data."""
--- a/homeassistant/auth/permissions/init.py
+++ b/homeassistant/auth/permissions/init.py
@@ -11,6 +11,7 @@ from .models import PermissionLookup
 from .types import PolicyType
 from .entities import ENTITY_POLICY_SCHEMA, compile_entities
 from .merge import merge_policies  # noqa
+from .util import test_all


 POLICY_SCHEMA = vol.Schema({
@@ -29,6 +30,10 @@ class AbstractPermissions:
        """Return a function that can test entity access."""
        raise NotImplementedError

+    def access_all_entities(self, key: str) -> bool:
+        """Check if we have a certain access to all entities."""
+        raise NotImplementedError
+
    def check_entity(self, entity_id: str, key: str) -> bool:
        """Check if we can access entity."""
        entity_func = self._cached_entity_func
@@ -48,6 +53,10 @@ class PolicyPermissions(AbstractPermissions):
        self._policy = policy
        self._perm_lookup = perm_lookup

+    def access_all_entities(self, key: str) -> bool:
+        """Check if we have a certain access to all entities."""
+        return test_all(self._policy.get(CAT_ENTITIES), key)
+
    def _entity_func(self) -> Callable[[str, str], bool]:
        """Return a function that can test entity access."""
        return compile_entities(self._policy.get(CAT_ENTITIES),
@@ -65,6 +74,10 @@ class _OwnerPermissions(AbstractPermissions):

    # pylint: disable=no-self-use

+    def access_all_entities(self, key: str) -> bool:
+        """Check if we have a certain access to all entities."""
+        return True
+
    def _entity_func(self) -> Callable[[str, str], bool]:
        """Return a function that can test entity access."""
        return lambda entity_id, key: True
--- a/homeassistant/auth/permissions/entities.py
+++ b/homeassistant/auth/permissions/entities.py
@@ -1,12 +1,14 @@
 """Entity permissions."""
-from functools import wraps
-from typing import Callable, List, Union  # noqa: F401
+from collections import OrderedDict
+from typing import Callable, Optional  # noqa: F401

 import voluptuous as vol

 from .const import SUBCAT_ALL, POLICY_READ, POLICY_CONTROL, POLICY_EDIT
 from .models import PermissionLookup
-from .types import CategoryType, ValueType
+from .types import CategoryType, SubCategoryDict, ValueType
+# pylint: disable=unused-import
+from .util import SubCatLookupType, lookup_all, compile_policy  # noqa

 SINGLE_ENTITY_SCHEMA = vol.Any(True, vol.Schema({
    vol.Optional(POLICY_READ): True,
@@ -15,6 +17,7 @@ SINGLE_ENTITY_SCHEMA = vol.Any(True, vol.Schema({
 }))

 ENTITY_DOMAINS = 'domains'
+ENTITY_AREAS = 'area_ids'
 ENTITY_DEVICE_IDS = 'device_ids'
 ENTITY_ENTITY_IDS = 'entity_ids'

@@ -24,148 +27,65 @@ ENTITY_VALUES_SCHEMA = vol.Any(True, vol.Schema({

 ENTITY_POLICY_SCHEMA = vol.Any(True, vol.Schema({
    vol.Optional(SUBCAT_ALL): SINGLE_ENTITY_SCHEMA,
+    vol.Optional(ENTITY_AREAS): ENTITY_VALUES_SCHEMA,
    vol.Optional(ENTITY_DEVICE_IDS): ENTITY_VALUES_SCHEMA,
    vol.Optional(ENTITY_DOMAINS): ENTITY_VALUES_SCHEMA,
    vol.Optional(ENTITY_ENTITY_IDS): ENTITY_VALUES_SCHEMA,
 }))


-def _entity_allowed(schema: ValueType, key: str) \
-        -> Union[bool, None]:
-    """Test if an entity is allowed based on the keys."""
-    if schema is None or isinstance(schema, bool):
-        return schema
-    assert isinstance(schema, dict)
-    return schema.get(key)
+def _lookup_domain(perm_lookup: PermissionLookup,
+                   domains_dict: SubCategoryDict,
+                   entity_id: str) -> Optional[ValueType]:
+    """Look up entity permissions by domain."""
+    return domains_dict.get(entity_id.split(".", 1)[0])
+
+
+def _lookup_area(perm_lookup: PermissionLookup, area_dict: SubCategoryDict,
+                 entity_id: str) -> Optional[ValueType]:
+    """Look up entity permissions by area."""
+    entity_entry = perm_lookup.entity_registry.async_get(entity_id)
+
+    if entity_entry is None or entity_entry.device_id is None:
+        return None
+
+    device_entry = perm_lookup.device_registry.async_get(
+        entity_entry.device_id
+    )
+
+    if device_entry is None or device_entry.area_id is None:
+        return None
+
+    return area_dict.get(device_entry.area_id)
+
+
+def _lookup_device(perm_lookup: PermissionLookup,
+                   devices_dict: SubCategoryDict,
+                   entity_id: str) -> Optional[ValueType]:
+    """Look up entity permissions by device."""
+    entity_entry = perm_lookup.entity_registry.async_get(entity_id)
+
+    if entity_entry is None or entity_entry.device_id is None:
+        return None
+
+    return devices_dict.get(entity_entry.device_id)
+
+
+def _lookup_entity_id(perm_lookup: PermissionLookup,
+                      entities_dict: SubCategoryDict,
+                      entity_id: str) -> Optional[ValueType]:
+    """Look up entity permission by entity id."""
+    return entities_dict.get(entity_id)


 def compile_entities(policy: CategoryType, perm_lookup: PermissionLookup) \
        -> Callable[[str, str], bool]:
    """Compile policy into a function that tests policy."""
-    # None, Empty Dict, False
-    if not policy:
-        def apply_policy_deny_all(entity_id: str, key: str) -> bool:
-            """Decline all."""
-            return False
+    subcategories = OrderedDict()  # type: SubCatLookupType
+    subcategories[ENTITY_ENTITY_IDS] = _lookup_entity_id
+    subcategories[ENTITY_DEVICE_IDS] = _lookup_device
+    subcategories[ENTITY_AREAS] = _lookup_area
+    subcategories[ENTITY_DOMAINS] = _lookup_domain
+    subcategories[SUBCAT_ALL] = lookup_all

-        return apply_policy_deny_all
-
-    if policy is True:
-        def apply_policy_allow_all(entity_id: str, key: str) -> bool:
-            """Approve all."""
-            return True
-
-        return apply_policy_allow_all
-
-    assert isinstance(policy, dict)
-
-    domains = policy.get(ENTITY_DOMAINS)
-    device_ids = policy.get(ENTITY_DEVICE_IDS)
-    entity_ids = policy.get(ENTITY_ENTITY_IDS)
-    all_entities = policy.get(SUBCAT_ALL)
-
-    funcs = []  # type: List[Callable[[str, str], Union[None, bool]]]
-
-    # The order of these functions matter. The more precise are at the top.
-    # If a function returns None, they cannot handle it.
-    # If a function returns a boolean, that's the result to return.
-
-    # Setting entity_ids to a boolean is final decision for permissions
-    # So return right away.
-    if isinstance(entity_ids, bool):
-        def allowed_entity_id_bool(entity_id: str, key: str) -> bool:
-            """Test if allowed entity_id."""
-            return entity_ids  # type: ignore
-
-        return allowed_entity_id_bool
-
-    if entity_ids is not None:
-        def allowed_entity_id_dict(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed entity_id."""
-            return _entity_allowed(
-                entity_ids.get(entity_id), key)  # type: ignore
-
-        funcs.append(allowed_entity_id_dict)
-
-    if isinstance(device_ids, bool):
-        def allowed_device_id_bool(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed device_id."""
-            return device_ids
-
-        funcs.append(allowed_device_id_bool)
-
-    elif device_ids is not None:
-        def allowed_device_id_dict(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed device_id."""
-            entity_entry = perm_lookup.entity_registry.async_get(entity_id)
-
-            if entity_entry is None or entity_entry.device_id is None:
-                return None
-
-            return _entity_allowed(
-                device_ids.get(entity_entry.device_id), key   # type: ignore
-            )
-
-        funcs.append(allowed_device_id_dict)
-
-    if isinstance(domains, bool):
-        def allowed_domain_bool(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed domain."""
-            return domains
-
-        funcs.append(allowed_domain_bool)
-
-    elif domains is not None:
-        def allowed_domain_dict(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed domain."""
-            domain = entity_id.split(".", 1)[0]
-            return _entity_allowed(domains.get(domain), key)  # type: ignore
-
-        funcs.append(allowed_domain_dict)
-
-    if isinstance(all_entities, bool):
-        def allowed_all_entities_bool(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed domain."""
-            return all_entities
-        funcs.append(allowed_all_entities_bool)
-
-    elif all_entities is not None:
-        def allowed_all_entities_dict(entity_id: str, key: str) \
-                -> Union[None, bool]:
-            """Test if allowed domain."""
-            return _entity_allowed(all_entities, key)
-        funcs.append(allowed_all_entities_dict)
-
-    # Can happen if no valid subcategories specified
-    if not funcs:
-        def apply_policy_deny_all_2(entity_id: str, key: str) -> bool:
-            """Decline all."""
-            return False
-
-        return apply_policy_deny_all_2
-
-    if len(funcs) == 1:
-        func = funcs[0]
-
-        @wraps(func)
-        def apply_policy_func(entity_id: str, key: str) -> bool:
-            """Apply a single policy function."""
-            return func(entity_id, key) is True
-
-        return apply_policy_func
-
-    def apply_policy_funcs(entity_id: str, key: str) -> bool:
-        """Apply several policy functions."""
-        for func in funcs:
-            result = func(entity_id, key)
-            if result is not None:
-                return result
-        return False
-
-    return apply_policy_funcs
+    return compile_policy(policy, subcategories, perm_lookup)
--- a/homeassistant/auth/permissions/models.py
+++ b/homeassistant/auth/permissions/models.py
@@ -8,6 +8,9 @@ if TYPE_CHECKING:
    from homeassistant.helpers import (  # noqa
        entity_registry as ent_reg,
    )
+    from homeassistant.helpers import (  # noqa
+        device_registry as dev_reg,
+    )


@attr.s(slots=True)
@@ -15,3 +18,4 @@ class PermissionLookup:
    """Class to hold data for permission lookups."""

    entity_registry = attr.ib(type='ent_reg.EntityRegistry')
+    device_registry = attr.ib(type='dev_reg.DeviceRegistry')
--- a/homeassistant/auth/permissions/system_policies.py
+++ b/homeassistant/auth/permissions/system_policies.py
@@ -5,6 +5,10 @@ ADMIN_POLICY = {
    CAT_ENTITIES: True,
 }

+USER_POLICY = {
+    CAT_ENTITIES: True,
+}
+
 READ_ONLY_POLICY = {
    CAT_ENTITIES: {
        SUBCAT_ALL: {
--- a/homeassistant/auth/permissions/types.py
+++ b/homeassistant/auth/permissions/types.py
@@ -10,9 +10,11 @@ ValueType = Union[
    None
 ]

+# Example: entities.domains = { light: … }
+SubCategoryDict = Mapping[str, ValueType]
+
 SubCategoryType = Union[
-    # Example: entities.domains = { light: … }
-    Mapping[str, ValueType],
+    SubCategoryDict,
    bool,
    None
 ]
--- a/homeassistant/auth/permissions/util.py
+++ b/homeassistant/auth/permissions/util.py
@@ -0,0 +1,112 @@
+"""Helpers to deal with permissions."""
+from functools import wraps
+
+from typing import Callable, Dict, List, Optional, Union, cast  # noqa: F401
+
+from .const import SUBCAT_ALL
+from .models import PermissionLookup
+from .types import CategoryType, SubCategoryDict, ValueType
+
+LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str],
+                      Optional[ValueType]]
+SubCatLookupType = Dict[str, LookupFunc]
+
+
+def lookup_all(perm_lookup: PermissionLookup, lookup_dict: SubCategoryDict,
+               object_id: str) -> ValueType:
+    """Look up permission for all."""
+    # In case of ALL category, lookup_dict IS the schema.
+    return cast(ValueType, lookup_dict)
+
+
+def compile_policy(
+        policy: CategoryType, subcategories: SubCatLookupType,
+        perm_lookup: PermissionLookup
+    ) -> Callable[[str, str], bool]:  # noqa
+    """Compile policy into a function that tests policy.
+    Subcategories are mapping key -> lookup function, ordered by highest
+    priority first.
+    """
+    # None, False, empty dict
+    if not policy:
+        def apply_policy_deny_all(entity_id: str, key: str) -> bool:
+            """Decline all."""
+            return False
+
+        return apply_policy_deny_all
+
+    if policy is True:
+        def apply_policy_allow_all(entity_id: str, key: str) -> bool:
+            """Approve all."""
+            return True
+
+        return apply_policy_allow_all
+
+    assert isinstance(policy, dict)
+
+    funcs = []  # type: List[Callable[[str, str], Union[None, bool]]]
+
+    for key, lookup_func in subcategories.items():
+        lookup_value = policy.get(key)
+
+        # If any lookup value is `True`, it will always be positive
+        if isinstance(lookup_value, bool):
+            return lambda object_id, key: True
+
+        if lookup_value is not None:
+            funcs.append(_gen_dict_test_func(
+                perm_lookup, lookup_func, lookup_value))
+
+    if len(funcs) == 1:
+        func = funcs[0]
+
+        @wraps(func)
+        def apply_policy_func(object_id: str, key: str) -> bool:
+            """Apply a single policy function."""
+            return func(object_id, key) is True
+
+        return apply_policy_func
+
+    def apply_policy_funcs(object_id: str, key: str) -> bool:
+        """Apply several policy functions."""
+        for func in funcs:
+            result = func(object_id, key)
+            if result is not None:
+                return result
+        return False
+
+    return apply_policy_funcs
+
+
+def _gen_dict_test_func(
+        perm_lookup: PermissionLookup,
+        lookup_func: LookupFunc,
+        lookup_dict: SubCategoryDict
+    ) -> Callable[[str, str], Optional[bool]]:  # noqa
+    """Generate a lookup function."""
+    def test_value(object_id: str, key: str) -> Optional[bool]:
+        """Test if permission is allowed based on the keys."""
+        schema = lookup_func(
+            perm_lookup, lookup_dict, object_id)  # type: ValueType
+
+        if schema is None or isinstance(schema, bool):
+            return schema
+
+        assert isinstance(schema, dict)
+
+        return schema.get(key)
+
+    return test_value
+
+
+def test_all(policy: CategoryType, key: str) -> bool:
+    """Test if a policy has an ALL access for a specific key."""
+    if not isinstance(policy, dict):
+        return bool(policy)
+
+    all_policy = policy.get(SUBCAT_ALL)
+
+    if not isinstance(all_policy, dict):
+        return bool(all_policy)
+
+    return all_policy.get(key, False)
--- a/homeassistant/auth/providers/homeassistant.py
+++ b/homeassistant/auth/providers/homeassistant.py
@@ -1,4 +1,5 @@
 """Home Assistant auth provider."""
+import asyncio
 import base64
 from collections import OrderedDict
 import logging
@@ -204,15 +205,21 @@ class HassAuthProvider(AuthProvider):

    DEFAULT_TITLE = 'Home Assistant Local'

-    data = None
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        """Initialize an Home Assistant auth provider."""
+        super().__init__(*args, **kwargs)
+        self.data = None  # type: Optional[Data]
+        self._init_lock = asyncio.Lock()

    async def async_initialize(self) -> None:
        """Initialize the auth provider."""
-        if self.data is not None:
-            return
+        async with self._init_lock:
+            if self.data is not None:
+                return

-        self.data = Data(self.hass)
-        await self.data.async_load()
+            data = Data(self.hass)
+            await data.async_load()
+            self.data = data

    async def async_login_flow(
            self, context: Optional[Dict]) -> LoginFlow:
--- a/homeassistant/auth/providers/legacy_api_password.py
+++ b/homeassistant/auth/providers/legacy_api_password.py
@@ -4,27 +4,23 @@ Support Legacy API password auth provider.
 It will be removed when auth system production ready
 """
 import hmac
-from typing import Any, Dict, Optional, cast, TYPE_CHECKING
+from typing import Any, Dict, Optional, cast

 import voluptuous as vol

 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+import homeassistant.helpers.config_validation as cv

 from . import AuthProvider, AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, LoginFlow
 from .. import AuthManager
 from ..models import Credentials, UserMeta, User

-if TYPE_CHECKING:
-    from homeassistant.components.http import HomeAssistantHTTP  # noqa: F401
-
-
-USER_SCHEMA = vol.Schema({
-    vol.Required('username'): str,
-})
-
+AUTH_PROVIDER_TYPE = 'legacy_api_password'
+CONF_API_PASSWORD = 'api_password'

 CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
+    vol.Required(CONF_API_PASSWORD): cv.string,
 }, extra=vol.PREVENT_EXTRA)

 LEGACY_USER_NAME = 'Legacy API password user'
@@ -34,40 +30,45 @@ class InvalidAuthError(HomeAssistantError):
    """Raised when submitting invalid authentication."""


-async def async_get_user(hass: HomeAssistant) -> User:
-    """Return the legacy API password user."""
+async def async_validate_password(hass: HomeAssistant, password: str)\
+        -> Optional[User]:
+    """Return a user if password is valid. None if not."""
    auth = cast(AuthManager, hass.auth)  # type: ignore
-    found = None
-
-    for prv in auth.auth_providers:
-        if prv.type == 'legacy_api_password':
-            found = prv
-            break
-
-    if found is None:
+    providers = auth.get_auth_providers(AUTH_PROVIDER_TYPE)
+    if not providers:
        raise ValueError('Legacy API password provider not found')

-    return await auth.async_get_or_create_user(
-        await found.async_get_or_create_credentials({})
-    )
+    try:
+        provider = cast(LegacyApiPasswordAuthProvider, providers[0])
+        provider.async_validate_login(password)
+        return await auth.async_get_or_create_user(
+            await provider.async_get_or_create_credentials({})
+        )
+    except InvalidAuthError:
+        return None


-@AUTH_PROVIDERS.register('legacy_api_password')
+@AUTH_PROVIDERS.register(AUTH_PROVIDER_TYPE)
 class LegacyApiPasswordAuthProvider(AuthProvider):
-    """Example auth provider based on hardcoded usernames and passwords."""
+    """An auth provider support legacy api_password."""

    DEFAULT_TITLE = 'Legacy API Password'

+    @property
+    def api_password(self) -> str:
+        """Return api_password."""
+        return str(self.config[CONF_API_PASSWORD])
+
    async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
        """Return a flow to login."""
        return LegacyLoginFlow(self)

    @callback
    def async_validate_login(self, password: str) -> None:
-        """Validate a username and password."""
-        hass_http = getattr(self.hass, 'http', None)  # type: HomeAssistantHTTP
+        """Validate password."""
+        api_password = str(self.config[CONF_API_PASSWORD])

-        if not hmac.compare_digest(hass_http.api_password.encode('utf-8'),
+        if not hmac.compare_digest(api_password.encode('utf-8'),
                                   password.encode('utf-8')):
            raise InvalidAuthError

@@ -99,12 +100,6 @@ class LegacyLoginFlow(LoginFlow):
        """Handle the step of the form."""
        errors = {}

-        hass_http = getattr(self.hass, 'http', None)
-        if hass_http is None or not hass_http.api_password:
-            return self.async_abort(
-                reason='no_api_password_set'
-            )
-
        if user_input is not None:
            try:
                cast(LegacyApiPasswordAuthProvider, self._auth_provider)\
--- a/homeassistant/auth/providers/trusted_networks.py
+++ b/homeassistant/auth/providers/trusted_networks.py
@@ -18,8 +18,26 @@ from ..models import Credentials, UserMeta
 IPAddress = Union[IPv4Address, IPv6Address]
 IPNetwork = Union[IPv4Network, IPv6Network]

+CONF_TRUSTED_NETWORKS = 'trusted_networks'
+CONF_TRUSTED_USERS = 'trusted_users'
+CONF_GROUP = 'group'
+CONF_ALLOW_BYPASS_LOGIN = 'allow_bypass_login'
+
 CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
-    vol.Required('trusted_networks'): vol.All(cv.ensure_list, [ip_network])
+    vol.Required(CONF_TRUSTED_NETWORKS): vol.All(
+        cv.ensure_list, [ip_network]
+    ),
+    vol.Optional(CONF_TRUSTED_USERS, default={}): vol.Schema(
+        # we only validate the format of user_id or group_id
+        {ip_network: vol.All(
+            cv.ensure_list,
+            [vol.Or(
+                cv.uuid4_hex,
+                vol.Schema({vol.Required(CONF_GROUP): cv.uuid4_hex}),
+            )],
+        )}
+    ),
+    vol.Optional(CONF_ALLOW_BYPASS_LOGIN, default=False): cv.boolean,
 }, extra=vol.PREVENT_EXTRA)


@@ -43,7 +61,12 @@ class TrustedNetworksAuthProvider(AuthProvider):
    @property
    def trusted_networks(self) -> List[IPNetwork]:
        """Return trusted networks."""
-        return cast(List[IPNetwork], self.config['trusted_networks'])
+        return cast(List[IPNetwork], self.config[CONF_TRUSTED_NETWORKS])
+
+    @property
+    def trusted_users(self) -> Dict[IPNetwork, Any]:
+        """Return trusted users per network."""
+        return cast(Dict[IPNetwork, Any], self.config[CONF_TRUSTED_USERS])

    @property
    def support_mfa(self) -> bool:
@@ -53,13 +76,34 @@ class TrustedNetworksAuthProvider(AuthProvider):
    async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
        """Return a flow to login."""
        assert context is not None
+        ip_addr = cast(IPAddress, context.get('ip_address'))
        users = await self.store.async_get_users()
-        available_users = {user.id: user.name
-                           for user in users
-                           if not user.system_generated and user.is_active}
+        available_users = [user for user in users
+                           if not user.system_generated and user.is_active]
+        for ip_net, user_or_group_list in self.trusted_users.items():
+            if ip_addr in ip_net:
+                user_list = [user_id for user_id in user_or_group_list
+                             if isinstance(user_id, str)]
+                group_list = [group[CONF_GROUP] for group in user_or_group_list
+                              if isinstance(group, dict)]
+                flattened_group_list = [group for sublist in group_list
+                                        for group in sublist]
+                available_users = [
+                    user for user in available_users
+                    if (user.id in user_list or
+                        any([group.id in flattened_group_list
+                             for group in user.groups]))
+                ]
+                break

        return TrustedNetworksLoginFlow(
-            self, cast(IPAddress, context.get('ip_address')), available_users)
+            self,
+            ip_addr,
+            {
+                user.id: user.name for user in available_users
+            },
+            self.config[CONF_ALLOW_BYPASS_LOGIN],
+        )

    async def async_get_or_create_credentials(
            self, flow_result: Dict[str, str]) -> Credentials:
@@ -109,11 +153,13 @@ class TrustedNetworksLoginFlow(LoginFlow):

    def __init__(self, auth_provider: TrustedNetworksAuthProvider,
                 ip_addr: IPAddress,
-                 available_users: Dict[str, Optional[str]]) -> None:
+                 available_users: Dict[str, Optional[str]],
+                 allow_bypass_login: bool) -> None:
        """Initialize the login flow."""
        super().__init__(auth_provider)
        self._available_users = available_users
        self._ip_address = ip_addr
+        self._allow_bypass_login = allow_bypass_login

    async def async_step_init(
            self, user_input: Optional[Dict[str, str]] = None) \
@@ -131,6 +177,11 @@ class TrustedNetworksLoginFlow(LoginFlow):
        if user_input is not None:
            return await self.async_finish(user_input)

+        if self._allow_bypass_login and len(self._available_users) == 1:
+            return await self.async_finish({
+                'user': next(iter(self._available_users.keys()))
+            })
+
        return self.async_show_form(
            step_id='init',
            data_schema=vol.Schema({'user': vol.In(self._available_users)}),
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -1,25 +1,22 @@
 """Provide methods to bootstrap a Home Assistant instance."""
+import asyncio
 import logging
 import logging.handlers
 import os
 import sys
 from time import time
 from collections import OrderedDict
-from typing import Any, Optional, Dict
+from typing import Any, Optional, Dict, Set

 import voluptuous as vol

-from homeassistant import (
-    core, config as conf_util, config_entries, components as core_components,
-    loader)
-from homeassistant.components import persistent_notification
+from homeassistant import core, config as conf_util, config_entries, loader
 from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.setup import async_setup_component
 from homeassistant.util.logging import AsyncHandler
 from homeassistant.util.package import async_get_user_site, is_virtual_env
 from homeassistant.util.yaml import clear_secret_cache
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

@@ -28,40 +25,15 @@ ERROR_LOG_FILENAME = 'home-assistant.log'
 # hass.data key for logging information.
 DATA_LOGGING = 'logging'

-FIRST_INIT_COMPONENT = {'system_log', 'recorder', 'mqtt', 'mqtt_eventstream',
-                        'logger', 'introduction', 'frontend', 'history'}
-
-
-def from_config_dict(config: Dict[str, Any],
-                     hass: Optional[core.HomeAssistant] = None,
-                     config_dir: Optional[str] = None,
-                     enable_log: bool = True,
-                     verbose: bool = False,
-                     skip_pip: bool = False,
-                     log_rotate_days: Any = None,
-                     log_file: Any = None,
-                     log_no_color: bool = False) \
-                     -> Optional[core.HomeAssistant]:
-    """Try to configure Home Assistant from a configuration dictionary.
-
-    Dynamically loads required components and its dependencies.
-    """
-    if hass is None:
-        hass = core.HomeAssistant()
-        if config_dir is not None:
-            config_dir = os.path.abspath(config_dir)
-            hass.config.config_dir = config_dir
-            if not is_virtual_env():
-                hass.loop.run_until_complete(
-                    async_mount_local_lib_path(config_dir))
-
-    # run task
-    hass = hass.loop.run_until_complete(
-        async_from_config_dict(
-            config, hass, config_dir, enable_log, verbose, skip_pip,
-            log_rotate_days, log_file, log_no_color)
-    )
-    return hass
+DEBUGGER_INTEGRATIONS = {'ptvsd', }
+CORE_INTEGRATIONS = ('homeassistant', 'persistent_notification')
+LOGGING_INTEGRATIONS = {'logger', 'system_log'}
+STAGE_1_INTEGRATIONS = {
+    # To record data
+    'recorder',
+    # To make sure we forward data to other instances
+    'mqtt_eventstream',
+}


 async def async_from_config_dict(config: Dict[str, Any],
@@ -91,12 +63,12 @@ async def async_from_config_dict(config: Dict[str, Any],
                        "This may cause issues")

    core_config = config.get(core.DOMAIN, {})
-    has_api_password = bool(config.get('http', {}).get('api_password'))
+    api_password = config.get('http', {}).get('api_password')
    trusted_networks = config.get('http', {}).get('trusted_networks')

    try:
        await conf_util.async_process_ha_core_config(
-            hass, core_config, has_api_password, trusted_networks)
+            hass, core_config, api_password, trusted_networks)
    except vol.Invalid as config_err:
        conf_util.async_log_exception(
            config_err, 'homeassistant', core_config, hass)
@@ -106,134 +78,28 @@ async def async_from_config_dict(config: Dict[str, Any],
                      "Further initialization aborted")
        return None

-    await hass.async_add_executor_job(
-        conf_util.process_ha_config_upgrade, hass)
-
    # Make a copy because we are mutating it.
    config = OrderedDict(config)

    # Merge packages
-    conf_util.merge_packages_config(
+    await conf_util.merge_packages_config(
        hass, config, core_config.get(conf_util.CONF_PACKAGES, {}))

    hass.config_entries = config_entries.ConfigEntries(hass, config)
-    await hass.config_entries.async_load()
+    await hass.config_entries.async_initialize()

-    # Filter out the repeating and common config section [homeassistant]
-    components = set(key.split(' ')[0] for key in config.keys()
-                     if key != core.DOMAIN)
-    components.update(hass.config_entries.async_domains())
-
-    # Resolve all dependencies of all components.
-    for component in list(components):
-        try:
-            components.update(loader.component_dependencies(hass, component))
-        except loader.LoaderError:
-            # Ignore it, or we'll break startup
-            # It will be properly handled during setup.
-            pass
-
-    # setup components
-    res = await core_components.async_setup(hass, config)
-    if not res:
-        _LOGGER.error("Home Assistant core failed to initialize. "
-                      "Further initialization aborted")
-        return hass
-
-    await persistent_notification.async_setup(hass, config)
-
-    _LOGGER.info("Home Assistant core initialized")
-
-    # stage 1
-    for component in components:
-        if component not in FIRST_INIT_COMPONENT:
-            continue
-        hass.async_create_task(async_setup_component(hass, component, config))
-
-    await hass.async_block_till_done()
-
-    # stage 2
-    for component in components:
-        if component in FIRST_INIT_COMPONENT:
-            continue
-        hass.async_create_task(async_setup_component(hass, component, config))
-
-    await hass.async_block_till_done()
+    await _async_set_up_integrations(hass, config)

    stop = time()
    _LOGGER.info("Home Assistant initialized in %.2fs", stop-start)

-    # TEMP: warn users for invalid slugs
-    # Remove after 0.94 or 1.0
-    if cv.INVALID_SLUGS_FOUND or cv.INVALID_ENTITY_IDS_FOUND:
-        msg = []
-
-        if cv.INVALID_ENTITY_IDS_FOUND:
-            msg.append(
-                "Your configuration contains invalid entity ID references. "
-                "Please find and update the following. "
-                "This will become a breaking change."
-            )
-            msg.append('\n'.join('- {} -> {}'.format(*item)
-                                 for item
-                                 in cv.INVALID_ENTITY_IDS_FOUND.items()))
-
-        if cv.INVALID_SLUGS_FOUND:
-            msg.append(
-                "Your configuration contains invalid slugs. "
-                "Please find and update the following. "
-                "This will become a breaking change."
-            )
-            msg.append('\n'.join('- {} -> {}'.format(*item)
-                                 for item in cv.INVALID_SLUGS_FOUND.items()))
-
+    if sys.version_info[:3] < (3, 6, 0):
        hass.components.persistent_notification.async_create(
-            '\n\n'.join(msg), "Config Warning", "config_warning"
+            "Python 3.5 support is deprecated and will "
+            "be removed in the first release after August 1. Please "
+            "upgrade Python.", "Python version", "python_version"
        )

-    # TEMP: warn users of invalid extra keys
-    # Remove after 0.92
-    if cv.INVALID_EXTRA_KEYS_FOUND:
-        msg = []
-        msg.append(
-            "Your configuration contains extra keys "
-            "that the platform does not support (but were silently "
-            "accepted before 0.88). Please find and remove the following."
-            "This will become a breaking change."
-        )
-        msg.append('\n'.join('- {}'.format(it)
-                             for it in cv.INVALID_EXTRA_KEYS_FOUND))
-
-        hass.components.persistent_notification.async_create(
-            '\n\n'.join(msg), "Config Warning", "config_warning"
-        )
-
-    return hass
-
-
-def from_config_file(config_path: str,
-                     hass: Optional[core.HomeAssistant] = None,
-                     verbose: bool = False,
-                     skip_pip: bool = True,
-                     log_rotate_days: Any = None,
-                     log_file: Any = None,
-                     log_no_color: bool = False)\
-        -> Optional[core.HomeAssistant]:
-    """Read the configuration file and try to start all the functionality.
-
-    Will add functionality to 'hass' parameter if given,
-    instantiates a new Home Assistant object if 'hass' is not given.
-    """
-    if hass is None:
-        hass = core.HomeAssistant()
-
-    # run task
-    hass = hass.loop.run_until_complete(
-        async_from_config_file(
-            config_path, hass, verbose, skip_pip,
-            log_rotate_days, log_file, log_no_color)
-    )
-
    return hass


@@ -260,6 +126,9 @@ async def async_from_config_file(config_path: str,
    async_enable_logging(hass, verbose, log_rotate_days, log_file,
                         log_no_color)

+    await hass.async_add_executor_job(
+        conf_util.process_ha_config_upgrade, hass)
+
    try:
        config_dict = await hass.async_add_executor_job(
            conf_util.load_yaml_config_file, config_path)
@@ -375,3 +244,139 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
    if lib_dir not in sys.path:
        sys.path.insert(0, lib_dir)
    return deps_dir
+
+
+@core.callback
+def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
+    """Get domains of components to set up."""
+    # Filter out the repeating and common config section [homeassistant]
+    domains = set(key.split(' ')[0] for key in config.keys()
+                  if key != core.DOMAIN)
+
+    # Add config entry domains
+    domains.update(hass.config_entries.async_domains())  # type: ignore
+
+    # Make sure the Hass.io component is loaded
+    if 'HASSIO' in os.environ:
+        domains.add('hassio')
+
+    return domains
+
+
+async def _async_set_up_integrations(
+        hass: core.HomeAssistant, config: Dict[str, Any]) -> None:
+    """Set up all the integrations."""
+    domains = _get_domains(hass, config)
+
+    # Start up debuggers. Start these first in case they want to wait.
+    debuggers = domains & DEBUGGER_INTEGRATIONS
+    if debuggers:
+        _LOGGER.debug("Starting up debuggers %s", debuggers)
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in debuggers])
+        domains -= DEBUGGER_INTEGRATIONS
+
+    # Resolve all dependencies of all components so we can find the logging
+    # and integrations that need faster initialization.
+    resolved_domains_task = asyncio.gather(*[
+        loader.async_component_dependencies(hass, domain)
+        for domain in domains
+    ], return_exceptions=True)
+
+    # Set up core.
+    _LOGGER.debug("Setting up %s", CORE_INTEGRATIONS)
+
+    if not all(await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in CORE_INTEGRATIONS
+    ])):
+        _LOGGER.error("Home Assistant core failed to initialize. "
+                      "Further initialization aborted")
+        return
+
+    _LOGGER.debug("Home Assistant core initialized")
+
+    # Finish resolving domains
+    for dep_domains in await resolved_domains_task:
+        # Result is either a set or an exception. We ignore exceptions
+        # It will be properly handled during setup of the domain.
+        if isinstance(dep_domains, set):
+            domains.update(dep_domains)
+
+    # setup components
+    logging_domains = domains & LOGGING_INTEGRATIONS
+    stage_1_domains = domains & STAGE_1_INTEGRATIONS
+    stage_2_domains = domains - logging_domains - stage_1_domains
+
+    if logging_domains:
+        _LOGGER.info("Setting up %s", logging_domains)
+
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in logging_domains
+        ])
+
+    # Kick off loading the registries. They don't need to be awaited.
+    asyncio.gather(
+        hass.helpers.device_registry.async_get_registry(),
+        hass.helpers.entity_registry.async_get_registry(),
+        hass.helpers.area_registry.async_get_registry())
+
+    if stage_1_domains:
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in stage_1_domains
+        ])
+
+    # Load all integrations
+    after_dependencies = {}  # type: Dict[str, Set[str]]
+
+    for int_or_exc in await asyncio.gather(*[
+            loader.async_get_integration(hass, domain)
+            for domain in stage_2_domains
+    ], return_exceptions=True):
+        # Exceptions are handled in async_setup_component.
+        if (isinstance(int_or_exc, loader.Integration) and
+                int_or_exc.after_dependencies):
+            after_dependencies[int_or_exc.domain] = set(
+                int_or_exc.after_dependencies
+            )
+
+    last_load = None
+    while stage_2_domains:
+        domains_to_load = set()
+
+        for domain in stage_2_domains:
+            after_deps = after_dependencies.get(domain)
+            # Load if integration has no after_dependencies or they are
+            # all loaded
+            if (not after_deps or
+                    not after_deps-hass.config.components):
+                domains_to_load.add(domain)
+
+        if not domains_to_load or domains_to_load == last_load:
+            break
+
+        _LOGGER.debug("Setting up %s", domains_to_load)
+
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in domains_to_load
+        ])
+
+        last_load = domains_to_load
+        stage_2_domains -= domains_to_load
+
+    # These are stage 2 domains that never have their after_dependencies
+    # satisfied.
+    if stage_2_domains:
+        _LOGGER.debug("Final set up: %s", stage_2_domains)
+
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in stage_2_domains
+        ])
+
+    # Wrap up startup
+    await hass.async_block_till_done()
--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -7,33 +7,12 @@ Component design guidelines:
  format "<DOMAIN>.<OBJECT_ID>".
 - Each component should publish services only under its own domain.
 """
-import asyncio
-import itertools as it
 import logging
-from typing import Awaitable

-import voluptuous as vol
-
-import homeassistant.core as ha
-import homeassistant.config as conf_util
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.service import extract_entity_ids
-from homeassistant.helpers import intent
-from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE,
-    SERVICE_HOMEASSISTANT_STOP, SERVICE_HOMEASSISTANT_RESTART,
-    RESTART_EXIT_CODE)
-from homeassistant.helpers import config_validation as cv
+from homeassistant.core import split_entity_id

 _LOGGER = logging.getLogger(__name__)

-SERVICE_RELOAD_CORE_CONFIG = 'reload_core_config'
-SERVICE_CHECK_CONFIG = 'check_config'
-SERVICE_UPDATE_ENTITY = 'update_entity'
-SCHEMA_UPDATE_ENTITY = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids
-})
-

 def is_on(hass, entity_id=None):
    """Load up the module to call the is_on method.
@@ -46,7 +25,7 @@ def is_on(hass, entity_id=None):
        entity_ids = hass.states.entity_ids()

    for ent_id in entity_ids:
-        domain = ha.split_entity_id(ent_id)[0]
+        domain = split_entity_id(ent_id)[0]

        try:
            component = getattr(hass.components, domain)
@@ -64,112 +43,3 @@ def is_on(hass, entity_id=None):
            return True

    return False
-
-
-async def async_setup(hass: ha.HomeAssistant, config: dict) -> Awaitable[bool]:
-    """Set up general services related to Home Assistant."""
-    async def async_handle_turn_service(service):
-        """Handle calls to homeassistant.turn_on/off."""
-        entity_ids = extract_entity_ids(hass, service)
-
-        # Generic turn on/off method requires entity id
-        if not entity_ids:
-            _LOGGER.error(
-                "homeassistant/%s cannot be called without entity_id",
-                service.service)
-            return
-
-        # Group entity_ids by domain. groupby requires sorted data.
-        by_domain = it.groupby(sorted(entity_ids),
-                               lambda item: ha.split_entity_id(item)[0])
-
-        tasks = []
-
-        for domain, ent_ids in by_domain:
-            # We want to block for all calls and only return when all calls
-            # have been processed. If a service does not exist it causes a 10
-            # second delay while we're blocking waiting for a response.
-            # But services can be registered on other HA instances that are
-            # listening to the bus too. So as an in between solution, we'll
-            # block only if the service is defined in the current HA instance.
-            blocking = hass.services.has_service(domain, service.service)
-
-            # Create a new dict for this call
-            data = dict(service.data)
-
-            # ent_ids is a generator, convert it to a list.
-            data[ATTR_ENTITY_ID] = list(ent_ids)
-
-            tasks.append(hass.services.async_call(
-                domain, service.service, data, blocking))
-
-        await asyncio.wait(tasks, loop=hass.loop)
-
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TURN_OFF, async_handle_turn_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TURN_ON, async_handle_turn_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TOGGLE, async_handle_turn_service)
-    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TURN_ON, ha.DOMAIN, SERVICE_TURN_ON, "Turned {} on"))
-    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TURN_OFF, ha.DOMAIN, SERVICE_TURN_OFF,
-        "Turned {} off"))
-    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TOGGLE, ha.DOMAIN, SERVICE_TOGGLE, "Toggled {}"))
-
-    async def async_handle_core_service(call):
-        """Service handler for handling core services."""
-        if call.service == SERVICE_HOMEASSISTANT_STOP:
-            hass.async_create_task(hass.async_stop())
-            return
-
-        try:
-            errors = await conf_util.async_check_ha_config_file(hass)
-        except HomeAssistantError:
-            return
-
-        if errors:
-            _LOGGER.error(errors)
-            hass.components.persistent_notification.async_create(
-                "Config error. See dev-info panel for details.",
-                "Config validating", "{0}.check_config".format(ha.DOMAIN))
-            return
-
-        if call.service == SERVICE_HOMEASSISTANT_RESTART:
-            hass.async_create_task(hass.async_stop(RESTART_EXIT_CODE))
-
-    async def async_handle_update_service(call):
-        """Service handler for updating an entity."""
-        tasks = [hass.helpers.entity_component.async_update_entity(entity)
-                 for entity in call.data[ATTR_ENTITY_ID]]
-
-        if tasks:
-            await asyncio.wait(tasks)
-
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_HOMEASSISTANT_STOP, async_handle_core_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_HOMEASSISTANT_RESTART, async_handle_core_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_CHECK_CONFIG, async_handle_core_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_UPDATE_ENTITY, async_handle_update_service,
-        schema=SCHEMA_UPDATE_ENTITY)
-
-    async def async_handle_reload_config(call):
-        """Service handler for reloading core config."""
-        try:
-            conf = await conf_util.async_hass_config_yaml(hass)
-        except HomeAssistantError as err:
-            _LOGGER.error(err)
-            return
-
-        await conf_util.async_process_ha_core_config(
-            hass, conf.get(ha.DOMAIN) or {})
-
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG, async_handle_reload_config)
-
-    return True
--- a/homeassistant/components/abode/init.py
+++ b/homeassistant/components/abode/init.py
@@ -13,8 +13,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity

-REQUIREMENTS = ['abodepy==0.15.0']
-
 _LOGGER = logging.getLogger(__name__)

 ATTRIBUTION = "Data provided by goabode.com"
--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -2,13 +2,11 @@
 import logging

 import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.abode import ATTRIBUTION, AbodeDevice
-from homeassistant.components.abode import DOMAIN as ABODE_DOMAIN
 from homeassistant.const import (
    ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
    STATE_ALARM_DISARMED)

-DEPENDENCIES = ['abode']
+from . import ATTRIBUTION, DOMAIN as ABODE_DOMAIN, AbodeDevice

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/abode/binary_sensor.py
+++ b/homeassistant/components/abode/binary_sensor.py
@@ -1,13 +1,11 @@
 """Support for Abode Security System binary sensors."""
 import logging

-from homeassistant.components.abode import (AbodeDevice, AbodeAutomation,
-                                            DOMAIN as ABODE_DOMAIN)
 from homeassistant.components.binary_sensor import BinarySensorDevice

-_LOGGER = logging.getLogger(__name__)
+from . import DOMAIN as ABODE_DOMAIN, AbodeAutomation, AbodeDevice

-DEPENDENCIES = ['abode']
+_LOGGER = logging.getLogger(__name__)


 def setup_platform(hass, config, add_entities, discovery_info=None):
--- a/homeassistant/components/abode/camera.py
+++ b/homeassistant/components/abode/camera.py
@@ -1,14 +1,13 @@
 """Support for Abode Security System cameras."""
+from datetime import timedelta
 import logging

-from datetime import timedelta
 import requests

-from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN
 from homeassistant.components.camera import Camera
 from homeassistant.util import Throttle

-DEPENDENCIES = ['abode']
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice

 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)

--- a/homeassistant/components/abode/cover.py
+++ b/homeassistant/components/abode/cover.py
@@ -1,10 +1,9 @@
 """Support for Abode Security System covers."""
 import logging

-from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN
 from homeassistant.components.cover import CoverDevice

-DEPENDENCIES = ['abode']
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/abode/light.py
+++ b/homeassistant/components/abode/light.py
@@ -1,15 +1,14 @@
 """Support for Abode Security System lights."""
 import logging
 from math import ceil
-from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN
+
 from homeassistant.components.light import (
-    ATTR_BRIGHTNESS, ATTR_HS_COLOR, ATTR_COLOR_TEMP,
-    SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light)
+    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS,
+    SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light)
 from homeassistant.util.color import (
    color_temperature_kelvin_to_mired, color_temperature_mired_to_kelvin)

-
-DEPENDENCIES = ['abode']
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/abode/lock.py
+++ b/homeassistant/components/abode/lock.py
@@ -1,10 +1,9 @@
 """Support for Abode Security System locks."""
 import logging

-from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN
 from homeassistant.components.lock import LockDevice

-DEPENDENCIES = ['abode']
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/abode/manifest.json
+++ b/homeassistant/components/abode/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "abode",
+  "name": "Abode",
+  "documentation": "https://www.home-assistant.io/components/abode",
+  "requirements": [
+    "abodepy==0.15.0"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -1,13 +1,12 @@
 """Support for Abode Security System sensors."""
 import logging

-from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN
 from homeassistant.const import (
    DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE)

-_LOGGER = logging.getLogger(__name__)
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice

-DEPENDENCIES = ['abode']
+_LOGGER = logging.getLogger(__name__)

 # Sensor types: Name, icon
 SENSOR_TYPES = {
--- a/homeassistant/components/abode/switch.py
+++ b/homeassistant/components/abode/switch.py
@@ -1,13 +1,11 @@
 """Support for Abode Security System switches."""
 import logging

-from homeassistant.components.abode import (AbodeDevice, AbodeAutomation,
-                                            DOMAIN as ABODE_DOMAIN)
 from homeassistant.components.switch import SwitchDevice

-_LOGGER = logging.getLogger(__name__)
+from . import DOMAIN as ABODE_DOMAIN, AbodeAutomation, AbodeDevice

-DEPENDENCIES = ['abode']
+_LOGGER = logging.getLogger(__name__)


 def setup_platform(hass, config, add_entities, discovery_info=None):
--- a/homeassistant/components/acer_projector/init.py
+++ b/homeassistant/components/acer_projector/init.py
@@ -0,0 +1 @@
+"""The acer_projector component."""
--- a/homeassistant/components/acer_projector/manifest.json
+++ b/homeassistant/components/acer_projector/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "acer_projector",
+  "name": "Acer projector",
+  "documentation": "https://www.home-assistant.io/components/acer_projector",
+  "requirements": [
+    "pyserial==3.1.1"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/acer_projector/switch.py
+++ b/homeassistant/components/acer_projector/switch.py
@@ -0,0 +1,161 @@
+"""Use serial protocol of Acer projector to obtain state of the projector."""
+import logging
+import re
+
+import voluptuous as vol
+
+from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (
+    STATE_ON, STATE_OFF, STATE_UNKNOWN, CONF_NAME, CONF_FILENAME)
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_TIMEOUT = 'timeout'
+CONF_WRITE_TIMEOUT = 'write_timeout'
+
+DEFAULT_NAME = 'Acer Projector'
+DEFAULT_TIMEOUT = 1
+DEFAULT_WRITE_TIMEOUT = 1
+
+ECO_MODE = 'ECO Mode'
+
+ICON = 'mdi:projector'
+
+INPUT_SOURCE = 'Input Source'
+
+LAMP = 'Lamp'
+LAMP_HOURS = 'Lamp Hours'
+
+MODEL = 'Model'
+
+# Commands known to the projector
+CMD_DICT = {
+    LAMP: '* 0 Lamp ?\r',
+    LAMP_HOURS: '* 0 Lamp\r',
+    INPUT_SOURCE: '* 0 Src ?\r',
+    ECO_MODE: '* 0 IR 052\r',
+    MODEL: '* 0 IR 035\r',
+    STATE_ON: '* 0 IR 001\r',
+    STATE_OFF: '* 0 IR 002\r',
+}
+
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_FILENAME): cv.isdevice,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+    vol.Optional(CONF_WRITE_TIMEOUT, default=DEFAULT_WRITE_TIMEOUT):
+        cv.positive_int,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Connect with serial port and return Acer Projector."""
+    serial_port = config.get(CONF_FILENAME)
+    name = config.get(CONF_NAME)
+    timeout = config.get(CONF_TIMEOUT)
+    write_timeout = config.get(CONF_WRITE_TIMEOUT)
+
+    add_entities([AcerSwitch(serial_port, name, timeout, write_timeout)], True)
+
+
+class AcerSwitch(SwitchDevice):
+    """Represents an Acer Projector as a switch."""
+
+    def __init__(self, serial_port, name, timeout, write_timeout, **kwargs):
+        """Init of the Acer projector."""
+        import serial
+        self.ser = serial.Serial(
+            port=serial_port, timeout=timeout, write_timeout=write_timeout,
+            **kwargs)
+        self._serial_port = serial_port
+        self._name = name
+        self._state = False
+        self._available = False
+        self._attributes = {
+            LAMP_HOURS: STATE_UNKNOWN,
+            INPUT_SOURCE: STATE_UNKNOWN,
+            ECO_MODE: STATE_UNKNOWN,
+        }
+
+    def _write_read(self, msg):
+        """Write to the projector and read the return."""
+        import serial
+        ret = ""
+        # Sometimes the projector won't answer for no reason or the projector
+        # was disconnected during runtime.
+        # This way the projector can be reconnected and will still work
+        try:
+            if not self.ser.is_open:
+                self.ser.open()
+            msg = msg.encode('utf-8')
+            self.ser.write(msg)
+            # Size is an experience value there is no real limit.
+            # AFAIK there is no limit and no end character so we will usually
+            # need to wait for timeout
+            ret = self.ser.read_until(size=20).decode('utf-8')
+        except serial.SerialException:
+            _LOGGER.error('Problem communicating with %s', self._serial_port)
+        self.ser.close()
+        return ret
+
+    def _write_read_format(self, msg):
+        """Write msg, obtain answer and format output."""
+        # answers are formatted as ***\answer\r***
+        awns = self._write_read(msg)
+        match = re.search(r'\r(.+)\r', awns)
+        if match:
+            return match.group(1)
+        return STATE_UNKNOWN
+
+    @property
+    def available(self):
+        """Return if projector is available."""
+        return self._available
+
+    @property
+    def name(self):
+        """Return name of the projector."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return if the projector is turned on."""
+        return self._state
+
+    @property
+    def state_attributes(self):
+        """Return state attributes."""
+        return self._attributes
+
+    def update(self):
+        """Get the latest state from the projector."""
+        msg = CMD_DICT[LAMP]
+        awns = self._write_read_format(msg)
+        if awns == 'Lamp 1':
+            self._state = True
+            self._available = True
+        elif awns == 'Lamp 0':
+            self._state = False
+            self._available = True
+        else:
+            self._available = False
+
+        for key in self._attributes:
+            msg = CMD_DICT.get(key, None)
+            if msg:
+                awns = self._write_read_format(msg)
+                self._attributes[key] = awns
+
+    def turn_on(self, **kwargs):
+        """Turn the projector on."""
+        msg = CMD_DICT[STATE_ON]
+        self._write_read(msg)
+        self._state = STATE_ON
+
+    def turn_off(self, **kwargs):
+        """Turn the projector off."""
+        msg = CMD_DICT[STATE_OFF]
+        self._write_read(msg)
+        self._state = STATE_OFF
--- a/homeassistant/components/actiontec/init.py
+++ b/homeassistant/components/actiontec/init.py
@@ -0,0 +1 @@
+"""The actiontec component."""
--- a/homeassistant/components/actiontec/device_tracker.py
+++ b/homeassistant/components/actiontec/device_tracker.py
@@ -0,0 +1,115 @@
+"""Support for Actiontec MI424WR (Verizon FIOS) routers."""
+import logging
+import re
+import telnetlib
+from collections import namedtuple
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+import homeassistant.util.dt as dt_util
+from homeassistant.components.device_tracker import (
+    DOMAIN, PLATFORM_SCHEMA, DeviceScanner)
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+
+_LOGGER = logging.getLogger(__name__)
+
+_LEASES_REGEX = re.compile(
+    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})' +
+    r'\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))' +
+    r'\svalid\sfor:\s(?P<timevalid>(-?\d+))' +
+    r'\ssec')
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string
+})
+
+
+def get_scanner(hass, config):
+    """Validate the configuration and return an Actiontec scanner."""
+    scanner = ActiontecDeviceScanner(config[DOMAIN])
+    return scanner if scanner.success_init else None
+
+
+Device = namedtuple('Device', ['mac', 'ip', 'last_update'])
+
+
+class ActiontecDeviceScanner(DeviceScanner):
+    """This class queries an actiontec router for connected devices."""
+
+    def __init__(self, config):
+        """Initialize the scanner."""
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]
+        self.last_results = []
+        data = self.get_actiontec_data()
+        self.success_init = data is not None
+        _LOGGER.info("canner initialized")
+
+    def scan_devices(self):
+        """Scan for new devices and return a list with found device IDs."""
+        self._update_info()
+        return [client.mac for client in self.last_results]
+
+    def get_device_name(self, device):
+        """Return the name of the given device or None if we don't know."""
+        if not self.last_results:
+            return None
+        for client in self.last_results:
+            if client.mac == device:
+                return client.ip
+        return None
+
+    def _update_info(self):
+        """Ensure the information from the router is up to date.
+
+        Return boolean if scanning successful.
+        """
+        _LOGGER.info("Scanning")
+        if not self.success_init:
+            return False
+
+        now = dt_util.now()
+        actiontec_data = self.get_actiontec_data()
+        if not actiontec_data:
+            return False
+        self.last_results = [Device(data['mac'], name, now)
+                             for name, data in actiontec_data.items()
+                             if data['timevalid'] > -60]
+        _LOGGER.info("Scan successful")
+        return True
+
+    def get_actiontec_data(self):
+        """Retrieve data from Actiontec MI424WR and return parsed result."""
+        try:
+            telnet = telnetlib.Telnet(self.host)
+            telnet.read_until(b'Username: ')
+            telnet.write((self.username + '\n').encode('ascii'))
+            telnet.read_until(b'Password: ')
+            telnet.write((self.password + '\n').encode('ascii'))
+            prompt = telnet.read_until(
+                b'Wireless Broadband Router> ').split(b'\n')[-1]
+            telnet.write('firewall mac_cache_dump\n'.encode('ascii'))
+            telnet.write('\n'.encode('ascii'))
+            telnet.read_until(prompt)
+            leases_result = telnet.read_until(prompt).split(b'\n')[1:-1]
+            telnet.write('exit\n'.encode('ascii'))
+        except EOFError:
+            _LOGGER.exception("Unexpected response from router")
+            return
+        except ConnectionRefusedError:
+            _LOGGER.exception("Connection refused by router. Telnet enabled?")
+            return None
+
+        devices = {}
+        for lease in leases_result:
+            match = _LEASES_REGEX.search(lease.decode('utf-8'))
+            if match is not None:
+                devices[match.group('ip')] = {
+                    'ip': match.group('ip'),
+                    'mac': match.group('mac').upper(),
+                    'timevalid': int(match.group('timevalid'))
+                    }
+        return devices
--- a/homeassistant/components/actiontec/manifest.json
+++ b/homeassistant/components/actiontec/manifest.json
@@ -0,0 +1,8 @@
+{
+  "domain": "actiontec",
+  "name": "Actiontec",
+  "documentation": "https://www.home-assistant.io/components/actiontec",
+  "requirements": [],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/adguard/.translations/ca.json
+++ b/homeassistant/components/adguard/.translations/ca.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 d'AdGuard Home."
+        },
+        "error": {
+            "connection_error": "No s'ha pogut connectar."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Vols configurar Home Assistant perqu\u00e8 es connecti amb l'AdGuard Home proporcionat pel complement de Hass.io: {addon}?",
+                "title": "AdGuard Home (complement de Hass.io)"
+            },
+            "user": {
+                "data": {
+                    "host": "Amfitri\u00f3",
+                    "password": "Contrasenya",
+                    "port": "Port",
+                    "ssl": "AdGuard Home utilitza un certificat SSL",
+                    "username": "Nom d'usuari",
+                    "verify_ssl": "AdGuard Home utilitza un certificat adequat"
+                },
+                "description": "Configuraci\u00f3 de la inst\u00e0ncia d'AdGuard Home, permet el control i la monitoritzaci\u00f3.",
+                "title": "Enlla\u00e7ar AdGuard Home."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/de.json
+++ b/homeassistant/components/adguard/.translations/de.json
@@ -0,0 +1,28 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Es ist nur eine einzige Konfiguration von AdGuard Home zul\u00e4ssig."
+        },
+        "error": {
+            "connection_error": "Fehler beim Herstellen einer Verbindung."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "M\u00f6chtest du Home Assistant so konfigurieren, dass eine Verbindung mit AdGuard Home als Hass.io-Add-On hergestellt wird: {addon}?",
+                "title": "AdGuard Home \u00fcber das Hass.io Add-on"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Passwort",
+                    "port": "Port",
+                    "ssl": "AdGuard Home verwendet ein SSL-Zertifikat",
+                    "username": "Benutzername",
+                    "verify_ssl": "AdGuard Home verwendet ein richtiges Zertifikat"
+                },
+                "description": "Richte deine AdGuard Home-Instanz ein um sie zu \u00dcberwachen und zu Steuern.",
+                "title": "Verkn\u00fcpfe AdGuard Home."
+            }
+        }
+    }
+}
--- a/homeassistant/components/adguard/.translations/en.json
+++ b/homeassistant/components/adguard/.translations/en.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Only a single configuration of AdGuard Home is allowed."
+        },
+        "error": {
+            "connection_error": "Failed to connect."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the Hass.io add-on: {addon}?",
+                "title": "AdGuard Home via Hass.io add-on"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Password",
+                    "port": "Port",
+                    "ssl": "AdGuard Home uses a SSL certificate",
+                    "username": "Username",
+                    "verify_ssl": "AdGuard Home uses a proper certificate"
+                },
+                "description": "Set up your AdGuard Home instance to allow monitoring and control.",
+                "title": "Link your AdGuard Home."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/es-419.json
+++ b/homeassistant/components/adguard/.translations/es-419.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Solo se permite una \u00fanica configuraci\u00f3n de AdGuard Home."
+        },
+        "error": {
+            "connection_error": "Error al conectar."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "\u00bfDesea configurar Home Assistant para conectarse a la p\u00e1gina principal de AdGuard proporcionada por el complemento Hass.io: {addon}?",
+                "title": "AdGuard Home a trav\u00e9s del complemento Hass.io"
+            },
+            "user": {
+                "data": {
+                    "password": "Contrase\u00f1a",
+                    "port": "Puerto",
+                    "ssl": "AdGuard Home utiliza un certificado SSL",
+                    "username": "Nombre de usuario",
+                    "verify_ssl": "AdGuard Home utiliza un certificado adecuado"
+                },
+                "description": "Configure su instancia de AdGuard Home para permitir la supervisi\u00f3n y el control."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/it.json
+++ b/homeassistant/components/adguard/.translations/it.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u00c8 consentita solo una singola configurazione di AdGuard Home."
+        },
+        "error": {
+            "connection_error": "Impossibile connettersi."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Password",
+                    "port": "Porta",
+                    "ssl": "AdGuard Home utilizza un certificato SSL",
+                    "username": "Nome utente"
+                }
+            }
+        }
+    }
+}
--- a/homeassistant/components/adguard/.translations/ko.json
+++ b/homeassistant/components/adguard/.translations/ko.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\ud558\ub098\uc758 AdGuard Home \ub9cc \uad6c\uc131 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+        },
+        "error": {
+            "connection_error": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Hass.io {addon} \uc560\ub4dc\uc628\uc73c\ub85c AdGuard Home \uc5d0 \uc5f0\uacb0\ud558\ub3c4\ub85d Home Assistant \ub97c \uad6c\uc131 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "title": "Hass.io \uc560\ub4dc\uc628\uc758 AdGuard Home"
+            },
+            "user": {
+                "data": {
+                    "host": "\ud638\uc2a4\ud2b8",
+                    "password": "\ube44\ubc00\ubc88\ud638",
+                    "port": "\ud3ec\ud2b8",
+                    "ssl": "AdGuard Home \uc740 SSL \uc778\uc99d\uc11c\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4",
+                    "username": "\uc0ac\uc6a9\uc790 \uc774\ub984",
+                    "verify_ssl": "AdGuard Home \uc740 \uc62c\ubc14\ub978 \uc778\uc99d\uc11c\ub97c \uc0ac\uc6a9\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4"
+                },
+                "description": "\ubaa8\ub2c8\ud130\ub9c1 \ubc0f \uc81c\uc5b4\uac00 \uac00\ub2a5\ud558\ub3c4\ub85d AdGuard Home \uc778\uc2a4\ud134\uc2a4\ub97c \uc124\uc815\ud574\uc8fc\uc138\uc694.",
+                "title": "AdGuard Home \uc5f0\uacb0"
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/lb.json
+++ b/homeassistant/components/adguard/.translations/lb.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun AdGuard Home ass erlaabt."
+        },
+        "error": {
+            "connection_error": "Feeler beim verbannen."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "W\u00ebllt dir Home Assistant konfigur\u00e9iere fir sech mam AdGuard Home ze verbannen dee vum hass.io add-on {addon} bereet gestallt g\u00ebtt?",
+                "title": "AdGuard Home via Hass.io add-on"
+            },
+            "user": {
+                "data": {
+                    "host": "Apparat",
+                    "password": "Passwuert",
+                    "port": "Port",
+                    "ssl": "AdGuard Home benotzt een SSL Zertifikat",
+                    "username": "Benotzernumm",
+                    "verify_ssl": "AdGuard Home benotzt een eegenen Zertifikat"
+                },
+                "description": "Konfigur\u00e9iert \u00e4r AdGuard Home Instanz fir d'Iwwerwaachung an d'Kontroll z'erlaben.",
+                "title": "Verbannt \u00e4ren AdGuard Home"
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/nl.json
+++ b/homeassistant/components/adguard/.translations/nl.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Slechts \u00e9\u00e9n configuratie van AdGuard Home is toegestaan."
+        },
+        "error": {
+            "connection_error": "Kon niet verbinden."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Wilt u Home Assistant configureren om verbinding te maken met AdGuard Home van de Hass.io-add-on: {addon}?",
+                "title": "AdGuard Home via Hass.io add-on"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Wachtwoord",
+                    "port": "Poort",
+                    "ssl": "AdGuard Home maakt gebruik van een SSL certificaat",
+                    "username": "Gebruikersnaam",
+                    "verify_ssl": "AdGuard Home maakt gebruik van een goed certificaat"
+                },
+                "description": "Stel uw AdGuard Home-instantie in om toezicht en controle mogelijk te maken.",
+                "title": "Link uw AdGuard Home."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/no.json
+++ b/homeassistant/components/adguard/.translations/no.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Kun \u00e9n enkelt konfigurasjon av AdGuard Hjemer tillatt."
+        },
+        "error": {
+            "connection_error": "Tilkobling mislyktes."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Vil du konfigurere Home Assistant til \u00e5 koble til AdGuard Hjem gitt av hass.io tillegget {addon}?",
+                "title": "AdGuard Hjem via Hass.io tillegg"
+            },
+            "user": {
+                "data": {
+                    "host": "Vert",
+                    "password": "Passord",
+                    "port": "Port",
+                    "ssl": "AdGuard Hjem bruker et SSL-sertifikat",
+                    "username": "Brukernavn",
+                    "verify_ssl": "AdGuard Home bruker et riktig sertifikat"
+                },
+                "description": "Sett opp din AdGuard Hjem instans for \u00e5 tillate overv\u00e5king og kontroll.",
+                "title": "Koble til ditt AdGuard Hjem."
+            }
+        },
+        "title": "AdGuard Hjem"
+    }
+}
--- a/homeassistant/components/adguard/.translations/pl.json
+++ b/homeassistant/components/adguard/.translations/pl.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja AdGuard Home."
+        },
+        "error": {
+            "connection_error": "Po\u0142\u0105czenie nieudane."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant'a, aby po\u0142\u0105czy\u0142 si\u0119 z AdGuard Home przez dodatek Hass.io {addon}?",
+                "title": "AdGuard Home przez dodatek Hass.io"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Has\u0142o",
+                    "port": "Port",
+                    "ssl": "AdGuard Home u\u017cywa certyfikatu SSL",
+                    "username": "Nazwa u\u017cytkownika",
+                    "verify_ssl": "AdGuard Home u\u017cywa odpowiedniego certyfikatu."
+                },
+                "description": "Skonfiguruj swoj\u0105 instancj\u0119 AdGuard Home, aby umo\u017cliwi\u0107 monitorowanie i nadz\u00f3r sieci.",
+                "title": "Po\u0142\u0105cz sw\u00f3j AdGuard Home"
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/pt-BR.json
+++ b/homeassistant/components/adguard/.translations/pt-BR.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Apenas uma \u00fanica configura\u00e7\u00e3o do AdGuard Home \u00e9 permitida."
+        },
+        "error": {
+            "connection_error": "Falhou ao conectar."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Deseja configurar o Home Assistant para se conectar ao AdGuard Home fornecido pelo complemento Hass.io: {addon} ?",
+                "title": "AdGuard Home via add-on Hass.io"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Senha",
+                    "port": "Porta",
+                    "ssl": "O AdGuard Home usa um certificado SSL",
+                    "username": "Nome de usu\u00e1rio",
+                    "verify_ssl": "O AdGuard Home usa um certificado apropriado"
+                },
+                "description": "Configure sua inst\u00e2ncia do AdGuard Home para permitir o monitoramento e o controle.",
+                "title": "Vincule o seu AdGuard Home."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/ru.json
+++ b/homeassistant/components/adguard/.translations/ru.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+        },
+        "error": {
+            "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a AdGuard Home (\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io \"{addon}\")?",
+                "title": "AdGuard Home (\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 \u0434\u043b\u044f Hass.io)"
+            },
+            "user": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442",
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+                    "port": "\u041f\u043e\u0440\u0442",
+                    "ssl": "AdGuard Home \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
+                    "username": "\u041b\u043e\u0433\u0438\u043d",
+                    "verify_ssl": "AdGuard Home \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442"
+                },
+                "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0434\u043b\u044f \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430 \u0438 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044f AdGuard Home.",
+                "title": "AdGuard Home"
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/sl.json
+++ b/homeassistant/components/adguard/.translations/sl.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Dovoljena je samo ena konfiguracija AdGuard Home."
+        },
+        "error": {
+            "connection_error": "Povezava ni uspela."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "\u017delite konfigurirati Home Assistant-a za povezavo z AdGuard Home, ki ga ponuja hass.io add-on {addon} ?",
+                "title": "AdGuard Home preko dodatka Hass.io"
+            },
+            "user": {
+                "data": {
+                    "host": "Gostitelj",
+                    "password": "Geslo",
+                    "port": "Vrata",
+                    "ssl": "AdGuard Home uporablja SSL certifikat",
+                    "username": "Uporabni\u0161ko ime",
+                    "verify_ssl": "AdGuard Home uporablja ustrezen certifikat"
+                },
+                "description": "Nastavite primerek AdGuard Home, da omogo\u010dite spremljanje in nadzor.",
+                "title": "Pove\u017eite svoj AdGuard Home."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/sv.json
+++ b/homeassistant/components/adguard/.translations/sv.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Endast en enda konfiguration av AdGuard Home \u00e4r till\u00e5ten."
+        },
+        "error": {
+            "connection_error": "Det gick inte att ansluta."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Vill du konfigurera Home Assistant f\u00f6r att ansluta till AdGuard Home som tillhandah\u00e5lls av Hass.io Add-on: {addon}?",
+                "title": "AdGuard Home via Hass.io-till\u00e4gget"
+            },
+            "user": {
+                "data": {
+                    "host": "V\u00e4rd",
+                    "password": "L\u00f6senord",
+                    "port": "Port",
+                    "ssl": "AdGuard Home anv\u00e4nder ett SSL-certifikat",
+                    "username": "Anv\u00e4ndarnamn",
+                    "verify_ssl": "AdGuard Home anv\u00e4nder ett korrekt certifikat"
+                },
+                "description": "St\u00e4ll in din AdGuard Home-instans f\u00f6r att till\u00e5ta \u00f6vervakning och kontroll.",
+                "title": "L\u00e4nka din AdGuard Home."
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/.translations/vi.json
+++ b/homeassistant/components/adguard/.translations/vi.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u0110\u1ecba ch\u1ec9",
+                    "password": "M\u1eadt kh\u1ea9u",
+                    "port": "C\u1ed5ng",
+                    "username": "T\u00ean \u0111\u0103ng nh\u1eadp"
+                }
+            }
+        }
+    }
+}
--- a/homeassistant/components/adguard/.translations/zh-Hant.json
+++ b/homeassistant/components/adguard/.translations/zh-Hant.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 AdGuard Home\u3002"
+        },
+        "error": {
+            "connection_error": "\u9023\u7dda\u5931\u6557\u3002"
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Home Assistant \u4ee5\u4f7f\u7528 Hass.io \u9644\u52a0\u7d44\u4ef6\uff1a{addon} \u9023\u7dda\u81f3 AdGuard Home\uff1f",
+                "title": "\u4f7f\u7528 Hass.io \u9644\u52a0\u7d44\u4ef6 AdGuard Home"
+            },
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef",
+                    "password": "\u5bc6\u78bc",
+                    "port": "\u901a\u8a0a\u57e0",
+                    "ssl": "AdGuard Home \u4f7f\u7528 SSL \u8a8d\u8b49",
+                    "username": "\u4f7f\u7528\u8005\u540d\u7a31",
+                    "verify_ssl": "AdGuard Home \u4f7f\u7528\u5c0d\u61c9\u8a8d\u8b49"
+                },
+                "description": "\u8a2d\u5b9a AdGuard Home \u4ee5\u9032\u884c\u76e3\u63a7\u3002",
+                "title": "\u9023\u7d50 AdGuard Home\u3002"
+            }
+        },
+        "title": "AdGuard Home"
+    }
+}
--- a/homeassistant/components/adguard/init.py
+++ b/homeassistant/components/adguard/init.py
@@ -0,0 +1,180 @@
+"""Support for AdGuard Home."""
+import logging
+from typing import Any, Dict
+
+from adguardhome import AdGuardHome, AdGuardHomeError
+import voluptuous as vol
+
+from homeassistant.components.adguard.const import (
+    CONF_FORCE, DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERION, DOMAIN,
+    SERVICE_ADD_URL, SERVICE_DISABLE_URL, SERVICE_ENABLE_URL, SERVICE_REFRESH,
+    SERVICE_REMOVE_URL)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_SSL, CONF_URL,
+    CONF_USERNAME, CONF_VERIFY_SSL)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
+
+_LOGGER = logging.getLogger(__name__)
+
+SERVICE_URL_SCHEMA = vol.Schema({vol.Required(CONF_URL): cv.url})
+SERVICE_ADD_URL_SCHEMA = vol.Schema(
+    {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_URL): cv.url}
+)
+SERVICE_REFRESH_SCHEMA = vol.Schema(
+    {vol.Optional(CONF_FORCE, default=False): cv.boolean}
+)
+
+
+async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
+    """Set up the AdGuard Home components."""
+    return True
+
+
+async def async_setup_entry(
+        hass: HomeAssistantType, entry: ConfigEntry
+) -> bool:
+    """Set up AdGuard Home from a config entry."""
+    session = async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL])
+    adguard = AdGuardHome(
+        entry.data[CONF_HOST],
+        port=entry.data[CONF_PORT],
+        username=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+        tls=entry.data[CONF_SSL],
+        verify_ssl=entry.data[CONF_VERIFY_SSL],
+        loop=hass.loop,
+        session=session,
+    )
+
+    hass.data.setdefault(DOMAIN, {})[DATA_ADGUARD_CLIENT] = adguard
+
+    for component in 'sensor', 'switch':
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, component)
+        )
+
+    async def add_url(call) -> None:
+        """Service call to add a new filter subscription to AdGuard Home."""
+        await adguard.filtering.add_url(
+            call.data.get(CONF_NAME), call.data.get(CONF_URL)
+        )
+
+    async def remove_url(call) -> None:
+        """Service call to remove a filter subscription from AdGuard Home."""
+        await adguard.filtering.remove_url(call.data.get(CONF_URL))
+
+    async def enable_url(call) -> None:
+        """Service call to enable a filter subscription in AdGuard Home."""
+        await adguard.filtering.enable_url(call.data.get(CONF_URL))
+
+    async def disable_url(call) -> None:
+        """Service call to disable a filter subscription in AdGuard Home."""
+        await adguard.filtering.disable_url(call.data.get(CONF_URL))
+
+    async def refresh(call) -> None:
+        """Service call to refresh the filter subscriptions in AdGuard Home."""
+        await adguard.filtering.refresh(call.data.get(CONF_FORCE))
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_ADD_URL, add_url, schema=SERVICE_ADD_URL_SCHEMA
+    )
+    hass.services.async_register(
+        DOMAIN, SERVICE_REMOVE_URL, remove_url, schema=SERVICE_URL_SCHEMA
+    )
+    hass.services.async_register(
+        DOMAIN, SERVICE_ENABLE_URL, enable_url, schema=SERVICE_URL_SCHEMA
+    )
+    hass.services.async_register(
+        DOMAIN, SERVICE_DISABLE_URL, disable_url, schema=SERVICE_URL_SCHEMA
+    )
+    hass.services.async_register(
+        DOMAIN, SERVICE_REFRESH, refresh, schema=SERVICE_REFRESH_SCHEMA
+    )
+
+    return True
+
+
+async def async_unload_entry(
+        hass: HomeAssistantType, entry: ConfigType
+) -> bool:
+    """Unload AdGuard Home config entry."""
+    hass.services.async_remove(DOMAIN, SERVICE_ADD_URL)
+    hass.services.async_remove(DOMAIN, SERVICE_REMOVE_URL)
+    hass.services.async_remove(DOMAIN, SERVICE_ENABLE_URL)
+    hass.services.async_remove(DOMAIN, SERVICE_DISABLE_URL)
+    hass.services.async_remove(DOMAIN, SERVICE_REFRESH)
+
+    for component in 'sensor', 'switch':
+        await hass.config_entries.async_forward_entry_unload(entry, component)
+
+    del hass.data[DOMAIN]
+
+    return True
+
+
+class AdGuardHomeEntity(Entity):
+    """Defines a base AdGuard Home entity."""
+
+    def __init__(self, adguard, name: str, icon: str) -> None:
+        """Initialize the AdGuard Home entity."""
+        self._name = name
+        self._icon = icon
+        self._available = True
+        self.adguard = adguard
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def icon(self) -> str:
+        """Return the mdi icon of the entity."""
+        return self._icon
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return self._available
+
+    async def async_update(self) -> None:
+        """Update AdGuard Home entity."""
+        try:
+            await self._adguard_update()
+            self._available = True
+        except AdGuardHomeError:
+            if self._available:
+                _LOGGER.debug(
+                    "An error occurred while updating AdGuard Home sensor.",
+                    exc_info=True,
+                )
+            self._available = False
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        raise NotImplementedError()
+
+
+class AdGuardHomeDeviceEntity(AdGuardHomeEntity):
+    """Defines a AdGuard Home device entity."""
+
+    @property
+    def device_info(self) -> Dict[str, Any]:
+        """Return device information about this AdGuard Home instance."""
+        return {
+            'identifiers': {
+                (
+                    DOMAIN,
+                    self.adguard.host,
+                    self.adguard.port,
+                    self.adguard.base_path,
+                )
+            },
+            'name': 'AdGuard Home',
+            'manufacturer': 'AdGuard Team',
+            'sw_version': self.hass.data[DOMAIN].get(DATA_ADGUARD_VERION),
+        }
--- a/homeassistant/components/adguard/config_flow.py
+++ b/homeassistant/components/adguard/config_flow.py
@@ -0,0 +1,168 @@
+"""Config flow to configure the AdGuard Home integration."""
+import logging
+
+from adguardhome import AdGuardHome, AdGuardHomeConnectionError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components.adguard.const import DOMAIN
+from homeassistant.config_entries import ConfigFlow
+from homeassistant.const import (
+    CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_SSL, CONF_USERNAME,
+    CONF_VERIFY_SSL)
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@config_entries.HANDLERS.register(DOMAIN)
+class AdGuardHomeFlowHandler(ConfigFlow):
+    """Handle a AdGuard Home config flow."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
+
+    _hassio_discovery = None
+
+    def __init__(self):
+        """Initialize AgGuard Home flow."""
+        pass
+
+    async def _show_setup_form(self, errors=None):
+        """Show the setup form to the user."""
+        return self.async_show_form(
+            step_id='user',
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_HOST): str,
+                    vol.Required(CONF_PORT, default=3000): vol.Coerce(int),
+                    vol.Optional(CONF_USERNAME): str,
+                    vol.Optional(CONF_PASSWORD): str,
+                    vol.Required(CONF_SSL, default=True): bool,
+                    vol.Required(CONF_VERIFY_SSL, default=True): bool,
+                }
+            ),
+            errors=errors or {},
+        )
+
+    async def _show_hassio_form(self, errors=None):
+        """Show the Hass.io confirmation form to the user."""
+        return self.async_show_form(
+            step_id='hassio_confirm',
+            description_placeholders={
+                'addon': self._hassio_discovery['addon']
+            },
+            data_schema=vol.Schema({}),
+            errors=errors or {},
+        )
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow initiated by the user."""
+        if self._async_current_entries():
+            return self.async_abort(reason='single_instance_allowed')
+
+        if user_input is None:
+            return await self._show_setup_form(user_input)
+
+        errors = {}
+
+        session = async_get_clientsession(
+            self.hass, user_input[CONF_VERIFY_SSL]
+        )
+
+        adguard = AdGuardHome(
+            user_input[CONF_HOST],
+            port=user_input[CONF_PORT],
+            username=user_input.get(CONF_USERNAME),
+            password=user_input.get(CONF_PASSWORD),
+            tls=user_input[CONF_SSL],
+            verify_ssl=user_input[CONF_VERIFY_SSL],
+            loop=self.hass.loop,
+            session=session,
+        )
+
+        try:
+            await adguard.version()
+        except AdGuardHomeConnectionError:
+            errors['base'] = 'connection_error'
+            return await self._show_setup_form(errors)
+
+        return self.async_create_entry(
+            title=user_input[CONF_HOST],
+            data={
+                CONF_HOST: user_input[CONF_HOST],
+                CONF_PASSWORD: user_input.get(CONF_PASSWORD),
+                CONF_PORT: user_input[CONF_PORT],
+                CONF_SSL: user_input[CONF_SSL],
+                CONF_USERNAME: user_input.get(CONF_USERNAME),
+                CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
+            },
+        )
+
+    async def async_step_hassio(self, user_input=None):
+        """Prepare configuration for a Hass.io AdGuard Home add-on.
+
+        This flow is triggered by the discovery component.
+        """
+        entries = self._async_current_entries()
+
+        if not entries:
+            self._hassio_discovery = user_input
+            return await self.async_step_hassio_confirm()
+
+        cur_entry = entries[0]
+
+        if (cur_entry.data[CONF_HOST] == user_input[CONF_HOST] and
+                cur_entry.data[CONF_PORT] == user_input[CONF_PORT]):
+            return self.async_abort(reason='single_instance_allowed')
+
+        is_loaded = cur_entry.state == config_entries.ENTRY_STATE_LOADED
+
+        if is_loaded:
+            await self.hass.config_entries.async_unload(cur_entry.entry_id)
+
+        self.hass.config_entries.async_update_entry(cur_entry, data={
+            **cur_entry.data,
+            CONF_HOST: user_input[CONF_HOST],
+            CONF_PORT: user_input[CONF_PORT],
+        })
+
+        if is_loaded:
+            await self.hass.config_entries.async_setup(cur_entry.entry_id)
+
+        return self.async_abort(reason='existing_instance_updated')
+
+    async def async_step_hassio_confirm(self, user_input=None):
+        """Confirm Hass.io discovery."""
+        if user_input is None:
+            return await self._show_hassio_form()
+
+        errors = {}
+
+        session = async_get_clientsession(self.hass, False)
+
+        adguard = AdGuardHome(
+            self._hassio_discovery[CONF_HOST],
+            port=self._hassio_discovery[CONF_PORT],
+            tls=False,
+            loop=self.hass.loop,
+            session=session,
+        )
+
+        try:
+            await adguard.version()
+        except AdGuardHomeConnectionError:
+            errors['base'] = 'connection_error'
+            return await self._show_hassio_form(errors)
+
+        return self.async_create_entry(
+            title=self._hassio_discovery['addon'],
+            data={
+                CONF_HOST: self._hassio_discovery[CONF_HOST],
+                CONF_PORT: self._hassio_discovery[CONF_PORT],
+                CONF_PASSWORD: None,
+                CONF_SSL: False,
+                CONF_USERNAME: None,
+                CONF_VERIFY_SSL: True,
+            },
+        )
--- a/homeassistant/components/adguard/const.py
+++ b/homeassistant/components/adguard/const.py
@@ -0,0 +1,14 @@
+"""Constants for the AdGuard Home integration."""
+
+DOMAIN = 'adguard'
+
+DATA_ADGUARD_CLIENT = 'adguard_client'
+DATA_ADGUARD_VERION = 'adguard_version'
+
+CONF_FORCE = 'force'
+
+SERVICE_ADD_URL = 'add_url'
+SERVICE_DISABLE_URL = 'disable_url'
+SERVICE_ENABLE_URL = 'enable_url'
+SERVICE_REFRESH = 'refresh'
+SERVICE_REMOVE_URL = 'remove_url'
--- a/homeassistant/components/adguard/manifest.json
+++ b/homeassistant/components/adguard/manifest.json
@@ -0,0 +1,13 @@
+{
+    "domain": "adguard",
+    "name": "AdGuard Home",
+    "config_flow": true,
+    "documentation": "https://www.home-assistant.io/components/adguard",
+    "requirements": [
+        "adguardhome==0.2.1"
+    ],
+    "dependencies": [],
+    "codeowners": [
+        "@frenck"
+    ]
+}
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -0,0 +1,232 @@
+"""Support for AdGuard Home sensors."""
+from datetime import timedelta
+import logging
+
+from adguardhome import AdGuardHomeConnectionError
+
+from homeassistant.components.adguard import AdGuardHomeDeviceEntity
+from homeassistant.components.adguard.const import (
+    DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERION, DOMAIN)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers.typing import HomeAssistantType
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(seconds=300)
+PARALLEL_UPDATES = 4
+
+
+async def async_setup_entry(
+        hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+) -> None:
+    """Set up AdGuard Home sensor based on a config entry."""
+    adguard = hass.data[DOMAIN][DATA_ADGUARD_CLIENT]
+
+    try:
+        version = await adguard.version()
+    except AdGuardHomeConnectionError as exception:
+        raise PlatformNotReady from exception
+
+    hass.data[DOMAIN][DATA_ADGUARD_VERION] = version
+
+    sensors = [
+        AdGuardHomeDNSQueriesSensor(adguard),
+        AdGuardHomeBlockedFilteringSensor(adguard),
+        AdGuardHomePercentageBlockedSensor(adguard),
+        AdGuardHomeReplacedParentalSensor(adguard),
+        AdGuardHomeReplacedSafeBrowsingSensor(adguard),
+        AdGuardHomeReplacedSafeSearchSensor(adguard),
+        AdGuardHomeAverageProcessingTimeSensor(adguard),
+        AdGuardHomeRulesCountSensor(adguard),
+    ]
+
+    async_add_entities(sensors, True)
+
+
+class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
+    """Defines a AdGuard Home sensor."""
+
+    def __init__(
+            self,
+            adguard,
+            name: str,
+            icon: str,
+            measurement: str,
+            unit_of_measurement: str,
+    ) -> None:
+        """Initialize AdGuard Home sensor."""
+        self._state = None
+        self._unit_of_measurement = unit_of_measurement
+        self.measurement = measurement
+
+        super().__init__(adguard, name, icon)
+
+    @property
+    def unique_id(self) -> str:
+        """Return the unique ID for this sensor."""
+        return '_'.join(
+            [
+                DOMAIN,
+                self.adguard.host,
+                str(self.adguard.port),
+                'sensor',
+                self.measurement,
+            ]
+        )
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self) -> str:
+        """Return the unit this state is expressed in."""
+        return self._unit_of_measurement
+
+
+class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home DNS Queries sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard DNS Queries',
+            'mdi:magnify',
+            'dns_queries',
+            'queries',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.stats.dns_queries()
+
+
+class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home blocked by filtering sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard DNS Queries Blocked',
+            'mdi:magnify-close',
+            'blocked_filtering',
+            'queries',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.stats.blocked_filtering()
+
+
+class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home blocked percentage sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard DNS Queries Blocked Ratio',
+            'mdi:magnify-close',
+            'blocked_percentage',
+            '%',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        percentage = await self.adguard.stats.blocked_percentage()
+        self._state = "{:.2f}".format(percentage)
+
+
+class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home replaced by parental control sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard Parental Control Blocked',
+            'mdi:human-male-girl',
+            'blocked_parental',
+            'requests',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.stats.replaced_parental()
+
+
+class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home replaced by safe browsing sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard Safe Browsing Blocked',
+            'mdi:shield-half-full',
+            'blocked_safebrowsing',
+            'requests',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.stats.replaced_safebrowsing()
+
+
+class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home replaced by safe search sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'Searches Safe Search Enforced',
+            'mdi:shield-search',
+            'enforced_safesearch',
+            'requests',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.stats.replaced_safesearch()
+
+
+class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home average processing time sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard Average Processing Speed',
+            'mdi:speedometer',
+            'average_speed',
+            'ms',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        average = await self.adguard.stats.avg_processing_time()
+        self._state = "{:.2f}".format(average)
+
+
+class AdGuardHomeRulesCountSensor(AdGuardHomeSensor):
+    """Defines a AdGuard Home rules count sensor."""
+
+    def __init__(self, adguard):
+        """Initialize AdGuard Home sensor."""
+        super().__init__(
+            adguard,
+            'AdGuard Rules Count',
+            'mdi:counter',
+            'rules_count',
+            'rules',
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.filtering.rules_count()
--- a/homeassistant/components/adguard/services.yaml
+++ b/homeassistant/components/adguard/services.yaml
@@ -0,0 +1,37 @@
+add_url:
+  description: Add a new filter subscription to AdGuard Home.
+  fields:
+    name:
+      description: The name of the filter subscription.
+      example: Example
+    url:
+      description: The filter URL to subscribe to, containing the filter rules.
+      example: https://www.example.com/filter/1.txt
+
+remove_url:
+  description: Removes a filter subscription from AdGuard Home.
+  fields:
+    url:
+      description: The filter subscription URL to remove.
+      example: https://www.example.com/filter/1.txt
+
+enable_url:
+  description: Enables a filter subscription in AdGuard Home.
+  fields:
+    url:
+      description: The filter subscription URL to enable.
+      example: https://www.example.com/filter/1.txt
+
+disable_url:
+  description: Disables a filter subscription in AdGuard Home.
+  fields:
+    url:
+      description: The filter subscription URL to disable.
+      example: https://www.example.com/filter/1.txt
+
+refresh:
+  description: Refresh all filter subscriptions in AdGuard Home.
+  fields:
+    force:
+      description: Force update (by passes AdGuard Home throttling).
+      example: '"true" to force, "false" or omit for a regular refresh.'
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "title": "AdGuard Home",
+        "step": {
+            "user": {
+                "title": "Link your AdGuard Home.",
+                "description": "Set up your AdGuard Home instance to allow monitoring and control.",
+                "data": {
+                    "host": "Host",
+                    "password": "Password",
+                    "port": "Port",
+                    "username": "Username",
+                    "ssl": "AdGuard Home uses a SSL certificate",
+                    "verify_ssl": "AdGuard Home uses a proper certificate"
+                }
+            },
+            "hassio_confirm": {
+                "title": "AdGuard Home via Hass.io add-on",
+                "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the Hass.io add-on: {addon}?"
+            }
+        },
+        "error": {
+            "connection_error": "Failed to connect."
+        },
+        "abort": {
+            "single_instance_allowed": "Only a single configuration of AdGuard Home is allowed.",
+            "existing_instance_updated": "Updated existing configuration."
+        }
+    }
+}
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -0,0 +1,233 @@
+"""Support for AdGuard Home switches."""
+from datetime import timedelta
+import logging
+
+from adguardhome import AdGuardHomeConnectionError, AdGuardHomeError
+
+from homeassistant.components.adguard import AdGuardHomeDeviceEntity
+from homeassistant.components.adguard.const import (
+    DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERION, DOMAIN)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.exceptions import PlatformNotReady
+from homeassistant.helpers.entity import ToggleEntity
+from homeassistant.helpers.typing import HomeAssistantType
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(seconds=10)
+PARALLEL_UPDATES = 1
+
+
+async def async_setup_entry(
+        hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+) -> None:
+    """Set up AdGuard Home switch based on a config entry."""
+    adguard = hass.data[DOMAIN][DATA_ADGUARD_CLIENT]
+
+    try:
+        version = await adguard.version()
+    except AdGuardHomeConnectionError as exception:
+        raise PlatformNotReady from exception
+
+    hass.data[DOMAIN][DATA_ADGUARD_VERION] = version
+
+    switches = [
+        AdGuardHomeProtectionSwitch(adguard),
+        AdGuardHomeFilteringSwitch(adguard),
+        AdGuardHomeParentalSwitch(adguard),
+        AdGuardHomeSafeBrowsingSwitch(adguard),
+        AdGuardHomeSafeSearchSwitch(adguard),
+        AdGuardHomeQueryLogSwitch(adguard),
+    ]
+    async_add_entities(switches, True)
+
+
+class AdGuardHomeSwitch(ToggleEntity, AdGuardHomeDeviceEntity):
+    """Defines a AdGuard Home switch."""
+
+    def __init__(self, adguard, name: str, icon: str, key: str):
+        """Initialize AdGuard Home switch."""
+        self._state = False
+        self._key = key
+        super().__init__(adguard, name, icon)
+
+    @property
+    def unique_id(self) -> str:
+        """Return the unique ID for this sensor."""
+        return '_'.join(
+            [
+                DOMAIN,
+                self.adguard.host,
+                str(self.adguard.port),
+                'switch',
+                self._key,
+            ]
+        )
+
+    @property
+    def is_on(self) -> bool:
+        """Return the state of the switch."""
+        return self._state
+
+    async def async_turn_off(self, **kwargs) -> None:
+        """Turn off the switch."""
+        try:
+            await self._adguard_turn_off()
+        except AdGuardHomeError:
+            _LOGGER.error(
+                "An error occurred while turning off AdGuard Home switch."
+            )
+            self._available = False
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        raise NotImplementedError()
+
+    async def async_turn_on(self, **kwargs) -> None:
+        """Turn on the switch."""
+        try:
+            await self._adguard_turn_on()
+        except AdGuardHomeError:
+            _LOGGER.error(
+                "An error occurred while turning on AdGuard Home switch."
+            )
+            self._available = False
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        raise NotImplementedError()
+
+
+class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch):
+    """Defines a AdGuard Home protection switch."""
+
+    def __init__(self, adguard) -> None:
+        """Initialize AdGuard Home switch."""
+        super().__init__(
+            adguard, "AdGuard Protection", 'mdi:shield-check', 'protection'
+        )
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        await self.adguard.disable_protection()
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        await self.adguard.enable_protection()
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.protection_enabled()
+
+
+class AdGuardHomeParentalSwitch(AdGuardHomeSwitch):
+    """Defines a AdGuard Home parental control switch."""
+
+    def __init__(self, adguard) -> None:
+        """Initialize AdGuard Home switch."""
+        super().__init__(
+            adguard, "AdGuard Parental Control", 'mdi:shield-check', 'parental'
+        )
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        await self.adguard.parental.disable()
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        await self.adguard.parental.enable()
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.parental.enabled()
+
+
+class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch):
+    """Defines a AdGuard Home safe search switch."""
+
+    def __init__(self, adguard) -> None:
+        """Initialize AdGuard Home switch."""
+        super().__init__(
+            adguard, "AdGuard Safe Search", 'mdi:shield-check', 'safesearch'
+        )
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        await self.adguard.safesearch.disable()
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        await self.adguard.safesearch.enable()
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.safesearch.enabled()
+
+
+class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch):
+    """Defines a AdGuard Home safe search switch."""
+
+    def __init__(self, adguard) -> None:
+        """Initialize AdGuard Home switch."""
+        super().__init__(
+            adguard,
+            "AdGuard Safe Browsing",
+            'mdi:shield-check',
+            'safebrowsing',
+        )
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        await self.adguard.safebrowsing.disable()
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        await self.adguard.safebrowsing.enable()
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.safebrowsing.enabled()
+
+
+class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch):
+    """Defines a AdGuard Home filtering switch."""
+
+    def __init__(self, adguard) -> None:
+        """Initialize AdGuard Home switch."""
+        super().__init__(
+            adguard, "AdGuard Filtering", 'mdi:shield-check', 'filtering'
+        )
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        await self.adguard.filtering.disable()
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        await self.adguard.filtering.enable()
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.filtering.enabled()
+
+
+class AdGuardHomeQueryLogSwitch(AdGuardHomeSwitch):
+    """Defines a AdGuard Home query log switch."""
+
+    def __init__(self, adguard) -> None:
+        """Initialize AdGuard Home switch."""
+        super().__init__(
+            adguard, "AdGuard Query Log", 'mdi:shield-check', 'querylog'
+        )
+
+    async def _adguard_turn_off(self) -> None:
+        """Turn off the switch."""
+        await self.adguard.querylog.disable()
+
+    async def _adguard_turn_on(self) -> None:
+        """Turn on the switch."""
+        await self.adguard.querylog.enable()
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        self._state = await self.adguard.querylog.enabled()
--- a/homeassistant/components/ads/init.py
+++ b/homeassistant/components/ads/init.py
@@ -4,14 +4,15 @@ import struct
 import logging
 import ctypes
 from collections import namedtuple
+import asyncio
+import async_timeout

 import voluptuous as vol

 from homeassistant.const import (
    CONF_DEVICE, CONF_IP_ADDRESS, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
 import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pyads==3.0.7']
+from homeassistant.helpers.entity import Entity

 _LOGGER = logging.getLogger(__name__)

@@ -30,6 +31,11 @@ CONF_ADS_TYPE = 'adstype'
 CONF_ADS_VALUE = 'value'
 CONF_ADS_VAR = 'adsvar'
 CONF_ADS_VAR_BRIGHTNESS = 'adsvar_brightness'
+CONF_ADS_VAR_POSITION = 'adsvar_position'
+
+STATE_KEY_STATE = 'state'
+STATE_KEY_BRIGHTNESS = 'brightness'
+STATE_KEY_POSITION = 'position'

 DOMAIN = 'ads'

@@ -154,29 +160,41 @@ class AdsHub:

    def write_by_name(self, name, value, plc_datatype):
        """Write a value to the device."""
+        import pyads
        with self._lock:
-            return self._client.write_by_name(name, value, plc_datatype)
+            try:
+                return self._client.write_by_name(name, value, plc_datatype)
+            except pyads.ADSError as err:
+                _LOGGER.error("Error writing %s: %s", name, err)

    def read_by_name(self, name, plc_datatype):
        """Read a value from the device."""
+        import pyads
        with self._lock:
-            return self._client.read_by_name(name, plc_datatype)
+            try:
+                return self._client.read_by_name(name, plc_datatype)
+            except pyads.ADSError as err:
+                _LOGGER.error("Error reading %s: %s", name, err)

    def add_device_notification(self, name, plc_datatype, callback):
        """Add a notification to the ADS devices."""
-        from pyads import NotificationAttrib
-        attr = NotificationAttrib(ctypes.sizeof(plc_datatype))
+        import pyads
+        attr = pyads.NotificationAttrib(ctypes.sizeof(plc_datatype))

        with self._lock:
-            hnotify, huser = self._client.add_device_notification(
-                name, attr, self._device_notification_callback)
-            hnotify = int(hnotify)
+            try:
+                hnotify, huser = self._client.add_device_notification(
+                    name, attr, self._device_notification_callback)
+            except pyads.ADSError as err:
+                _LOGGER.error("Error subscribing to %s: %s", name, err)
+            else:
+                hnotify = int(hnotify)
+                self._notification_items[hnotify] = NotificationItem(
+                    hnotify, huser, name, plc_datatype, callback)

-        _LOGGER.debug(
-            "Added device notification %d for variable %s", hnotify, name)
-
-        self._notification_items[hnotify] = NotificationItem(
-            hnotify, huser, name, plc_datatype, callback)
+                _LOGGER.debug(
+                    "Added device notification %d for variable %s",
+                    hnotify, name)

    def _device_notification_callback(self, notification, name):
        """Handle device notifications."""
@@ -187,9 +205,10 @@ class AdsHub:
        data = contents.data

        try:
-            notification_item = self._notification_items[hnotify]
+            with self._lock:
+                notification_item = self._notification_items[hnotify]
        except KeyError:
-            _LOGGER.debug("Unknown device notification handle: %d", hnotify)
+            _LOGGER.error("Unknown device notification handle: %d", hnotify)
            return

        # Parse data to desired datatype
@@ -210,3 +229,68 @@ class AdsHub:
            _LOGGER.warning("No callback available for this datatype")

        notification_item.callback(notification_item.name, value)
+
+
+class AdsEntity(Entity):
+    """Representation of ADS entity."""
+
+    def __init__(self, ads_hub, name, ads_var):
+        """Initialize ADS binary sensor."""
+        self._name = name
+        self._unique_id = ads_var
+        self._state_dict = {}
+        self._state_dict[STATE_KEY_STATE] = None
+        self._ads_hub = ads_hub
+        self._ads_var = ads_var
+        self._event = None
+
+    async def async_initialize_device(
+            self, ads_var, plctype, state_key=STATE_KEY_STATE, factor=None):
+        """Register device notification."""
+        def update(name, value):
+            """Handle device notifications."""
+            _LOGGER.debug('Variable %s changed its value to %d', name, value)
+
+            if factor is None:
+                self._state_dict[state_key] = value
+            else:
+                self._state_dict[state_key] = value / factor
+
+            asyncio.run_coroutine_threadsafe(async_event_set(), self.hass.loop)
+            self.schedule_update_ha_state()
+
+        async def async_event_set():
+            """Set event in async context."""
+            self._event.set()
+
+        self._event = asyncio.Event()
+
+        await self.hass.async_add_executor_job(
+            self._ads_hub.add_device_notification,
+            ads_var, plctype, update)
+        try:
+            with async_timeout.timeout(10):
+                await self._event.wait()
+        except asyncio.TimeoutError:
+            _LOGGER.debug('Variable %s: Timeout during first update',
+                          ads_var)
+
+    @property
+    def name(self):
+        """Return the default name of the binary sensor."""
+        return self._name
+
+    @property
+    def unique_id(self):
+        """Return an unique identifier for this entity."""
+        return self._unique_id
+
+    @property
+    def should_poll(self):
+        """Return False because entity pushes its state to HA."""
+        return False
+
+    @property
+    def available(self):
+        """Return False if state has not been updated yet."""
+        return self._state_dict[STATE_KEY_STATE] is not None
--- a/homeassistant/components/ads/binary_sensor.py
+++ b/homeassistant/components/ads/binary_sensor.py
@@ -3,17 +3,16 @@ import logging

 import voluptuous as vol

-from homeassistant.components.ads import CONF_ADS_VAR, DATA_ADS
 from homeassistant.components.binary_sensor import (
    DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice)
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 import homeassistant.helpers.config_validation as cv

+from . import CONF_ADS_VAR, DATA_ADS, AdsEntity, STATE_KEY_STATE
+
 _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = 'ADS binary sensor'
-DEPENDENCIES = ['ads']
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_ADS_VAR): cv.string,
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -33,51 +32,25 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    add_entities([ads_sensor])


-class AdsBinarySensor(BinarySensorDevice):
+class AdsBinarySensor(AdsEntity, BinarySensorDevice):
    """Representation of ADS binary sensors."""

    def __init__(self, ads_hub, name, ads_var, device_class):
        """Initialize ADS binary sensor."""
-        self._name = name
-        self._unique_id = ads_var
-        self._state = False
+        super().__init__(ads_hub, name, ads_var)
        self._device_class = device_class or 'moving'
-        self._ads_hub = ads_hub
-        self.ads_var = ads_var

    async def async_added_to_hass(self):
        """Register device notification."""
-        def update(name, value):
-            """Handle device notifications."""
-            _LOGGER.debug('Variable %s changed its value to %d', name, value)
-            self._state = value
-            self.schedule_update_ha_state()
-
-        self.hass.async_add_job(
-            self._ads_hub.add_device_notification,
-            self.ads_var, self._ads_hub.PLCTYPE_BOOL, update)
+        await self.async_initialize_device(self._ads_var,
+                                           self._ads_hub.PLCTYPE_BOOL)

    @property
-    def name(self):
-        """Return the default name of the binary sensor."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return an unique identifier for this entity."""
-        return self._unique_id
+    def is_on(self):
+        """Return True if the entity is on."""
+        return self._state_dict[STATE_KEY_STATE]

    @property
    def device_class(self):
        """Return the device class."""
        return self._device_class
-
-    @property
-    def is_on(self):
-        """Return if the binary sensor is on."""
-        return self._state
-
-    @property
-    def should_poll(self):
-        """Return False because entity pushes its state to HA."""
-        return False
--- a/homeassistant/components/ads/cover.py
+++ b/homeassistant/components/ads/cover.py
@@ -0,0 +1,165 @@
+"""Support for ADS covers."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.cover import (
+    PLATFORM_SCHEMA, SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_STOP,
+    SUPPORT_SET_POSITION, ATTR_POSITION, DEVICE_CLASSES_SCHEMA,
+    CoverDevice)
+from homeassistant.const import (
+    CONF_NAME, CONF_DEVICE_CLASS)
+import homeassistant.helpers.config_validation as cv
+
+from . import CONF_ADS_VAR, CONF_ADS_VAR_POSITION, DATA_ADS, \
+    AdsEntity, STATE_KEY_STATE, STATE_KEY_POSITION
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'ADS Cover'
+
+CONF_ADS_VAR_SET_POS = 'adsvar_set_position'
+CONF_ADS_VAR_OPEN = 'adsvar_open'
+CONF_ADS_VAR_CLOSE = 'adsvar_close'
+CONF_ADS_VAR_STOP = 'adsvar_stop'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_ADS_VAR): cv.string,
+    vol.Optional(CONF_ADS_VAR_POSITION): cv.string,
+    vol.Optional(CONF_ADS_VAR_SET_POS): cv.string,
+    vol.Optional(CONF_ADS_VAR_CLOSE): cv.string,
+    vol.Optional(CONF_ADS_VAR_OPEN): cv.string,
+    vol.Optional(CONF_ADS_VAR_STOP): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the cover platform for ADS."""
+    ads_hub = hass.data[DATA_ADS]
+
+    ads_var_is_closed = config.get(CONF_ADS_VAR)
+    ads_var_position = config.get(CONF_ADS_VAR_POSITION)
+    ads_var_pos_set = config.get(CONF_ADS_VAR_SET_POS)
+    ads_var_open = config.get(CONF_ADS_VAR_OPEN)
+    ads_var_close = config.get(CONF_ADS_VAR_CLOSE)
+    ads_var_stop = config.get(CONF_ADS_VAR_STOP)
+    name = config[CONF_NAME]
+    device_class = config.get(CONF_DEVICE_CLASS)
+
+    add_entities([AdsCover(ads_hub,
+                           ads_var_is_closed,
+                           ads_var_position,
+                           ads_var_pos_set,
+                           ads_var_open,
+                           ads_var_close,
+                           ads_var_stop,
+                           name,
+                           device_class)])
+
+
+class AdsCover(AdsEntity, CoverDevice):
+    """Representation of ADS cover."""
+
+    def __init__(self, ads_hub,
+                 ads_var_is_closed, ads_var_position,
+                 ads_var_pos_set, ads_var_open,
+                 ads_var_close, ads_var_stop, name, device_class):
+        """Initialize AdsCover entity."""
+        super().__init__(ads_hub, name, ads_var_is_closed)
+        if self._ads_var is None:
+            if ads_var_position is not None:
+                self._unique_id = ads_var_position
+            elif ads_var_pos_set is not None:
+                self._unique_id = ads_var_pos_set
+            elif ads_var_open is not None:
+                self._unique_id = ads_var_open
+
+        self._state_dict[STATE_KEY_POSITION] = None
+        self._ads_var_position = ads_var_position
+        self._ads_var_pos_set = ads_var_pos_set
+        self._ads_var_open = ads_var_open
+        self._ads_var_close = ads_var_close
+        self._ads_var_stop = ads_var_stop
+        self._device_class = device_class
+
+    async def async_added_to_hass(self):
+        """Register device notification."""
+        if self._ads_var is not None:
+            await self.async_initialize_device(self._ads_var,
+                                               self._ads_hub.PLCTYPE_BOOL)
+
+        if self._ads_var_position is not None:
+            await self.async_initialize_device(self._ads_var_position,
+                                               self._ads_hub.PLCTYPE_BYTE,
+                                               STATE_KEY_POSITION)
+
+    @property
+    def device_class(self):
+        """Return the class of this cover."""
+        return self._device_class
+
+    @property
+    def is_closed(self):
+        """Return if the cover is closed."""
+        if self._ads_var is not None:
+            return self._state_dict[STATE_KEY_STATE]
+        if self._ads_var_position is not None:
+            return self._state_dict[STATE_KEY_POSITION] == 0
+        return None
+
+    @property
+    def current_cover_position(self):
+        """Return current position of cover."""
+        return self._state_dict[STATE_KEY_POSITION]
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        supported_features = SUPPORT_OPEN | SUPPORT_CLOSE
+
+        if self._ads_var_stop is not None:
+            supported_features |= SUPPORT_STOP
+
+        if self._ads_var_pos_set is not None:
+            supported_features |= SUPPORT_SET_POSITION
+
+        return supported_features
+
+    def stop_cover(self, **kwargs):
+        """Fire the stop action."""
+        if self._ads_var_stop:
+            self._ads_hub.write_by_name(self._ads_var_stop, True,
+                                        self._ads_hub.PLCTYPE_BOOL)
+
+    def set_cover_position(self, **kwargs):
+        """Set cover position."""
+        position = kwargs[ATTR_POSITION]
+        if self._ads_var_pos_set is not None:
+            self._ads_hub.write_by_name(self._ads_var_pos_set, position,
+                                        self._ads_hub.PLCTYPE_BYTE)
+
+    def open_cover(self, **kwargs):
+        """Move the cover up."""
+        if self._ads_var_open is not None:
+            self._ads_hub.write_by_name(self._ads_var_open, True,
+                                        self._ads_hub.PLCTYPE_BOOL)
+        elif self._ads_var_pos_set is not None:
+            self.set_cover_position(position=100)
+
+    def close_cover(self, **kwargs):
+        """Move the cover down."""
+        if self._ads_var_close is not None:
+            self._ads_hub.write_by_name(self._ads_var_close, True,
+                                        self._ads_hub.PLCTYPE_BOOL)
+        elif self._ads_var_pos_set is not None:
+            self.set_cover_position(position=0)
+
+    @property
+    def available(self):
+        """Return False if state has not been updated yet."""
+        if self._ads_var is not None or self._ads_var_position is not None:
+            return self._state_dict[STATE_KEY_STATE] is not None or \
+                   self._state_dict[STATE_KEY_POSITION] is not None
+        return True
--- a/homeassistant/components/ads/light.py
+++ b/homeassistant/components/ads/light.py
@@ -1,17 +1,18 @@
 """Support for ADS light sources."""
 import logging
+
 import voluptuous as vol
-from homeassistant.components.light import Light, ATTR_BRIGHTNESS, \
-    SUPPORT_BRIGHTNESS, PLATFORM_SCHEMA
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, Light)
 from homeassistant.const import CONF_NAME
-from homeassistant.components.ads import DATA_ADS, CONF_ADS_VAR, \
-    CONF_ADS_VAR_BRIGHTNESS
 import homeassistant.helpers.config_validation as cv

+from . import CONF_ADS_VAR, CONF_ADS_VAR_BRIGHTNESS, DATA_ADS, \
+    AdsEntity, STATE_KEY_BRIGHTNESS, STATE_KEY_STATE
+
 _LOGGER = logging.getLogger(__name__)
-DEPENDENCIES = ['ads']
 DEFAULT_NAME = 'ADS Light'
-CONF_ADSVAR_BRIGHTNESS = 'adsvar_brightness'
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_ADS_VAR): cv.string,
    vol.Optional(CONF_ADS_VAR_BRIGHTNESS): cv.string,
@@ -28,91 +29,57 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    name = config.get(CONF_NAME)

    add_entities([AdsLight(ads_hub, ads_var_enable, ads_var_brightness,
-                           name)], True)
+                           name)])


-class AdsLight(Light):
+class AdsLight(AdsEntity, Light):
    """Representation of ADS light."""

    def __init__(self, ads_hub, ads_var_enable, ads_var_brightness, name):
        """Initialize AdsLight entity."""
-        self._ads_hub = ads_hub
-        self._on_state = False
-        self._brightness = None
-        self._name = name
-        self._unique_id = ads_var_enable
-        self.ads_var_enable = ads_var_enable
-        self.ads_var_brightness = ads_var_brightness
+        super().__init__(ads_hub, name, ads_var_enable)
+        self._state_dict[STATE_KEY_BRIGHTNESS] = None
+        self._ads_var_brightness = ads_var_brightness

    async def async_added_to_hass(self):
        """Register device notification."""
-        def update_on_state(name, value):
-            """Handle device notifications for state."""
-            _LOGGER.debug('Variable %s changed its value to %d', name, value)
-            self._on_state = value
-            self.schedule_update_ha_state()
+        await self.async_initialize_device(self._ads_var,
+                                           self._ads_hub.PLCTYPE_BOOL)

-        def update_brightness(name, value):
-            """Handle device notification for brightness."""
-            _LOGGER.debug('Variable %s changed its value to %d', name, value)
-            self._brightness = value
-            self.schedule_update_ha_state()
-
-        self.hass.async_add_executor_job(
-            self._ads_hub.add_device_notification,
-            self.ads_var_enable, self._ads_hub.PLCTYPE_BOOL, update_on_state
-        )
-        if self.ads_var_brightness is not None:
-            self.hass.async_add_executor_job(
-                self._ads_hub.add_device_notification,
-                self.ads_var_brightness, self._ads_hub.PLCTYPE_INT,
-                update_brightness
-            )
-
-    @property
-    def name(self):
-        """Return the name of the device if any."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return an unique identifier for this entity."""
-        return self._unique_id
+        if self._ads_var_brightness is not None:
+            await self.async_initialize_device(self._ads_var_brightness,
+                                               self._ads_hub.PLCTYPE_UINT,
+                                               STATE_KEY_BRIGHTNESS)

    @property
    def brightness(self):
        """Return the brightness of the light (0..255)."""
-        return self._brightness
-
-    @property
-    def is_on(self):
-        """Return if light is on."""
-        return self._on_state
-
-    @property
-    def should_poll(self):
-        """Return False because entity pushes its state to HA."""
-        return False
+        return self._state_dict[STATE_KEY_BRIGHTNESS]

    @property
    def supported_features(self):
        """Flag supported features."""
        support = 0
-        if self.ads_var_brightness is not None:
+        if self._ads_var_brightness is not None:
            support = SUPPORT_BRIGHTNESS
        return support

+    @property
+    def is_on(self):
+        """Return True if the entity is on."""
+        return self._state_dict[STATE_KEY_STATE]
+
    def turn_on(self, **kwargs):
        """Turn the light on or set a specific dimmer value."""
        brightness = kwargs.get(ATTR_BRIGHTNESS)
-        self._ads_hub.write_by_name(self.ads_var_enable, True,
+        self._ads_hub.write_by_name(self._ads_var, True,
                                    self._ads_hub.PLCTYPE_BOOL)

-        if self.ads_var_brightness is not None and brightness is not None:
-            self._ads_hub.write_by_name(self.ads_var_brightness, brightness,
+        if self._ads_var_brightness is not None and brightness is not None:
+            self._ads_hub.write_by_name(self._ads_var_brightness, brightness,
                                        self._ads_hub.PLCTYPE_UINT)

    def turn_off(self, **kwargs):
        """Turn the light off."""
-        self._ads_hub.write_by_name(self.ads_var_enable, False,
+        self._ads_hub.write_by_name(self._ads_var, False,
                                    self._ads_hub.PLCTYPE_BOOL)
--- a/homeassistant/components/ads/manifest.json
+++ b/homeassistant/components/ads/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "ads",
+  "name": "Ads",
+  "documentation": "https://www.home-assistant.io/components/ads",
+  "requirements": [
+    "pyads==3.0.7"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/ads/sensor.py
+++ b/homeassistant/components/ads/sensor.py
@@ -4,18 +4,16 @@ import logging
 import voluptuous as vol

 from homeassistant.components import ads
-from homeassistant.components.ads import (
-    CONF_ADS_FACTOR, CONF_ADS_TYPE, CONF_ADS_VAR)
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import CONF_NAME, CONF_UNIT_OF_MEASUREMENT
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity import Entity
+
+from . import CONF_ADS_FACTOR, CONF_ADS_TYPE, CONF_ADS_VAR, \
+    AdsEntity, STATE_KEY_STATE

 _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = "ADS sensor"
-DEPENDENCIES = ['ads']
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_ADS_VAR): cv.string,
    vol.Optional(CONF_ADS_FACTOR): cv.positive_int,
@@ -43,60 +41,31 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    add_entities([entity])


-class AdsSensor(Entity):
+class AdsSensor(AdsEntity):
    """Representation of an ADS sensor entity."""

    def __init__(self, ads_hub, ads_var, ads_type, name, unit_of_measurement,
                 factor):
        """Initialize AdsSensor entity."""
-        self._ads_hub = ads_hub
-        self._name = name
-        self._unique_id = ads_var
-        self._value = None
+        super().__init__(ads_hub, name, ads_var)
        self._unit_of_measurement = unit_of_measurement
-        self.ads_var = ads_var
-        self.ads_type = ads_type
-        self.factor = factor
+        self._ads_type = ads_type
+        self._factor = factor

    async def async_added_to_hass(self):
        """Register device notification."""
-        def update(name, value):
-            """Handle device notifications."""
-            _LOGGER.debug("Variable %s changed its value to %d", name, value)
-
-            # If factor is set use it otherwise not
-            if self.factor is None:
-                self._value = value
-            else:
-                self._value = value / self.factor
-            self.schedule_update_ha_state()
-
-        self.hass.async_add_job(
-            self._ads_hub.add_device_notification,
-            self.ads_var, self._ads_hub.ADS_TYPEMAP[self.ads_type], update
-        )
-
-    @property
-    def name(self):
-        """Return the name of the entity."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return an unique identifier for this entity."""
-        return self._unique_id
+        await self.async_initialize_device(
+            self._ads_var,
+            self._ads_hub.ADS_TYPEMAP[self._ads_type],
+            STATE_KEY_STATE,
+            self._factor)

    @property
    def state(self):
        """Return the state of the device."""
-        return self._value
+        return self._state_dict[STATE_KEY_STATE]

    @property
    def unit_of_measurement(self):
        """Return the unit of measurement."""
        return self._unit_of_measurement
-
-    @property
-    def should_poll(self):
-        """Return False because entity pushes its state."""
-        return False
--- a/homeassistant/components/ads/switch.py
+++ b/homeassistant/components/ads/switch.py
@@ -3,16 +3,14 @@ import logging

 import voluptuous as vol

-from homeassistant.components.ads import CONF_ADS_VAR, DATA_ADS
-from homeassistant.components.switch import PLATFORM_SCHEMA
+from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
 from homeassistant.const import CONF_NAME
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity import ToggleEntity
+
+from . import CONF_ADS_VAR, DATA_ADS, AdsEntity, STATE_KEY_STATE

 _LOGGER = logging.getLogger(__name__)

-DEPENDENCIES = ['ads']
-
 DEFAULT_NAME = 'ADS Switch'

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -28,58 +26,28 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    name = config.get(CONF_NAME)
    ads_var = config.get(CONF_ADS_VAR)

-    add_entities([AdsSwitch(ads_hub, name, ads_var)], True)
+    add_entities([AdsSwitch(ads_hub, name, ads_var)])


-class AdsSwitch(ToggleEntity):
+class AdsSwitch(AdsEntity, SwitchDevice):
    """Representation of an ADS switch device."""

-    def __init__(self, ads_hub, name, ads_var):
-        """Initialize the AdsSwitch entity."""
-        self._ads_hub = ads_hub
-        self._on_state = False
-        self._name = name
-        self._unique_id = ads_var
-        self.ads_var = ads_var
-
    async def async_added_to_hass(self):
        """Register device notification."""
-        def update(name, value):
-            """Handle device notification."""
-            _LOGGER.debug("Variable %s changed its value to %d", name, value)
-            self._on_state = value
-            self.schedule_update_ha_state()
-
-        self.hass.async_add_job(
-            self._ads_hub.add_device_notification,
-            self.ads_var, self._ads_hub.PLCTYPE_BOOL, update)
+        await self.async_initialize_device(self._ads_var,
+                                           self._ads_hub.PLCTYPE_BOOL)

    @property
    def is_on(self):
-        """Return if the switch is turned on."""
-        return self._on_state
-
-    @property
-    def name(self):
-        """Return the name of the entity."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return an unique identifier for this entity."""
-        return self._unique_id
-
-    @property
-    def should_poll(self):
-        """Return False because entity pushes its state to HA."""
-        return False
+        """Return True if the entity is on."""
+        return self._state_dict[STATE_KEY_STATE]

    def turn_on(self, **kwargs):
        """Turn the switch on."""
        self._ads_hub.write_by_name(
-            self.ads_var, True, self._ads_hub.PLCTYPE_BOOL)
+            self._ads_var, True, self._ads_hub.PLCTYPE_BOOL)

    def turn_off(self, **kwargs):
        """Turn the switch off."""
        self._ads_hub.write_by_name(
-            self.ads_var, False, self._ads_hub.PLCTYPE_BOOL)
+            self._ads_var, False, self._ads_hub.PLCTYPE_BOOL)
--- a/homeassistant/components/aftership/init.py
+++ b/homeassistant/components/aftership/init.py
@@ -0,0 +1 @@
+"""The aftership component."""
--- a/homeassistant/components/aftership/const.py
+++ b/homeassistant/components/aftership/const.py
@@ -0,0 +1,2 @@
+"""Constants for the Aftership integration."""
+DOMAIN = 'aftership'
--- a/homeassistant/components/aftership/manifest.json
+++ b/homeassistant/components/aftership/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "aftership",
+  "name": "Aftership",
+  "documentation": "https://www.home-assistant.io/components/aftership",
+  "requirements": [
+    "pyaftership==0.1.2"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/aftership/sensor.py
+++ b/homeassistant/components/aftership/sensor.py
@@ -0,0 +1,209 @@
+"""Support for non-delivered packages recorded in AfterShip."""
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import ATTR_ATTRIBUTION, CONF_API_KEY, CONF_NAME
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTRIBUTION = 'Information provided by AfterShip'
+ATTR_TRACKINGS = 'trackings'
+
+BASE = 'https://track.aftership.com/'
+
+CONF_SLUG = 'slug'
+CONF_TITLE = 'title'
+CONF_TRACKING_NUMBER = 'tracking_number'
+
+DEFAULT_NAME = 'aftership'
+UPDATE_TOPIC = DOMAIN + '_update'
+
+ICON = 'mdi:package-variant-closed'
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
+
+SERVICE_ADD_TRACKING = 'add_tracking'
+SERVICE_REMOVE_TRACKING = 'remove_tracking'
+
+ADD_TRACKING_SERVICE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_TRACKING_NUMBER): cv.string,
+        vol.Optional(CONF_TITLE): cv.string,
+        vol.Optional(CONF_SLUG): cv.string,
+    }
+)
+
+REMOVE_TRACKING_SERVICE_SCHEMA = vol.Schema(
+    {vol.Required(CONF_SLUG): cv.string,
+     vol.Required(CONF_TRACKING_NUMBER): cv.string}
+)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the AfterShip sensor platform."""
+    from pyaftership.tracker import Tracking
+
+    apikey = config[CONF_API_KEY]
+    name = config[CONF_NAME]
+
+    session = async_get_clientsession(hass)
+    aftership = Tracking(hass.loop, session, apikey)
+
+    await aftership.get_trackings()
+
+    if not aftership.meta or aftership.meta['code'] != 200:
+        _LOGGER.error("No tracking data found. Check API key is correct: %s",
+                      aftership.meta)
+        return
+
+    instance = AfterShipSensor(aftership, name)
+
+    async_add_entities([instance], True)
+
+    async def handle_add_tracking(call):
+        """Call when a user adds a new Aftership tracking from HASS."""
+        title = call.data.get(CONF_TITLE)
+        slug = call.data.get(CONF_SLUG)
+        tracking_number = call.data[CONF_TRACKING_NUMBER]
+
+        await aftership.add_package_tracking(tracking_number, title, slug)
+        async_dispatcher_send(hass, UPDATE_TOPIC)
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_ADD_TRACKING,
+        handle_add_tracking,
+        schema=ADD_TRACKING_SERVICE_SCHEMA,
+    )
+
+    async def handle_remove_tracking(call):
+        """Call when a user removes an Aftership tracking from HASS."""
+        slug = call.data[CONF_SLUG]
+        tracking_number = call.data[CONF_TRACKING_NUMBER]
+
+        await aftership.remove_package_tracking(slug, tracking_number)
+        async_dispatcher_send(hass, UPDATE_TOPIC)
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_REMOVE_TRACKING,
+        handle_remove_tracking,
+        schema=REMOVE_TRACKING_SERVICE_SCHEMA,
+    )
+
+
+class AfterShipSensor(Entity):
+    """Representation of a AfterShip sensor."""
+
+    def __init__(self, aftership, name):
+        """Initialize the sensor."""
+        self._attributes = {}
+        self._name = name
+        self._state = None
+        self.aftership = aftership
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity, if any."""
+        return 'packages'
+
+    @property
+    def device_state_attributes(self):
+        """Return attributes for the sensor."""
+        return self._attributes
+
+    @property
+    def icon(self):
+        """Icon to use in the frontend."""
+        return ICON
+
+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        self.hass.helpers.dispatcher.async_dispatcher_connect(
+            UPDATE_TOPIC, self.force_update)
+
+    async def force_update(self):
+        """Force update of data."""
+        await self.async_update(no_throttle=True)
+        await self.async_update_ha_state()
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    async def async_update(self, **kwargs):
+        """Get the latest data from the AfterShip API."""
+        await self.aftership.get_trackings()
+
+        if not self.aftership.meta:
+            _LOGGER.error("Unknown errors when querying")
+            return
+        if self.aftership.meta['code'] != 200:
+            _LOGGER.error(
+                "Errors when querying AfterShip. %s", str(self.aftership.meta))
+            return
+
+        status_to_ignore = {'delivered'}
+        status_counts = {}
+        trackings = []
+        not_delivered_count = 0
+
+        for track in self.aftership.trackings['trackings']:
+            status = track['tag'].lower()
+            name = (
+                track['tracking_number']
+                if track['title'] is None
+                else track['title']
+            )
+            last_checkpoint = (
+                "Shipment pending"
+                if track['tag'] == "Pending"
+                else track['checkpoints'][-1]
+            )
+            status_counts[status] = status_counts.get(status, 0) + 1
+            trackings.append({
+                'name': name,
+                'tracking_number': track['tracking_number'],
+                'slug': track['slug'],
+                'link': '%s%s/%s' %
+                        (BASE, track['slug'], track['tracking_number']),
+                'last_update': track['updated_at'],
+                'expected_delivery': track['expected_delivery'],
+                'status': track['tag'],
+                'last_checkpoint': last_checkpoint
+            })
+
+            if status not in status_to_ignore:
+                not_delivered_count += 1
+            else:
+                _LOGGER.debug("Ignoring %s as it has status: %s", name, status)
+
+        self._attributes = {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            **status_counts,
+            ATTR_TRACKINGS: trackings,
+        }
+
+        self._state = not_delivered_count
--- a/homeassistant/components/aftership/services.yaml
+++ b/homeassistant/components/aftership/services.yaml
@@ -0,0 +1,24 @@
+# Describes the format for available aftership services
+
+add_tracking:
+  description: Add new tracking to Aftership.
+  fields:
+    tracking_number:
+      description: Tracking number for the new tracking
+      example: '123456789'
+    title:
+      description: A custom title for the new tracking
+      example: 'Laptop'
+    slug:
+      description: Slug (carrier) of the new tracking
+      example: 'USPS'
+
+remove_tracking:
+  description: Remove a tracking from Aftership.
+  fields:
+    tracking_number:
+      description: Tracking number of the tracking to remove
+      example: '123456789'
+    slug:
+      description: Slug (carrier) of the tracking to remove
+      example: 'USPS'
--- a/homeassistant/components/air_quality/init.py
+++ b/homeassistant/components/air_quality/init.py
@@ -1,9 +1,4 @@
-"""
-Component for handling Air Quality data for your location.
-
-For more details about this component, please refer to the documentation at
-https://home-assistant.io/components/air_quality/
-"""
+"""Component for handling Air Quality data for your location."""
 from datetime import timedelta
 import logging

--- a/homeassistant/components/air_quality/demo.py
+++ b/homeassistant/components/air_quality/demo.py
@@ -1,56 +0,0 @@
-"""
-Demo platform that offers fake air quality data.
-
-For more details about this platform, please refer to the documentation
-https://home-assistant.io/components/demo/
-"""
-from homeassistant.components.air_quality import AirQualityEntity
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Air Quality."""
-    add_entities([
-        DemoAirQuality('Home', 14, 23, 100),
-        DemoAirQuality('Office', 4, 16, None)
-    ])
-
-
-class DemoAirQuality(AirQualityEntity):
-    """Representation of Air Quality data."""
-
-    def __init__(self, name, pm_2_5, pm_10, n2o):
-        """Initialize the Demo Air Quality."""
-        self._name = name
-        self._pm_2_5 = pm_2_5
-        self._pm_10 = pm_10
-        self._n2o = n2o
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return '{} {}'.format('Demo Air Quality', self._name)
-
-    @property
-    def should_poll(self):
-        """No polling needed for Demo Air Quality."""
-        return False
-
-    @property
-    def particulate_matter_2_5(self):
-        """Return the particulate matter 2.5 level."""
-        return self._pm_2_5
-
-    @property
-    def particulate_matter_10(self):
-        """Return the particulate matter 10 level."""
-        return self._pm_10
-
-    @property
-    def nitrogen_oxide(self):
-        """Return the nitrogen oxide (N2O) level."""
-        return self._n2o
-
-    @property
-    def attribution(self):
-        """Return the attribution."""
-        return 'Powered by Home Assistant'
--- a/homeassistant/components/air_quality/manifest.json
+++ b/homeassistant/components/air_quality/manifest.json
@@ -0,0 +1,8 @@
+{
+  "domain": "air_quality",
+  "name": "Air quality",
+  "documentation": "https://www.home-assistant.io/components/air_quality",
+  "requirements": [],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/air_quality/nilu.py
+++ b/homeassistant/components/air_quality/nilu.py
@@ -1,252 +0,0 @@
-"""
-Sensor for checking the air quality around Norway.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/air_quality.nilu/
-"""
-from datetime import timedelta
-import logging
-
-import voluptuous as vol
-
-from homeassistant.components.air_quality import (
-    PLATFORM_SCHEMA, AirQualityEntity)
-from homeassistant.const import (
-    CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, CONF_SHOW_ON_MAP)
-import homeassistant.helpers.config_validation as cv
-from homeassistant.util import Throttle
-
-REQUIREMENTS = ['niluclient==0.1.2']
-
-_LOGGER = logging.getLogger(__name__)
-
-ATTR_AREA = 'area'
-ATTR_POLLUTION_INDEX = 'nilu_pollution_index'
-ATTRIBUTION = "Data provided by luftkvalitet.info and nilu.no"
-
-CONF_AREA = 'area'
-CONF_STATION = 'stations'
-
-DEFAULT_NAME = 'NILU'
-
-SCAN_INTERVAL = timedelta(minutes=30)
-
-CONF_ALLOWED_AREAS = [
-    'Bergen',
-    'Birkenes',
-    'Bodø',
-    'Brumunddal',
-    'Bærum',
-    'Drammen',
-    'Elverum',
-    'Fredrikstad',
-    'Gjøvik',
-    'Grenland',
-    'Halden',
-    'Hamar',
-    'Harstad',
-    'Hurdal',
-    'Karasjok',
-    'Kristiansand',
-    'Kårvatn',
-    'Lillehammer',
-    'Lillesand',
-    'Lillestrøm',
-    'Lørenskog',
-    'Mo i Rana',
-    'Moss',
-    'Narvik',
-    'Oslo',
-    'Prestebakke',
-    'Sandve',
-    'Sarpsborg',
-    'Stavanger',
-    'Sør-Varanger',
-    'Tromsø',
-    'Trondheim',
-    'Tustervatn',
-    'Zeppelinfjellet',
-    'Ålesund',
-]
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Inclusive(CONF_LATITUDE, 'coordinates',
-                  'Latitude and longitude must exist together'): cv.latitude,
-    vol.Inclusive(CONF_LONGITUDE, 'coordinates',
-                  'Latitude and longitude must exist together'): cv.longitude,
-    vol.Exclusive(CONF_AREA, 'station_collection',
-                  'Can only configure one specific station or '
-                  'stations in a specific area pr sensor. '
-                  'Please only configure station or area.'
-                  ): vol.All(cv.string, vol.In(CONF_ALLOWED_AREAS)),
-    vol.Exclusive(CONF_STATION, 'station_collection',
-                  'Can only configure one specific station or '
-                  'stations in a specific area pr sensor. '
-                  'Please only configure station or area.'
-                  ): vol.All(cv.ensure_list, [cv.string]),
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_SHOW_ON_MAP, default=False): cv.boolean,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the NILU air quality sensor."""
-    import niluclient as nilu
-    name = config.get(CONF_NAME)
-    area = config.get(CONF_AREA)
-    stations = config.get(CONF_STATION)
-    show_on_map = config.get(CONF_SHOW_ON_MAP)
-
-    sensors = []
-
-    if area:
-        stations = nilu.lookup_stations_in_area(area)
-    elif not area and not stations:
-        latitude = config.get(CONF_LATITUDE, hass.config.latitude)
-        longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
-        location_client = nilu.create_location_client(latitude, longitude)
-        stations = location_client.station_names
-
-    for station in stations:
-        client = NiluData(nilu.create_station_client(station))
-        client.update()
-        if client.data.sensors:
-            sensors.append(NiluSensor(client, name, show_on_map))
-        else:
-            _LOGGER.warning("%s didn't give any sensors results", station)
-
-    add_entities(sensors, True)
-
-
-class NiluData:
-    """Class for handling the data retrieval."""
-
-    def __init__(self, api):
-        """Initialize the data object."""
-        self.api = api
-
-    @property
-    def data(self):
-        """Get data cached in client."""
-        return self.api.data
-
-    @Throttle(SCAN_INTERVAL)
-    def update(self):
-        """Get the latest data from nilu API."""
-        self.api.update()
-
-
-class NiluSensor(AirQualityEntity):
-    """Single nilu station air sensor."""
-
-    def __init__(self, api_data: NiluData, name: str, show_on_map: bool):
-        """Initialize the sensor."""
-        self._api = api_data
-        self._name = "{} {}".format(name, api_data.data.name)
-        self._max_aqi = None
-        self._attrs = {}
-
-        if show_on_map:
-            self._attrs[CONF_LATITUDE] = api_data.data.latitude
-            self._attrs[CONF_LONGITUDE] = api_data.data.longitude
-
-    @property
-    def attribution(self) -> str:
-        """Return the attribution."""
-        return ATTRIBUTION
-
-    @property
-    def device_state_attributes(self) -> dict:
-        """Return other details about the sensor state."""
-        return self._attrs
-
-    @property
-    def name(self) -> str:
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def air_quality_index(self) -> str:
-        """Return the Air Quality Index (AQI)."""
-        return self._max_aqi
-
-    @property
-    def carbon_monoxide(self) -> str:
-        """Return the CO (carbon monoxide) level."""
-        from niluclient import CO
-        return self.get_component_state(CO)
-
-    @property
-    def carbon_dioxide(self) -> str:
-        """Return the CO2 (carbon dioxide) level."""
-        from niluclient import CO2
-        return self.get_component_state(CO2)
-
-    @property
-    def nitrogen_oxide(self) -> str:
-        """Return the N2O (nitrogen oxide) level."""
-        from niluclient import NOX
-        return self.get_component_state(NOX)
-
-    @property
-    def nitrogen_monoxide(self) -> str:
-        """Return the NO (nitrogen monoxide) level."""
-        from niluclient import NO
-        return self.get_component_state(NO)
-
-    @property
-    def nitrogen_dioxide(self) -> str:
-        """Return the NO2 (nitrogen dioxide) level."""
-        from niluclient import NO2
-        return self.get_component_state(NO2)
-
-    @property
-    def ozone(self) -> str:
-        """Return the O3 (ozone) level."""
-        from niluclient import OZONE
-        return self.get_component_state(OZONE)
-
-    @property
-    def particulate_matter_2_5(self) -> str:
-        """Return the particulate matter 2.5 level."""
-        from niluclient import PM25
-        return self.get_component_state(PM25)
-
-    @property
-    def particulate_matter_10(self) -> str:
-        """Return the particulate matter 10 level."""
-        from niluclient import PM10
-        return self.get_component_state(PM10)
-
-    @property
-    def particulate_matter_0_1(self) -> str:
-        """Return the particulate matter 0.1 level."""
-        from niluclient import PM1
-        return self.get_component_state(PM1)
-
-    @property
-    def sulphur_dioxide(self) -> str:
-        """Return the SO2 (sulphur dioxide) level."""
-        from niluclient import SO2
-        return self.get_component_state(SO2)
-
-    def get_component_state(self, component_name: str) -> str:
-        """Return formatted value of specified component."""
-        if component_name in self._api.data.sensors:
-            sensor = self._api.data.sensors[component_name]
-            return sensor.value
-        return None
-
-    def update(self) -> None:
-        """Update the sensor."""
-        import niluclient as nilu
-        self._api.update()
-
-        sensors = self._api.data.sensors.values()
-        if sensors:
-            max_index = max([s.pollution_index for s in sensors])
-            self._max_aqi = max_index
-            self._attrs[ATTR_POLLUTION_INDEX] = \
-                nilu.POLLUTION_INDEX[self._max_aqi]
-
-        self._attrs[ATTR_AREA] = self._api.data.area
--- a/homeassistant/components/air_quality/norway_air.py
+++ b/homeassistant/components/air_quality/norway_air.py
@@ -1,140 +0,0 @@
-"""
-Sensor for checking the air quality forecast around Norway.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/air_quality.norway_air/
-"""
-import logging
-
-from datetime import timedelta
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.air_quality import (
-    PLATFORM_SCHEMA, AirQualityEntity)
-from homeassistant.const import (CONF_LATITUDE, CONF_LONGITUDE,
-                                 CONF_NAME)
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-
-REQUIREMENTS = ['pyMetno==0.4.6']
-
-_LOGGER = logging.getLogger(__name__)
-
-ATTRIBUTION = "Air quality from " \
-              "https://luftkvalitet.miljostatus.no/, " \
-              "delivered by the Norwegian Meteorological Institute."
-# https://api.met.no/license_data.html
-
-CONF_FORECAST = 'forecast'
-
-DEFAULT_FORECAST = 0
-DEFAULT_NAME = 'Air quality Norway'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_FORECAST, default=DEFAULT_FORECAST): vol.Coerce(int),
-    vol.Optional(CONF_LATITUDE): cv.latitude,
-    vol.Optional(CONF_LONGITUDE): cv.longitude,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-SCAN_INTERVAL = timedelta(minutes=5)
-
-
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up the air_quality norway sensor."""
-    forecast = config.get(CONF_FORECAST)
-    latitude = config.get(CONF_LATITUDE, hass.config.latitude)
-    longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
-    name = config.get(CONF_NAME)
-
-    if None in (latitude, longitude):
-        _LOGGER.error("Latitude or longitude not set in Home Assistant config")
-        return
-
-    coordinates = {
-        'lat': str(latitude),
-        'lon': str(longitude),
-    }
-
-    async_add_entities([AirSensor(name, coordinates,
-                                  forecast, async_get_clientsession(hass),
-                                  )],
-                       True)
-
-
-def round_state(func):
-    """Round state."""
-    def _decorator(self):
-        res = func(self)
-        if isinstance(res, float):
-            return round(res, 2)
-        return res
-    return _decorator
-
-
-class AirSensor(AirQualityEntity):
-    """Representation of an Yr.no sensor."""
-
-    def __init__(self, name, coordinates, forecast, session):
-        """Initialize the sensor."""
-        import metno
-        self._name = name
-        self._api = metno.AirQualityData(coordinates, forecast, session)
-
-    @property
-    def attribution(self) -> str:
-        """Return the attribution."""
-        return ATTRIBUTION
-
-    @property
-    def device_state_attributes(self) -> dict:
-        """Return other details about the sensor state."""
-        return {'level': self._api.data.get('level'),
-                'location': self._api.data.get('location'),
-                }
-
-    @property
-    def name(self) -> str:
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    @round_state
-    def air_quality_index(self):
-        """Return the Air Quality Index (AQI)."""
-        return self._api.data.get('aqi')
-
-    @property
-    @round_state
-    def nitrogen_dioxide(self):
-        """Return the NO2 (nitrogen dioxide) level."""
-        return self._api.data.get('no2_concentration')
-
-    @property
-    @round_state
-    def ozone(self):
-        """Return the O3 (ozone) level."""
-        return self._api.data.get('o3_concentration')
-
-    @property
-    @round_state
-    def particulate_matter_2_5(self):
-        """Return the particulate matter 2.5 level."""
-        return self._api.data.get('pm25_concentration')
-
-    @property
-    @round_state
-    def particulate_matter_10(self):
-        """Return the particulate matter 10 level."""
-        return self._api.data.get('pm10_concentration')
-
-    @property
-    def unit_of_measurement(self):
-        """Return the unit of measurement of this entity, if any."""
-        return self._api.units.get('pm25_concentration')
-
-    async def async_update(self) -> None:
-        """Update the sensor."""
-        await self._api.update()
--- a/homeassistant/components/air_quality/opensensemap.py
+++ b/homeassistant/components/air_quality/opensensemap.py
@@ -1,100 +0,0 @@
-"""Support for openSenseMap Air Quality data."""
-from datetime import timedelta
-import logging
-
-import voluptuous as vol
-
-from homeassistant.components.air_quality import (
-    PLATFORM_SCHEMA, AirQualityEntity)
-from homeassistant.const import CONF_NAME
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
-from homeassistant.util import Throttle
-
-REQUIREMENTS = ['opensensemap-api==0.1.4']
-
-_LOGGER = logging.getLogger(__name__)
-
-ATTRIBUTION = 'Data provided by openSenseMap'
-
-CONF_STATION_ID = 'station_id'
-
-SCAN_INTERVAL = timedelta(minutes=10)
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_STATION_ID): cv.string,
-    vol.Optional(CONF_NAME): cv.string,
-})
-
-
-async def async_setup_platform(
-        hass, config, async_add_entities, discovery_info=None):
-    """Set up the openSenseMap air quality platform."""
-    from opensensemap_api import OpenSenseMap
-
-    name = config.get(CONF_NAME)
-    station_id = config[CONF_STATION_ID]
-
-    session = async_get_clientsession(hass)
-    osm_api = OpenSenseMapData(OpenSenseMap(station_id, hass.loop, session))
-
-    await osm_api.async_update()
-
-    if 'name' not in osm_api.api.data:
-        _LOGGER.error("Station %s is not available", station_id)
-        return
-
-    station_name = osm_api.api.data['name'] if name is None else name
-
-    async_add_entities([OpenSenseMapQuality(station_name, osm_api)], True)
-
-
-class OpenSenseMapQuality(AirQualityEntity):
-    """Implementation of an openSenseMap air quality entity."""
-
-    def __init__(self, name, osm):
-        """Initialize the air quality entity."""
-        self._name = name
-        self._osm = osm
-
-    @property
-    def name(self):
-        """Return the name of the air quality entity."""
-        return self._name
-
-    @property
-    def particulate_matter_2_5(self):
-        """Return the particulate matter 2.5 level."""
-        return self._osm.api.pm2_5
-
-    @property
-    def particulate_matter_10(self):
-        """Return the particulate matter 10 level."""
-        return self._osm.api.pm10
-
-    @property
-    def attribution(self):
-        """Return the attribution."""
-        return ATTRIBUTION
-
-    async def async_update(self):
-        """Get the latest data from the openSenseMap API."""
-        await self._osm.async_update()
-
-
-class OpenSenseMapData:
-    """Get the latest data and update the states."""
-
-    def __init__(self, api):
-        """Initialize the data object."""
-        self.api = api
-
-    @Throttle(SCAN_INTERVAL)
-    async def async_update(self):
-        """Get the latest data from the Pi-hole."""
-        from opensensemap_api.exceptions import OpenSenseMapError
-
-        try:
-            await self.api.get_data()
-        except OpenSenseMapError as err:
-            _LOGGER.error("Unable to fetch data: %s", err)
--- a/homeassistant/components/airvisual/init.py
+++ b/homeassistant/components/airvisual/init.py
@@ -0,0 +1 @@
+"""The airvisual component."""
--- a/homeassistant/components/airvisual/manifest.json
+++ b/homeassistant/components/airvisual/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "airvisual",
+  "name": "Airvisual",
+  "documentation": "https://www.home-assistant.io/components/airvisual",
+  "requirements": [
+    "pyairvisual==3.0.1"
+  ],
+  "dependencies": [],
+  "codeowners": [
+    "@bachya"
+  ]
+}
--- a/homeassistant/components/airvisual/sensor.py
+++ b/homeassistant/components/airvisual/sensor.py
@@ -0,0 +1,294 @@
+"""Support for AirVisual air quality sensors."""
+from logging import getLogger
+from datetime import timedelta
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, ATTR_LATITUDE, ATTR_LONGITUDE, CONF_API_KEY,
+    CONF_LATITUDE, CONF_LONGITUDE, CONF_MONITORED_CONDITIONS,
+    CONF_SCAN_INTERVAL, CONF_STATE, CONF_SHOW_ON_MAP)
+from homeassistant.helpers import aiohttp_client, config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+
+_LOGGER = getLogger(__name__)
+
+ATTR_CITY = 'city'
+ATTR_COUNTRY = 'country'
+ATTR_POLLUTANT_SYMBOL = 'pollutant_symbol'
+ATTR_POLLUTANT_UNIT = 'pollutant_unit'
+ATTR_REGION = 'region'
+
+CONF_CITY = 'city'
+CONF_COUNTRY = 'country'
+
+DEFAULT_ATTRIBUTION = "Data provided by AirVisual"
+DEFAULT_SCAN_INTERVAL = timedelta(minutes=10)
+
+MASS_PARTS_PER_MILLION = 'ppm'
+MASS_PARTS_PER_BILLION = 'ppb'
+VOLUME_MICROGRAMS_PER_CUBIC_METER = 'µg/m3'
+
+SENSOR_TYPE_LEVEL = 'air_pollution_level'
+SENSOR_TYPE_AQI = 'air_quality_index'
+SENSOR_TYPE_POLLUTANT = 'main_pollutant'
+SENSORS = [
+    (SENSOR_TYPE_LEVEL, 'Air Pollution Level', 'mdi:gauge', None),
+    (SENSOR_TYPE_AQI, 'Air Quality Index', 'mdi:chart-line', 'AQI'),
+    (SENSOR_TYPE_POLLUTANT, 'Main Pollutant', 'mdi:chemical-weapon', None),
+]
+
+POLLUTANT_LEVEL_MAPPING = [{
+    'label': 'Good',
+    'icon': 'mdi:emoticon-excited',
+    'minimum': 0,
+    'maximum': 50
+}, {
+    'label': 'Moderate',
+    'icon': 'mdi:emoticon-happy',
+    'minimum': 51,
+    'maximum': 100
+}, {
+    'label': 'Unhealthy for sensitive groups',
+    'icon': 'mdi:emoticon-neutral',
+    'minimum': 101,
+    'maximum': 150
+}, {
+    'label': 'Unhealthy',
+    'icon': 'mdi:emoticon-sad',
+    'minimum': 151,
+    'maximum': 200
+}, {
+    'label': 'Very Unhealthy',
+    'icon': 'mdi:emoticon-dead',
+    'minimum': 201,
+    'maximum': 300
+}, {
+    'label': 'Hazardous',
+    'icon': 'mdi:biohazard',
+    'minimum': 301,
+    'maximum': 10000
+}]
+
+POLLUTANT_MAPPING = {
+    'co': {
+        'label': 'Carbon Monoxide',
+        'unit': MASS_PARTS_PER_MILLION
+    },
+    'n2': {
+        'label': 'Nitrogen Dioxide',
+        'unit': MASS_PARTS_PER_BILLION
+    },
+    'o3': {
+        'label': 'Ozone',
+        'unit': MASS_PARTS_PER_BILLION
+    },
+    'p1': {
+        'label': 'PM10',
+        'unit': VOLUME_MICROGRAMS_PER_CUBIC_METER
+    },
+    'p2': {
+        'label': 'PM2.5',
+        'unit': VOLUME_MICROGRAMS_PER_CUBIC_METER
+    },
+    's2': {
+        'label': 'Sulfur Dioxide',
+        'unit': MASS_PARTS_PER_BILLION
+    },
+}
+
+SENSOR_LOCALES = {'cn': 'Chinese', 'us': 'U.S.'}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Required(CONF_MONITORED_CONDITIONS, default=list(SENSOR_LOCALES)):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_LOCALES)]),
+    vol.Inclusive(CONF_CITY, 'city'): cv.string,
+    vol.Inclusive(CONF_COUNTRY, 'city'): cv.string,
+    vol.Inclusive(CONF_LATITUDE, 'coords'): cv.latitude,
+    vol.Inclusive(CONF_LONGITUDE, 'coords'): cv.longitude,
+    vol.Optional(CONF_SHOW_ON_MAP, default=True): cv.boolean,
+    vol.Inclusive(CONF_STATE, 'city'): cv.string,
+    vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL):
+        cv.time_period
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Configure the platform and add the sensors."""
+    from pyairvisual import Client
+
+    city = config.get(CONF_CITY)
+    state = config.get(CONF_STATE)
+    country = config.get(CONF_COUNTRY)
+
+    latitude = config.get(CONF_LATITUDE, hass.config.latitude)
+    longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
+
+    websession = aiohttp_client.async_get_clientsession(hass)
+
+    if city and state and country:
+        _LOGGER.debug(
+            "Using city, state, and country: %s, %s, %s", city, state, country)
+        location_id = ','.join((city, state, country))
+        data = AirVisualData(
+            Client(websession, api_key=config[CONF_API_KEY]),
+            city=city,
+            state=state,
+            country=country,
+            show_on_map=config[CONF_SHOW_ON_MAP],
+            scan_interval=config[CONF_SCAN_INTERVAL])
+    else:
+        _LOGGER.debug(
+            "Using latitude and longitude: %s, %s", latitude, longitude)
+        location_id = ','.join((str(latitude), str(longitude)))
+        data = AirVisualData(
+            Client(websession, api_key=config[CONF_API_KEY]),
+            latitude=latitude,
+            longitude=longitude,
+            show_on_map=config[CONF_SHOW_ON_MAP],
+            scan_interval=config[CONF_SCAN_INTERVAL])
+
+    await data.async_update()
+
+    sensors = []
+    for locale in config[CONF_MONITORED_CONDITIONS]:
+        for kind, name, icon, unit in SENSORS:
+            sensors.append(
+                AirVisualSensor(
+                    data, kind, name, icon, unit, locale, location_id))
+
+    async_add_entities(sensors, True)
+
+
+class AirVisualSensor(Entity):
+    """Define an AirVisual sensor."""
+
+    def __init__(self, airvisual, kind, name, icon, unit, locale, location_id):
+        """Initialize."""
+        self._attrs = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
+        self._icon = icon
+        self._locale = locale
+        self._location_id = location_id
+        self._name = name
+        self._state = None
+        self._type = kind
+        self._unit = unit
+        self.airvisual = airvisual
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        if self.airvisual.show_on_map:
+            self._attrs[ATTR_LATITUDE] = self.airvisual.latitude
+            self._attrs[ATTR_LONGITUDE] = self.airvisual.longitude
+        else:
+            self._attrs['lati'] = self.airvisual.latitude
+            self._attrs['long'] = self.airvisual.longitude
+
+        return self._attrs
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return bool(self.airvisual.pollution_info)
+
+    @property
+    def icon(self):
+        """Return the icon."""
+        return self._icon
+
+    @property
+    def name(self):
+        """Return the name."""
+        return '{0} {1}'.format(SENSOR_LOCALES[self._locale], self._name)
+
+    @property
+    def state(self):
+        """Return the state."""
+        return self._state
+
+    @property
+    def unique_id(self):
+        """Return a unique, HASS-friendly identifier for this entity."""
+        return '{0}_{1}_{2}'.format(
+            self._location_id, self._locale, self._type)
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit the value is expressed in."""
+        return self._unit
+
+    async def async_update(self):
+        """Update the sensor."""
+        await self.airvisual.async_update()
+        data = self.airvisual.pollution_info
+
+        if not data:
+            return
+
+        if self._type == SENSOR_TYPE_LEVEL:
+            aqi = data['aqi{0}'.format(self._locale)]
+            [level] = [
+                i for i in POLLUTANT_LEVEL_MAPPING
+                if i['minimum'] <= aqi <= i['maximum']
+            ]
+            self._state = level['label']
+            self._icon = level['icon']
+        elif self._type == SENSOR_TYPE_AQI:
+            self._state = data['aqi{0}'.format(self._locale)]
+        elif self._type == SENSOR_TYPE_POLLUTANT:
+            symbol = data['main{0}'.format(self._locale)]
+            self._state = POLLUTANT_MAPPING[symbol]['label']
+            self._attrs.update({
+                ATTR_POLLUTANT_SYMBOL: symbol,
+                ATTR_POLLUTANT_UNIT: POLLUTANT_MAPPING[symbol]['unit']
+            })
+
+
+class AirVisualData:
+    """Define an object to hold sensor data."""
+
+    def __init__(self, client, **kwargs):
+        """Initialize."""
+        self._client = client
+        self.city = kwargs.get(CONF_CITY)
+        self.country = kwargs.get(CONF_COUNTRY)
+        self.latitude = kwargs.get(CONF_LATITUDE)
+        self.longitude = kwargs.get(CONF_LONGITUDE)
+        self.pollution_info = {}
+        self.show_on_map = kwargs.get(CONF_SHOW_ON_MAP)
+        self.state = kwargs.get(CONF_STATE)
+
+        self.async_update = Throttle(
+            kwargs[CONF_SCAN_INTERVAL])(self._async_update)
+
+    async def _async_update(self):
+        """Update AirVisual data."""
+        from pyairvisual.errors import AirVisualError
+
+        try:
+            if self.city and self.state and self.country:
+                resp = await self._client.api.city(
+                    self.city, self.state, self.country)
+                self.longitude, self.latitude = resp['location']['coordinates']
+            else:
+                resp = await self._client.api.nearest_city(
+                    self.latitude, self.longitude)
+
+            _LOGGER.debug("New data retrieved: %s", resp)
+
+            self.pollution_info = resp['current']['pollution']
+        except (KeyError, AirVisualError) as err:
+            if self.city and self.state and self.country:
+                location = (self.city, self.state, self.country)
+            else:
+                location = (self.latitude, self.longitude)
+
+            _LOGGER.error(
+                "Can't retrieve data for location: %s (%s)", location,
+                err)
+            self.pollution_info = {}
--- a/homeassistant/components/aladdin_connect/init.py
+++ b/homeassistant/components/aladdin_connect/init.py
@@ -0,0 +1 @@
+"""The aladdin_connect component."""
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -0,0 +1,113 @@
+"""Platform for the Aladdin Connect cover component."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.cover import (CoverDevice, PLATFORM_SCHEMA,
+                                            SUPPORT_OPEN, SUPPORT_CLOSE)
+from homeassistant.const import (CONF_USERNAME, CONF_PASSWORD, STATE_CLOSED,
+                                 STATE_OPENING, STATE_CLOSING, STATE_OPEN)
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+NOTIFICATION_ID = 'aladdin_notification'
+NOTIFICATION_TITLE = 'Aladdin Connect Cover Setup'
+
+STATES_MAP = {
+    'open': STATE_OPEN,
+    'opening': STATE_OPENING,
+    'closed': STATE_CLOSED,
+    'closing': STATE_CLOSING
+}
+
+SUPPORTED_FEATURES = SUPPORT_OPEN | SUPPORT_CLOSE
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Aladdin Connect platform."""
+    from aladdin_connect import AladdinConnectClient
+
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+    acc = AladdinConnectClient(username, password)
+
+    try:
+        if not acc.login():
+            raise ValueError("Username or Password is incorrect")
+        add_entities(AladdinDevice(acc, door) for door in acc.get_doors())
+    except (TypeError, KeyError, NameError, ValueError) as ex:
+        _LOGGER.error("%s", ex)
+        hass.components.persistent_notification.create(
+            'Error: {}<br />'
+            'You will need to restart hass after fixing.'
+            ''.format(ex),
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+
+
+class AladdinDevice(CoverDevice):
+    """Representation of Aladdin Connect cover."""
+
+    def __init__(self, acc, device):
+        """Initialize the cover."""
+        self._acc = acc
+        self._device_id = device['device_id']
+        self._number = device['door_number']
+        self._name = device['name']
+        self._status = STATES_MAP.get(device['status'])
+
+    @property
+    def device_class(self):
+        """Define this cover as a garage door."""
+        return 'garage'
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return SUPPORTED_FEATURES
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return '{}-{}'.format(self._device_id, self._number)
+
+    @property
+    def name(self):
+        """Return the name of the garage door."""
+        return self._name
+
+    @property
+    def is_opening(self):
+        """Return if the cover is opening or not."""
+        return self._status == STATE_OPENING
+
+    @property
+    def is_closing(self):
+        """Return if the cover is closing or not."""
+        return self._status == STATE_CLOSING
+
+    @property
+    def is_closed(self):
+        """Return None if status is unknown, True if closed, else False."""
+        if self._status is None:
+            return None
+        return self._status == STATE_CLOSED
+
+    def close_cover(self, **kwargs):
+        """Issue close command to cover."""
+        self._acc.close_door(self._device_id, self._number)
+
+    def open_cover(self, **kwargs):
+        """Issue open command to cover."""
+        self._acc.open_door(self._device_id, self._number)
+
+    def update(self):
+        """Update status of cover."""
+        acc_status = self._acc.get_door_status(self._device_id, self._number)
+        self._status = STATES_MAP.get(acc_status)
--- a/homeassistant/components/aladdin_connect/manifest.json
+++ b/homeassistant/components/aladdin_connect/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "aladdin_connect",
+  "name": "Aladdin connect",
+  "documentation": "https://www.home-assistant.io/components/aladdin_connect",
+  "requirements": [
+    "aladdin_connect==0.3"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -1,9 +1,4 @@
-"""
-Component to interface with an alarm control panel.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel/
-"""
+"""Component to interface with an alarm control panel."""
 from datetime import timedelta
 import logging

@@ -24,6 +19,7 @@ SCAN_INTERVAL = timedelta(seconds=30)
 ATTR_CHANGED_BY = 'changed_by'
 FORMAT_TEXT = 'text'
 FORMAT_NUMBER = 'number'
+ATTR_CODE_ARM_REQUIRED = 'code_arm_required'

 ENTITY_ID_FORMAT = DOMAIN + '.{}'

@@ -92,6 +88,11 @@ class AlarmControlPanel(Entity):
        """Last change triggered by."""
        return None

+    @property
+    def code_arm_required(self):
+        """Whether the code is required for arm actions."""
+        return True
+
    def alarm_disarm(self, code=None):
        """Send disarm command."""
        raise NotImplementedError()
@@ -164,6 +165,7 @@ class AlarmControlPanel(Entity):
        """Return the state attributes."""
        state_attr = {
            ATTR_CODE_FORMAT: self.code_format,
-            ATTR_CHANGED_BY: self.changed_by
+            ATTR_CHANGED_BY: self.changed_by,
+            ATTR_CODE_ARM_REQUIRED: self.code_arm_required
        }
        return state_attr
--- a/homeassistant/components/alarm_control_panel/alarmdotcom.py
+++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py
@@ -1,125 +0,0 @@
-"""
-Interfaces with Alarm.com alarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
-"""
-import logging
-import re
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_CODE, CONF_NAME, CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pyalarmdotcom==0.3.2']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_NAME = 'Alarm.com'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_CODE): cv.positive_int,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up a Alarm.com control panel."""
-    name = config.get(CONF_NAME)
-    code = config.get(CONF_CODE)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-
-    alarmdotcom = AlarmDotCom(hass, name, code, username, password)
-    await alarmdotcom.async_login()
-    async_add_entities([alarmdotcom])
-
-
-class AlarmDotCom(alarm.AlarmControlPanel):
-    """Representation of an Alarm.com status."""
-
-    def __init__(self, hass, name, code, username, password):
-        """Initialize the Alarm.com status."""
-        from pyalarmdotcom import Alarmdotcom
-        _LOGGER.debug('Setting up Alarm.com...')
-        self._hass = hass
-        self._name = name
-        self._code = str(code) if code else None
-        self._username = username
-        self._password = password
-        self._websession = async_get_clientsession(self._hass)
-        self._state = None
-        self._alarm = Alarmdotcom(
-            username, password, self._websession, hass.loop)
-
-    async def async_login(self):
-        """Login to Alarm.com."""
-        await self._alarm.async_login()
-
-    async def async_update(self):
-        """Fetch the latest state."""
-        await self._alarm.async_update()
-        return self._alarm.state
-
-    @property
-    def name(self):
-        """Return the name of the alarm."""
-        return self._name
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return alarm.FORMAT_NUMBER
-        return alarm.FORMAT_TEXT
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        if self._alarm.state.lower() == 'disarmed':
-            return STATE_ALARM_DISARMED
-        if self._alarm.state.lower() == 'armed stay':
-            return STATE_ALARM_ARMED_HOME
-        if self._alarm.state.lower() == 'armed away':
-            return STATE_ALARM_ARMED_AWAY
-        return None
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            'sensor_status': self._alarm.sensor_status
-        }
-
-    async def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if self._validate_code(code):
-            await self._alarm.async_alarm_disarm()
-
-    async def async_alarm_arm_home(self, code=None):
-        """Send arm hom command."""
-        if self._validate_code(code):
-            await self._alarm.async_alarm_arm_home()
-
-    async def async_alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if self._validate_code(code):
-            await self._alarm.async_alarm_arm_away()
-
-    def _validate_code(self, code):
-        """Validate given code."""
-        check = self._code is None or code == self._code
-        if not check:
-            _LOGGER.warning("Wrong code entered")
-        return check
--- a/homeassistant/components/alarm_control_panel/canary.py
+++ b/homeassistant/components/alarm_control_panel/canary.py
@@ -1,91 +0,0 @@
-"""
-Support for Canary alarm.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.canary/
-"""
-import logging
-
-from homeassistant.components.alarm_control_panel import AlarmControlPanel
-from homeassistant.components.canary import DATA_CANARY
-from homeassistant.const import STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY, \
-    STATE_ALARM_ARMED_NIGHT, STATE_ALARM_ARMED_HOME
-
-DEPENDENCIES = ['canary']
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Canary alarms."""
-    data = hass.data[DATA_CANARY]
-    devices = []
-
-    for location in data.locations:
-        devices.append(CanaryAlarm(data, location.location_id))
-
-    add_entities(devices, True)
-
-
-class CanaryAlarm(AlarmControlPanel):
-    """Representation of a Canary alarm control panel."""
-
-    def __init__(self, data, location_id):
-        """Initialize a Canary security camera."""
-        self._data = data
-        self._location_id = location_id
-
-    @property
-    def name(self):
-        """Return the name of the alarm."""
-        location = self._data.get_location(self._location_id)
-        return location.name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        from canary.api import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, \
-            LOCATION_MODE_NIGHT
-
-        location = self._data.get_location(self._location_id)
-
-        if location.is_private:
-            return STATE_ALARM_DISARMED
-
-        mode = location.mode
-        if mode.name == LOCATION_MODE_AWAY:
-            return STATE_ALARM_ARMED_AWAY
-        if mode.name == LOCATION_MODE_HOME:
-            return STATE_ALARM_ARMED_HOME
-        if mode.name == LOCATION_MODE_NIGHT:
-            return STATE_ALARM_ARMED_NIGHT
-        return None
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        location = self._data.get_location(self._location_id)
-        return {
-            'private': location.is_private
-        }
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        location = self._data.get_location(self._location_id)
-        self._data.set_location_mode(self._location_id, location.mode.name,
-                                     True)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        from canary.api import LOCATION_MODE_HOME
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_HOME)
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        from canary.api import LOCATION_MODE_AWAY
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_AWAY)
-
-    def alarm_arm_night(self, code=None):
-        """Send arm night command."""
-        from canary.api import LOCATION_MODE_NIGHT
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_NIGHT)
--- a/homeassistant/components/alarm_control_panel/concord232.py
+++ b/homeassistant/components/alarm_control_panel/concord232.py
@@ -1,109 +0,0 @@
-"""
-Support for Concord232 alarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.concord232/
-"""
-import datetime
-import logging
-
-import requests
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
-
-REQUIREMENTS = ['concord232==0.15']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_HOST = 'localhost'
-DEFAULT_NAME = 'CONCORD232'
-DEFAULT_PORT = 5007
-
-SCAN_INTERVAL = datetime.timedelta(seconds=10)
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Concord232 alarm control panel platform."""
-    name = config.get(CONF_NAME)
-    host = config.get(CONF_HOST)
-    port = config.get(CONF_PORT)
-
-    url = 'http://{}:{}'.format(host, port)
-
-    try:
-        add_entities([Concord232Alarm(url, name)], True)
-    except requests.exceptions.ConnectionError as ex:
-        _LOGGER.error("Unable to connect to Concord232: %s", str(ex))
-
-
-class Concord232Alarm(alarm.AlarmControlPanel):
-    """Representation of the Concord232-based alarm panel."""
-
-    def __init__(self, url, name):
-        """Initialize the Concord232 alarm panel."""
-        from concord232 import client as concord232_client
-
-        self._state = None
-        self._name = name
-        self._url = url
-        self._alarm = concord232_client.Client(self._url)
-        self._alarm.partitions = self._alarm.list_partitions()
-        self._alarm.last_partition_update = datetime.datetime.now()
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def code_format(self):
-        """Return the characters if code is defined."""
-        return alarm.FORMAT_NUMBER
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    def update(self):
-        """Update values from API."""
-        try:
-            part = self._alarm.list_partitions()[0]
-        except requests.exceptions.ConnectionError as ex:
-            _LOGGER.error("Unable to connect to %(host)s: %(reason)s",
-                          dict(host=self._url, reason=ex))
-            return
-        except IndexError:
-            _LOGGER.error("Concord232 reports no partitions")
-            return
-
-        if part['arming_level'] == 'Off':
-            self._state = STATE_ALARM_DISARMED
-        elif 'Home' in part['arming_level']:
-            self._state = STATE_ALARM_ARMED_HOME
-        else:
-            self._state = STATE_ALARM_ARMED_AWAY
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        self._alarm.disarm(code)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        self._alarm.arm('stay')
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        self._alarm.arm('away')
--- a/homeassistant/components/alarm_control_panel/demo.py
+++ b/homeassistant/components/alarm_control_panel/demo.py
@@ -1,49 +0,0 @@
-"""
-Demo platform that has two fake alarm control panels.
-
-For more details about this platform, please refer to the documentation
-https://home-assistant.io/components/demo/
-"""
-import datetime
-from homeassistant.components.alarm_control_panel import manual
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_CUSTOM_BYPASS,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED, CONF_DELAY_TIME,
-    CONF_PENDING_TIME, CONF_TRIGGER_TIME)
-
-
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up the Demo alarm control panel platform."""
-    async_add_entities([
-        manual.ManualAlarm(hass, 'Alarm', '1234', None, False, {
-            STATE_ALARM_ARMED_AWAY: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_ARMED_HOME: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_ARMED_NIGHT: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_DISARMED: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_ARMED_CUSTOM_BYPASS: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_TRIGGERED: {
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-            },
-        }),
-    ])
--- a/homeassistant/components/alarm_control_panel/ialarm.py
+++ b/homeassistant/components/alarm_control_panel/ialarm.py
@@ -1,133 +0,0 @@
-"""
-Interfaces with iAlarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.ialarm/
-"""
-import logging
-import re
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_CODE, CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME,
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_ALARM_TRIGGERED)
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pyialarm==0.3']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_NAME = 'iAlarm'
-
-
-def no_application_protocol(value):
-    """Validate that value is without the application protocol."""
-    protocol_separator = "://"
-    if not value or protocol_separator in value:
-        raise vol.Invalid(
-            'Invalid host, {} is not allowed'.format(protocol_separator))
-
-    return value
-
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST): vol.All(cv.string, no_application_protocol),
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_CODE): cv.positive_int,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up an iAlarm control panel."""
-    name = config.get(CONF_NAME)
-    code = config.get(CONF_CODE)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-    host = config.get(CONF_HOST)
-
-    url = 'http://{}'.format(host)
-    ialarm = IAlarmPanel(name, code, username, password, url)
-    add_entities([ialarm], True)
-
-
-class IAlarmPanel(alarm.AlarmControlPanel):
-    """Representation of an iAlarm status."""
-
-    def __init__(self, name, code, username, password, url):
-        """Initialize the iAlarm status."""
-        from pyialarm import IAlarm
-
-        self._name = name
-        self._code = str(code) if code else None
-        self._username = username
-        self._password = password
-        self._url = url
-        self._state = None
-        self._client = IAlarm(username, password, url)
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return alarm.FORMAT_NUMBER
-        return alarm.FORMAT_TEXT
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    def update(self):
-        """Return the state of the device."""
-        status = self._client.get_status()
-        _LOGGER.debug('iAlarm status: %s', status)
-        if status:
-            status = int(status)
-
-        if status == self._client.DISARMED:
-            state = STATE_ALARM_DISARMED
-        elif status == self._client.ARMED_AWAY:
-            state = STATE_ALARM_ARMED_AWAY
-        elif status == self._client.ARMED_STAY:
-            state = STATE_ALARM_ARMED_HOME
-        elif status == self._client.TRIGGERED:
-            state = STATE_ALARM_TRIGGERED
-        else:
-            state = None
-
-        self._state = state
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if self._validate_code(code):
-            self._client.disarm()
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if self._validate_code(code):
-            self._client.arm_away()
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if self._validate_code(code):
-            self._client.arm_stay()
-
-    def _validate_code(self, code):
-        """Validate given code."""
-        check = self._code is None or code == self._code
-        if not check:
-            _LOGGER.warning("Wrong code entered")
-        return check
--- a/homeassistant/components/alarm_control_panel/manifest.json
+++ b/homeassistant/components/alarm_control_panel/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "alarm_control_panel",
+  "name": "Alarm control panel",
+  "documentation": "https://www.home-assistant.io/components/alarm_control_panel",
+  "requirements": [],
+  "dependencies": [],
+  "codeowners": [
+    "@colinodell"
+  ]
+}
--- a/Show More
+++ b/Show More