diff --git a/homeassistant/__init__.py b/homeassistant/__init__.py
index b7b0f8ef439..a2be3780619 100644
--- a/homeassistant/__init__.py
+++ b/homeassistant/__init__.py
@@ -18,7 +18,8 @@ import functools as ft
 from homeassistant.const import (
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
     SERVICE_HOMEASSISTANT_STOP, EVENT_TIME_CHANGED, EVENT_STATE_CHANGED,
-    EVENT_CALL_SERVICE, ATTR_NOW, ATTR_DOMAIN, ATTR_SERVICE, MATCH_ALL)
+    EVENT_CALL_SERVICE, ATTR_NOW, ATTR_DOMAIN, ATTR_SERVICE, MATCH_ALL,
+    EVENT_SERVICE_EXECUTED, ATTR_SERVICE_CALL_ID)
 import homeassistant.util as util
 
 DOMAIN = "homeassistant"
@@ -26,6 +27,9 @@ DOMAIN = "homeassistant"
 # How often time_changed event should fire
 TIMER_INTERVAL = 10  # seconds
 
+# How long we wait for the result of a service call
+SERVICE_CALL_LIMIT = 10  # seconds
+
 # Number of worker threads
 POOL_NUM_THREAD = 4
 
@@ -227,6 +231,7 @@ class JobPriority(util.OrderedEnum):
     """ Provides priorities for bus events. """
     # pylint: disable=no-init,too-few-public-methods
 
+    EVENT_CALLBACK = 0
     EVENT_SERVICE = 1
     EVENT_STATE = 2
     EVENT_TIME = 3
@@ -241,6 +246,8 @@ class JobPriority(util.OrderedEnum):
             return JobPriority.EVENT_STATE
         elif event_type == EVENT_CALL_SERVICE:
             return JobPriority.EVENT_SERVICE
+        elif event_type == EVENT_SERVICE_EXECUTED:
+            return JobPriority.EVENT_CALLBACK
         else:
             return JobPriority.EVENT_DEFAULT
 
@@ -594,6 +601,7 @@ class ServiceRegistry(object):
         self._lock = threading.Lock()
         self._pool = pool or create_worker_pool()
         self._bus = bus
+        self._cur_id = 0
         bus.listen(EVENT_CALL_SERVICE, self._event_to_service_call)
 
     @property
@@ -615,9 +623,14 @@ class ServiceRegistry(object):
             else:
                 self._services[domain] = {service: service_func}
 
-    def call(self, domain, service, service_data=None):
+    def call(self, domain, service, service_data=None, blocking=False):
         """
-        Fires event to call specified service.
+        Calls specified service.
+        Specify blocking=True to wait till service is executed.
+        Waits a maximum of SERVICE_CALL_LIMIT.
+
+        If blocking = True, will return boolean if service executed
+        succesfully within SERVICE_CALL_LIMIT.
 
         This method will fire an event to call the service.
         This event will be picked up by this ServiceRegistry and any
@@ -626,12 +639,41 @@ class ServiceRegistry(object):
         Because the service is sent as an event you are not allowed to use
         the keys ATTR_DOMAIN and ATTR_SERVICE in your service_data.
         """
+        call_id = self._generate_unique_id()
         event_data = service_data or {}
         event_data[ATTR_DOMAIN] = domain
         event_data[ATTR_SERVICE] = service
+        event_data[ATTR_SERVICE_CALL_ID] = call_id
+
+        if blocking:
+            executed_event = threading.Event()
+
+            def service_executed(call):
+                """
+                Called when a service is executed.
+                Will set the event if matches our service call.
+                """
+                if call.data[ATTR_SERVICE_CALL_ID] == call_id:
+                    executed_event.set()
+
+                    self._bus.remove_listener(
+                        EVENT_SERVICE_EXECUTED, service_executed)
+
+            self._bus.listen(EVENT_SERVICE_EXECUTED, service_executed)
 
         self._bus.fire(EVENT_CALL_SERVICE, event_data)
 
+        if blocking:
+            # wait will return False if event not set after our limit has
+            # passed. If not set, clean up the listener
+            if not executed_event.wait(SERVICE_CALL_LIMIT):
+                self._bus.remove_listener(
+                    EVENT_SERVICE_EXECUTED, service_executed)
+
+                return False
+
+            return True
+
     def _event_to_service_call(self, event):
         """ Calls a service from an event. """
         service_data = dict(event.data)
@@ -642,9 +684,27 @@ class ServiceRegistry(object):
             if domain in self._services and service in self._services[domain]:
                 service_call = ServiceCall(domain, service, service_data)
 
+                # Add a job to the pool that calls _execute_service
                 self._pool.add_job(JobPriority.EVENT_SERVICE,
-                                   (self._services[domain][service],
-                                    service_call))
+                                   (self._execute_service,
+                                    (self._services[domain][service],
+                                     service_call)))
+
+    def _execute_service(self, service_and_call):
+        """ Executes a service and fires a SERVICE_EXECUTED event. """
+        service, call = service_and_call
+
+        service(call)
+
+        self._bus.fire(
+            EVENT_SERVICE_EXECUTED, {
+                ATTR_SERVICE_CALL_ID: call.data[ATTR_SERVICE_CALL_ID]
+            })
+
+    def _generate_unique_id(self):
+        """ Generates a unique service call id. """
+        self._cur_id += 1
+        return "{}-{}".format(id(self), self._cur_id)
 
 
 class Timer(threading.Thread):
diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index 815f732d8ab..5bb139b2123 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -484,7 +484,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
         domain = path_match.group('domain')
         service = path_match.group('service')
 
-        self.server.hass.services.call(domain, service, data)
+        self.server.hass.services.call(domain, service, data, True)
 
         self._json_message("Service {}/{} called.".format(domain, service))
 
diff --git a/homeassistant/components/http/frontend.py b/homeassistant/components/http/frontend.py
index 5190b87f741..2feb9bc20fc 100644
--- a/homeassistant/components/http/frontend.py
+++ b/homeassistant/components/http/frontend.py
@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "b32f2de4e3336946fe68cd1e5cd0fe6f"
+VERSION = "5c3b2dd8a63197e380e798da8b057b0a"
diff --git a/homeassistant/components/http/www_static/frontend.html b/homeassistant/components/http/www_static/frontend.html
index a49e7c83367..ab03282f023 100644
--- a/homeassistant/components/http/www_static/frontend.html
+++ b/homeassistant/components/http/www_static/frontend.html
@@ -66,6 +66,6 @@ if(this.removeAttribute(a),d)return j(this,a,c);var e=c,f=m(this,a,e);return j(t
                 </paper-tab></template></paper-tabs></div></core-toolbar><states-cards api="{{api}}" filter="{{selectedTab}}" class="content"></states-cards></core-header-panel></template><script>Polymer("home-assistant-main",{selectedTab:null,computed:{customGroups:"getCustomGroups(api.states)",hasCustomGroups:"customGroups.length > 0"},tabClicked:function(ev){if(ev.detail.isSelected){this.selectedTab=ev.detail.item.getAttribute("data-entity")}},handleRefreshClick:function(){this.api.fetchAll()},handleEventClick:function(){this.api.showFireEventDialog()},handleServiceClick:function(){this.api.showCallServiceDialog()},handleAddStateClick:function(){this.api.showSetStateDialog()},handleLogOutClick:function(){this.api.logOut()},getCustomGroups:function(states){return states?states.filter(function(state){return state.isCustomGroup}):[]}});</script></polymer-element></div>
 <div hidden><polymer-element name="core-media-query" attributes="query queryMatches" assetpath="polymer/bower_components/core-media-query/"><template><style>:host{display:none}</style></template><script>Polymer("core-media-query",{queryMatches:false,query:"",ready:function(){this._mqHandler=this.queryHandler.bind(this);this._mq=null},queryChanged:function(){if(this._mq){this._mq.removeListener(this._mqHandler)}var query=this.query;if(query[0]!=="("){query="("+this.query+")"}this._mq=window.matchMedia(query);this._mq.addListener(this._mqHandler);this.queryHandler(this._mq)},queryHandler:function(mq){this.queryMatches=mq.matches;this.asyncFire("core-media-change",mq)}});</script></polymer-element><polymer-element name="paper-toast" attributes="text duration opened responsiveWidth swipeDisabled autoCloseDisabled" role="status" assetpath="polymer/bower_components/paper-toast/"><template><style>:host{display:inline-block;background:#323232;color:#f1f1f1;min-height:48px;min-width:288px;padding:16px 24px 12px;box-sizing:border-box;-moz-box-sizing:border-box;box-shadow:0 2px 5px 0 rgba(0,0,0,.26);border-radius:2px;bottom:12px;left:12px;font-size:14px;cursor:default}:host(.capsule){border-radius:24px}:host(.fit-bottom){bottom:0;left:0;width:100%;min-width:0;border-radius:0}:host(.core-transition.dragging){transition:none}:host(.core-transition.fade-out-down),:host(.core-transition.fade-out-up),:host(.core-transition.fade-out-right),:host(.core-transition.fade-out-left){opacity:0;transition:-webkit-transform .08s ease-in-out,opacity .08s ease-in-out;transition:transform .08s ease-in-out,opacity .08s ease-in-out}:host(.core-transition.fade-out-down){-webkit-transform:translate(0,100%);transform:translate(0,100%)}:host(.core-transition.fade-out-up){-webkit-transform:translate(0,-100%);transform:translate(0,-100%)}:host(.core-transition.fade-out-right){-webkit-transform:translate(100%,0);transform:translate(100%,0)}:host(.core-transition.fade-out-left){-webkit-transform:translate(-100%,0);transform:translate(-100%,0)}.toast-container{overflow:hidden}.toast-action{padding-left:24px;cursor:pointer;text-transform:uppercase}</style><core-overlay id="overlay" autofocusdisabled="" autoclosedisabled="{{autoCloseDisabled}}" opened="{{opened}}" target="{{}}" transition="core-transition-bottom"></core-overlay><div class="toast-container" horizontal="" layout=""><div class="toast-text" flex="">{{text}}</div><div class="toast-text toast-action" on-tap="{{dismiss}}"><content></content></div></div><core-media-query query="max-width: {{responsiveWidth}}" querymatches="{{narrowMode}}"></core-media-query></template><script>(function(){var currentToast;Polymer("paper-toast",{text:"",duration:3e3,opened:false,responsiveWidth:"480px",swipeDisabled:false,autoCloseDisabled:false,narrowMode:false,eventDelegates:{trackstart:"trackStart",track:"track",trackend:"trackEnd",transitionend:"transitionEnd"},narrowModeChanged:function(){this.classList.toggle("fit-bottom",this.narrowMode);if(this.opened){this.$.overlay.resizeHandler()}},openedChanged:function(){if(this.opened){this.dismissJob=this.job(this.dismissJob,this.dismiss,this.duration)}else{this.dismissJob&&this.dismissJob.stop();this.dismiss()}},toggle:function(){this.opened=!this.opened},show:function(){if(currentToast){currentToast.dismiss()}currentToast=this;this.opened=true},dismiss:function(){if(this.dragging){this.shouldDismiss=true}else{this.opened=false;if(currentToast===this){currentToast=null}}},trackStart:function(e){if(!this.swipeDisabled){e.preventTap();this.vertical=e.yDirection;this.w=this.offsetWidth;this.h=this.offsetHeight;this.dragging=true;this.classList.add("dragging")}},track:function(e){if(this.dragging){var s=this.style;if(this.vertical){var y=e.dy;s.opacity=(this.h-Math.abs(y))/this.h;s.transform=s.webkitTransform="translate3d(0, "+y+"px, 0)"}else{var x=e.dx;s.opacity=(this.w-Math.abs(x))/this.w;s.transform=s.webkitTransform="translate3d("+x+"px, 0, 0)"}}},trackEnd:function(e){if(this.dragging){this.classList.remove("dragging");this.style.opacity="";this.style.transform=this.style.webkitTransform="";var cl=this.classList;if(this.vertical){cl.toggle("fade-out-down",e.yDirection===1&&e.dy>0);cl.toggle("fade-out-up",e.yDirection===-1&&e.dy<0)}else{cl.toggle("fade-out-right",e.xDirection===1&&e.dx>0);cl.toggle("fade-out-left",e.xDirection===-1&&e.dx<0)}this.dragging=false}},transitionEnd:function(){var cl=this.classList;if(cl.contains("fade-out-right")||cl.contains("fade-out-left")||cl.contains("fade-out-down")||cl.contains("fade-out-up")){this.dismiss();cl.remove("fade-out-right","fade-out-left","fade-out-down","fade-out-up")}else if(this.shouldDismiss){this.dismiss()}this.shouldDismiss=false}})})();</script></polymer-element><polymer-element name="paper-dialog-base" extends="core-overlay" role="dialog" on-core-overlay-open="{{openAction}}" assetpath="polymer/bower_components/paper-dialog/"><script>Polymer("paper-dialog-base",{publish:{heading:"",transition:"",layered:true},ready:function(){this.super();this.sizingTarget=this.$.scroller},headingChanged:function(old){var label=this.getAttribute("aria-label");if(!label||label===old){this.setAttribute("aria-label",this.heading)}},openAction:function(){if(this.$.scroller.scrollTop){this.$.scroller.scrollTop=0}}});</script></polymer-element><polymer-element name="paper-action-dialog" extends="paper-dialog-base" role="dialog" assetpath="polymer/bower_components/paper-dialog/"><template><style>:host{background:#fff;color:rgba(0,0,0,.87);margin:32px;overflow:visible!important}h1{font-size:20px}#scroller{overflow:auto;box-sizing:border-box;padding:24px 24px 0 24px}#actions{padding:16px}</style><paper-shadow z="3" fit=""></paper-shadow><div id="scroller" relative=""><template if="{{heading}}"><h1>{{heading}}</h1></template><content select=":not([affirmative]):not([dismissive])"></content></div><div id="actions" relative="" layout="" horizontal=""><content select="[dismissive]"></content><div flex=""></div><content select="[affirmative]"></content></div></template><script>Polymer("paper-action-dialog",{publish:{closeSelector:"[affirmative],[dismissive]"}});</script></polymer-element><polymer-element name="paper-input" assetpath="polymer/bower_components/paper-input/"><template><style>:host{display:inline-block}</style><paper-input-decorator id="decorator" label="{{label}}" floatinglabel="{{floatingLabel}}" value="{{value}}" disabled?="{{disabled}}"><input is="core-input" value="{{value}}" committedvalue="{{committedValue}}" on-change="{{changeAction}}" disabled?="{{disabled}}"></paper-input-decorator></template><script>Polymer("paper-input",{publish:{label:"",floatingLabel:false,disabled:{value:false,reflect:true},value:"",committedValue:""},valueChanged:function(){this.$.decorator.updateLabelVisibility(this.value)},changeAction:function(e){if(!window.ShadowDOMPolyfill){this.fire("change",null,this)}}});</script></polymer-element><polymer-element name="paper-autogrow-textarea" on-input="{{inputAction}}" assetpath="polymer/bower_components/paper-input/"><template><style>:host{display:inline-block;position:relative;width:400px}::content textarea{padding:0;margin:0;border:none;outline:0;resize:none;width:100%;height:100%}::content textarea:invalid{box-shadow:none}</style><div id="mirror" class="mirror-text" invisible="" aria-hidden="true">&nbsp;</div><div class="textarea-container" fit=""><content></content></div></template><script>Polymer("paper-autogrow-textarea",{publish:{target:null,rows:1,maxRows:0},tokens:null,observe:{rows:"updateCached",maxRows:"updateCached"},constrain:function(tokens){var _tokens;tokens=tokens||[""];if(this.maxRows>0&&tokens.length>this.maxRows){_tokens=tokens.slice(0,this.maxRows)}else{_tokens=tokens.slice(0)}while(this.rows>0&&_tokens.length<this.rows){_tokens.push("")}return _tokens.join("<br>")+"&nbsp;"},valueForMirror:function(input){this.tokens=input&&input.value?input.value.replace(/&/gm,"&amp;").replace(/"/gm,"&quot;").replace(/'/gm,"&#39;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;").split("\n"):[""];return this.constrain(this.tokens)},update:function(input){this.$.mirror.innerHTML=this.valueForMirror(input)},updateCached:function(){this.$.mirror.innerHTML=this.constrain(this.tokens)},inputAction:function(e){this.update(e.target)}});</script></polymer-element><polymer-element name="events-list" attributes="api cbEventClicked" assetpath="polymer/"><template><style>:host{display:block}.eventContainer{font-size:1rem}</style><template if="{{cbEventClicked}}"><style>a{text-decoration:underline;cursor:pointer}</style></template><div><template repeat="{{event in events}}"><div class="eventContainer"><a on-click="{{handleClick}}">{{event.event}}</a>
           ({{event.listener_count}} listeners)
-        </div></template></div></template><script>Polymer("events-list",{cbEventClicked:null,events:[],domReady:function(){this.events=this.api.events;this.api.addEventListener("events-updated",this.eventsUpdated.bind(this))},eventsUpdated:function(){this.events=this.api.events},handleClick:function(ev){if(this.cbEventClicked){this.cbEventClicked(ev.path[0].innerHTML)}}});</script></polymer-element><polymer-element name="event-fire-dialog" attributes="api" assetpath="polymer/"><template><paper-action-dialog id="dialog" heading="Fire Event" transition="core-transition-bottom" backdrop=""><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}paper-input:first-child{padding-top:0}.eventContainer{margin-left:30px}@media all and (max-width:620px){paper-action-dialog{margin:0;width:100%;height:calc(100% - 64px);top:64px}.eventContainer{display:none}}</style><div layout="" horizontal=""><div><paper-input id="inputType" label="Event Type" floatinglabel="true" autofocus required></paper-input><paper-input-decorator label="Event Data (JSON, optional)" floatinglabel="true"><textarea id="inputData" rows="5"></textarea></paper-input-decorator></div><div class="eventContainer"><b>Available events:</b><events-list api="{{api}}" cbeventclicked="{{eventSelected}}"></events-list></div></div><paper-button dismissive="">Cancel</paper-button><paper-button affirmative="" on-click="{{clickFireEvent}}">Fire Event</paper-button></paper-action-dialog></template><script>Polymer("event-fire-dialog",{ready:function(){this.eventSelected=this.eventSelected.bind(this)},show:function(eventType,eventData){this.setEventType(eventType);this.setEventData(eventData);this.$.dialog.toggle()},setEventType:function(eventType){this.$.inputType.value=eventType},setEventData:function(eventData){this.$.inputData.value=eventData},eventSelected:function(eventType){this.setEventType(eventType)},clickFireEvent:function(){var data;if(this.$.inputData.value!=""){data=JSON.parse(this.$.inputData.value)}else{data={}}this.api.fire_event(this.$.inputType.value,data)}});</script></polymer-element><polymer-element name="paper-dialog-transition" extends="core-transition-css" assetpath="polymer/bower_components/paper-dialog/"><template><style no-shim="">:host(.paper-dialog-transition){outline:0;opacity:0;transition:transform .2s cubic-bezier(0.4,0,.2,1),opacity .2s cubic-bezier(0.4,0,.2,1);-webkit-transition:-webkit-transform .2s cubic-bezier(0.4,0,.2,1),opacity .2s cubic-bezier(0.4,0,.2,1)}:host(.paper-dialog-transition.core-opened){opacity:1;transform:none;-webkit-transform:none}:host(.paper-dialog-transition-bottom){transform:scale(0.9) translateY(200%);-webkit-transform:scale(0.9) translateY(200%)}:host(.paper-dialog-transition-center.core-opened){animation:paper-dialog-transition-center-keyframes .2s cubic-bezier(0.4,0,.2,1);-webkit-animation:paper-dialog-transition-center-keyframes .2s cubic-bezier(0.4,0,.2,1)}@keyframes paper-dialog-transition-center-keyframes{0%{transform:scale(0.5) translateY(0);-webkit-transform:scale(0.5) translateY(0)}90%{transform:scale(1) translateY(-10px);-webkit-transform:scale(1) translateY(-10px)}100%{transform:scale(1) translateY(0);-webkit-transform:scale(1) translateY(0)}}@-webkit-keyframes paper-dialog-transition-center-keyframes{0%{transform:scale(0.5) translateY(0);-webkit-transform:scale(0.5) translateY(0)}90%{transform:scale(1) translateY(-10px);-webkit-transform:scale(1) translateY(-10px)}100%{transform:scale(1) translateY(0);-webkit-transform:scale(1) translateY(0)}}</style></template><script>Polymer("paper-dialog-transition",{baseClass:"paper-dialog-transition"});</script></polymer-element><paper-dialog-transition id="paper-dialog-transition-bottom" transitiontype="bottom"></paper-dialog-transition><paper-dialog-transition id="paper-dialog-transition-center" transitiontype="center"></paper-dialog-transition><polymer-element name="core-item" attributes="label icon src" horizontal="" center="" layout="" assetpath="polymer/bower_components/core-item/"><template><style>:host{display:block;position:relative;min-height:40px;white-space:nowrap}:host(.font-scalable){min-height:2.5em}:host(.core-selected){font-weight:700}#icon{margin:0 16px 0 4px}:host(.font-scalable) #icon{margin:0 1em 0 .25em;height:1.5em;width:1.5em}polyfill-next-selector{content:':host > a'}::content>a{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.000001)}</style><template if="{{icon || src}}"><core-icon src="{{src}}" id="icon" icon="{{icon}}" hidden?="{{!src && !icon}}"></core-icon></template><div id="label">{{label}}</div><content></content></template><script>Polymer("core-item",{});</script></polymer-element><style shim-shadowdom="">html /deep/ core-collapse{display:block}html /deep/ .core-collapse-closed{display:none}</style><polymer-element name="core-collapse" attributes="target horizontal opened duration fixedSize allowOverflow" assetpath="polymer/bower_components/core-collapse/"><template><content></content></template><script>Polymer("core-collapse",{target:null,horizontal:false,opened:false,duration:.33,fixedSize:false,allowOverflow:false,created:function(){this.transitionEndListener=this.transitionEnd.bind(this)},ready:function(){this.target=this.target||this},domReady:function(){this.async(function(){this.afterInitialUpdate=true})},detached:function(){if(this.target){this.removeListeners(this.target)}},targetChanged:function(old){if(old){this.removeListeners(old)}if(!this.target){return}this.isTargetReady=!!this.target;this.classList.toggle("core-collapse-closed",this.target!==this);this.toggleOpenedStyle(false);this.horizontalChanged();this.addListeners(this.target);this.toggleClosedClass(true);this.update()},addListeners:function(node){node.addEventListener("transitionend",this.transitionEndListener)},removeListeners:function(node){node.removeEventListener("transitionend",this.transitionEndListener)},horizontalChanged:function(){this.dimension=this.horizontal?"width":"height"},openedChanged:function(){this.update();this.fire("core-collapse-open",this.opened)},toggle:function(){this.opened=!this.opened},setTransitionDuration:function(duration){var s=this.target.style;s.transition=duration?this.dimension+" "+duration+"s":null;if(duration===0){this.async("transitionEnd")}},transitionEnd:function(){if(this.opened&&!this.fixedSize){this.updateSize("auto",null)}this.setTransitionDuration(null);this.toggleOpenedStyle(this.opened);this.toggleClosedClass(!this.opened);this.asyncFire("core-resize",null,this.target)},toggleClosedClass:function(closed){this.hasClosedClass=closed;this.target.classList.toggle("core-collapse-closed",closed)},toggleOpenedStyle:function(opened){this.target.style.overflow=this.allowOverflow&&opened?"":"hidden"},updateSize:function(size,duration,forceEnd){this.setTransitionDuration(duration);this.calcSize();var s=this.target.style;var nochange=s[this.dimension]===size;s[this.dimension]=size;if(forceEnd&&nochange){this.transitionEnd()}},update:function(){if(!this.target){return}if(!this.isTargetReady){this.targetChanged()}this.horizontalChanged();this[this.opened?"show":"hide"]()},calcSize:function(){return this.target.getBoundingClientRect()[this.dimension]+"px"},getComputedSize:function(){return getComputedStyle(this.target)[this.dimension]},show:function(){this.toggleClosedClass(false);if(!this.afterInitialUpdate){this.transitionEnd();return}if(!this.fixedSize){this.updateSize("auto",null);var s=this.calcSize();if(s=="0px"){this.transitionEnd();return}this.updateSize(0,null)}this.async(function(){this.updateSize(this.size||s,this.duration,true)})},hide:function(){this.toggleOpenedStyle(false);if(this.hasClosedClass&&!this.fixedSize){return}if(this.fixedSize){this.size=this.getComputedSize()}else{this.updateSize(this.calcSize(),null)}this.async(function(){this.updateSize(0,this.duration)})}});</script></polymer-element><polymer-element name="core-submenu" attributes="selected selectedItem label icon src valueattr" assetpath="polymer/bower_components/core-menu/"><template><style>:host{display:block;height:auto}:host(.core-selected,[active]){font-weight:initial}core-item{cursor:default}::content>core-item{cursor:default}:host(.font-scalable)>core-item{min-height:2.5em}:host(.font-scalable)>core-item::shadow core-icon{margin:0 1em 0 .25em;height:1.5em;width:1.5em}#submenu{margin:0 0 0 44px}:host(.font-scalable)>#submenu{margin:0 0 0 2.75em}</style><core-item id="submenuItem" src="{{src}}" label="{{label}}" icon="{{icon}}" class="{{ {'core-selected' : active} | tokenList}}" on-tap="{{activate}}"><content select=".item-content"></content></core-item><core-menu id="submenu" selected="{{selected}}" selecteditem="{{selectedItem}}" valueattr="{{valueattr}}"><content></content></core-menu><core-collapse target="{{$.submenu}}" opened="{{opened}}"></core-collapse></template><script>Polymer("core-submenu",{publish:{active:{value:false,reflect:true}},opened:false,get items(){return this.$.submenu.items},hasItems:function(){return!!this.items.length},unselectAllItems:function(){this.$.submenu.selected=null;this.$.submenu.clearSelection()},activeChanged:function(){if(this.hasItems()){this.opened=this.active}if(!this.active){this.unselectAllItems()}},toggle:function(){this.opened=!this.opened},activate:function(){if(this.hasItems()&&this.active){this.toggle();this.unselectAllItems()}}});</script></polymer-element><polymer-element name="services-list" attributes="api cbServiceClicked" assetpath="polymer/"><template><style>:host{display:block}core-menu{margin-top:0;font-size:1rem}a{display:block}</style><template if="{{cbServiceClicked}}"><style>a,core-submenu{text-decoration:underline;cursor:pointer}</style></template><div><core-menu selected="0"><template repeat="{{serv in services}}"><core-submenu icon="{{serv.domain | getIcon}}" label="{{serv.domain}}"><template repeat="{{service in serv.services}}"><a on-click="{{serviceClicked}}" data-domain="{{serv.domain}}">{{service}}</a></template></core-submenu></template></core-menu></div></template><script>Polymer("services-list",{services:[],cbServiceClicked:null,domReady:function(){this.services=this.api.services;this.api.addEventListener("services-updated",this.servicesUpdated.bind(this))},getIcon:function(domain){return(new DomainIcon).icon(domain)},servicesUpdated:function(){this.services=this.api.services},serviceClicked:function(ev){if(this.cbServiceClicked){var target=ev.path[0];var domain=target.getAttributeNode("data-domain").value;var service=target.innerHTML;this.cbServiceClicked(domain,service)}}});</script></polymer-element><polymer-element name="service-call-dialog" attributes="api" assetpath="polymer/"><template><paper-action-dialog id="dialog" heading="Call Service" transition="core-transition-bottom" backdrop="true"><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}paper-input:first-child{padding-top:0}.serviceContainer{margin-left:30px}@media all and (max-width:620px){paper-action-dialog{margin:0;width:100%;height:calc(100% - 64px);top:64px}.serviceContainer{display:none}}</style><div layout="" horizontal=""><div><paper-input id="inputDomain" label="Domain" floatinglabel="true" autofocus required></paper-input><paper-input id="inputService" label="Service" floatinglabel="true" required></paper-input><paper-input-decorator label="Service Data (JSON, optional)" floatinglabel="true"><textarea id="inputData" rows="5"></textarea></paper-input-decorator></div><div class="serviceContainer"><b>Available services:</b><services-list api="{{api}}" cbserviceclicked="{{serviceSelected}}"></services-list></div></div><paper-button dismissive="">Cancel</paper-button><paper-button affirmative="" on-click="{{clickCallService}}">Call Service</paper-button></paper-action-dialog></template><script>Polymer("service-call-dialog",{ready:function(){this.serviceSelected=this.serviceSelected.bind(this)},show:function(domain,service,serviceData){this.setService(domain,service);this.$.inputData.value=serviceData;this.$.dialog.toggle()},setService:function(domain,service){this.$.inputDomain.value=domain;this.$.inputService.value=service},serviceSelected:function(domain,service){this.setService(domain,service)},clickCallService:function(){var data;if(this.$.inputData.value!=""){data=JSON.parse(this.$.inputData.value)}this.api.call_service(this.$.inputDomain.value,this.$.inputService.value,data)}});</script></polymer-element><polymer-element name="entity-list" attributes="api cbEntityClicked" assetpath="polymer/"><template><style>:host{display:block}.entityContainer{font-size:1rem}</style><template if="{{cbEntityClicked}}"><style>a{text-decoration:underline;cursor:pointer}</style></template><div><template repeat="{{state in states}}"><div class="eventContainer"><a on-click="{{handleClick}}">{{state.entity_id}}</a></div></template></div></template><script>Polymer("entity-list",{cbEventClicked:null,states:[],domReady:function(){this.api.addEventListener("states-updated",this.statesUpdated.bind(this));this.statesUpdated()},statesUpdated:function(){this.states=this.api.states},handleClick:function(ev){if(this.cbEntityClicked){this.cbEntityClicked(ev.path[0].innerHTML)}}});</script></polymer-element><polymer-element name="state-set-dialog" attributes="api" assetpath="polymer/"><template><paper-action-dialog id="dialog" heading="Set State" transition="core-transition-bottom" backdrop="true"><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}paper-input:first-child{padding-top:0}.stateContainer{margin-left:30px}@media all and (max-width:620px){paper-action-dialog{margin:0;width:100%;height:calc(100% - 64px);top:64px}.stateContainer{display:none}}</style><div layout="" horizontal=""><div><paper-input id="inputEntityID" label="Entity ID" floatinglabel="true" autofocus required></paper-input><paper-input id="inputState" label="State" floatinglabel="true" required></paper-input><paper-input-decorator label="State attributes (JSON, optional)" floatinglabel="true"><textarea id="inputData" rows="5"></textarea></paper-input-decorator></div><div class="stateContainer"><b>Current entities:</b><entity-list api="{{api}}" cbentityclicked="{{entitySelected}}"></entity-list></div></div><paper-button dismissive="">Cancel</paper-button><paper-button affirmative="" on-click="{{clickSetState}}">Set State</paper-button></paper-action-dialog></template><script>Polymer("state-set-dialog",{ready:function(){this.entitySelected=this.entitySelected.bind(this)},show:function(entityId,state,stateData){this.setEntityId(entityId);this.setState(state);this.setStateData(stateData);this.$.dialog.toggle()},setEntityId:function(entityId){this.$.inputEntityID.value=entityId},setState:function(state){this.$.inputState.value=state},setStateData:function(stateData){var value=stateData?JSON.stringify(stateData,null,"  "):"";this.$.inputData.value=value},entitySelected:function(entityId){this.setEntityId(entityId);var state=this.api.getState(entityId);this.setState(state.state);this.setStateData(state.attributes)},clickSetState:function(){this.api.set_state(this.$.inputEntityID.value,this.$.inputState.value,JSON.parse(this.$.inputData.value))}});</script></polymer-element><polymer-element name="home-assistant-api" attributes="auth" assetpath="polymer/"><template><paper-toast id="toast" role="alert" text=""></paper-toast><event-fire-dialog id="eventDialog" api="{{api}}"></event-fire-dialog><service-call-dialog id="serviceDialog" api="{{api}}"></service-call-dialog><state-set-dialog id="stateDialog" api="{{api}}"></state-set-dialog></template><script>State=function(json,api){this.api=api;this.attributes=json.attributes;this.entity_id=json.entity_id;var parts=json.entity_id.split(".");this.domain=parts[0];this.entity=parts[1];if(this.attributes.friendly_name){this.entityDisplay=this.attributes.friendly_name}else{this.entityDisplay=this.entity.replace(/_/g," ")}this.state=json.state;this.last_changed=json.last_changed};Object.defineProperties(State.prototype,{stateDisplay:{get:function(){var state=this.state.replace(/_/g," ");if(this.attributes.unit_of_measurement){return state+" "+this.attributes.unit_of_measurement}else{return state}}},isCustomGroup:{get:function(){return this.domain=="group"&&!this.attributes.auto}},canToggle:{get:function(){return this.domain=="group"&&(this.state=="on"||this.state=="off")||this.api.hasService(this.domain,"turn_on")}}});Polymer("home-assistant-api",{auth:"not-set",states:[],services:[],events:[],stateUpdateTimeout:null,created:function(){this.api=this;this.turn_on=this.turn_on.bind(this);this.turn_off=this.turn_off.bind(this)},getState:function(entityId){var found=this.states.filter(function(state){return state.entity_id==entityId},this);return found.length>0?found[0]:null},hasService:function(domain,service){var found=this.services.filter(function(serv){return serv.domain==domain&&serv.services.indexOf(service)!==-1},this);return found.length>0},_laterFetchStates:function(){if(this.stateUpdateTimeout){clearTimeout(this.stateUpdateTimeout)}this.stateUpdateTimeout=setTimeout(this.fetchStates.bind(this),6e4)},_sortStates:function(states){states.sort(function(one,two){if(one.entity_id>two.entity_id){return 1}else if(one.entity_id<two.entity_id){return-1}else{return 0}})},_pushNewState:function(new_state){var state;var stateFound=false;for(var i=0;i<this.states.length;i++){if(this.states[i].entity_id==new_state.entity_id){state=this.states[i];state.attributes=new_state.attributes;state.last_changed=new_state.last_changed;state.state=new_state.state;stateFound=true;break}}if(!stateFound){this.states.push(new State(new_state,this));this._sortStates(this.states)}this.fire("states-updated")},fetchAll:function(){this.fetchStates();this.fetchServices();this.fetchEvents()},fetchState:function(entityId){var successStateUpdate=function(new_state){this._pushNewState(new_state)};this.call_api("GET","states/"+entityId,null,successStateUpdate.bind(this))},fetchStates:function(onSuccess,onError){var successStatesUpdate=function(newStates){this._sortStates(newStates);this.states=newStates.map(function(json){return new State(json,this)}.bind(this));this.fire("states-updated");this._laterFetchStates();if(onSuccess){onSuccess(this.states)}};this.call_api("GET","states",null,successStatesUpdate.bind(this),onError)},fetchEvents:function(onSuccess,onError){var successEventsUpdated=function(events){this.events=events;this.fire("events-updated");if(onSuccess){onSuccess(events)}};this.call_api("GET","events",null,successEventsUpdated.bind(this),onError)},fetchServices:function(onSuccess,onError){var successServicesUpdated=function(services){this.services=services;this.fire("services-updated");if(onSuccess){onSuccess(this.services)}};this.call_api("GET","services",null,successServicesUpdated.bind(this),onError)},turn_on:function(entity_id){this.call_service("homeassistant","turn_on",{entity_id:entity_id})},turn_off:function(entity_id){this.call_service("homeassistant","turn_off",{entity_id:entity_id})},set_state:function(entity_id,state,attributes){var payload={state:state};if(attributes){payload.attributes=attributes}var successToast=function(new_state){this.showToast("State of "+entity_id+" set to "+state+".");this._pushNewState(new_state)};this.call_api("POST","states/"+entity_id,payload,successToast.bind(this))},call_service:function(domain,service,parameters){parameters=parameters||{};var successToast=function(){if(service=="turn_on"&&parameters.entity_id){this.showToast("Turned on "+parameters.entity_id+".")}else if(service=="turn_off"&&parameters.entity_id){this.showToast("Turned off "+parameters.entity_id+".")}else{this.showToast("Service "+domain+"/"+service+" called.")}if(parameters&&parameters.entity_id){var update_func;if(typeof(parameters.entity_id==="string")){if(parameters.entity_id.slice(0,6)=="group."){update_func=this.fetchStates}else{update_func=function(){this.fetchState(parameters.entity_id)}}}else{update_func=this.fetchStates}setTimeout(update_func.bind(this),1e3)}};this.call_api("POST","services/"+domain+"/"+service,parameters,successToast.bind(this))},fire_event:function(eventType,eventData){eventData=eventData||{};var successToast=function(){this.showToast("Event "+eventType+" fired.")};this.call_api("POST","events/"+eventType,eventData,successToast.bind(this))},call_api:function(method,path,parameters,onSuccess,onError){var req=new XMLHttpRequest;req.open(method,"/api/"+path,true);req.setRequestHeader("X-HA-access",this.auth);req.onreadystatechange=function(){if(req.readyState==4){if(req.status>199&&req.status<300){if(onSuccess){onSuccess(JSON.parse(req.responseText))}}else{if(onError){var data=req.responseText?JSON.parse(req.responseText):{};onError(data)}}}}.bind(this);if(parameters){req.send(JSON.stringify(parameters))}else{req.send()}},showEditStateDialog:function(entityId){var state=this.getState(entityId);this.showSetStateDialog(entityId,state.state,state.attributes)},showSetStateDialog:function(entityId,state,stateAttributes){entityId=entityId||"";state=state||"";stateAttributes=stateAttributes||null;this.$.stateDialog.show(entityId,state,stateAttributes)},showFireEventDialog:function(eventType,eventData){eventType=eventType||"";eventData=eventData||"";this.$.eventDialog.show(eventType,eventData)},showCallServiceDialog:function(domain,service,serviceData){domain=domain||"";service=service||"";serviceData=serviceData||"";this.$.serviceDialog.show(domain,service,serviceData)},showToast:function(message){this.$.toast.text=message;this.$.toast.show()},logOut:function(){this.auth=""}});</script></polymer-element></div>
+        </div></template></div></template><script>Polymer("events-list",{cbEventClicked:null,events:[],domReady:function(){this.events=this.api.events;this.api.addEventListener("events-updated",this.eventsUpdated.bind(this))},eventsUpdated:function(){this.events=this.api.events},handleClick:function(ev){if(this.cbEventClicked){this.cbEventClicked(ev.path[0].innerHTML)}}});</script></polymer-element><polymer-element name="event-fire-dialog" attributes="api" assetpath="polymer/"><template><paper-action-dialog id="dialog" heading="Fire Event" transition="core-transition-bottom" backdrop=""><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}paper-input:first-child{padding-top:0}.eventContainer{margin-left:30px}@media all and (max-width:620px){paper-action-dialog{margin:0;width:100%;height:calc(100% - 64px);top:64px}.eventContainer{display:none}}</style><div layout="" horizontal=""><div><paper-input id="inputType" label="Event Type" floatinglabel="true" autofocus required></paper-input><paper-input-decorator label="Event Data (JSON, optional)" floatinglabel="true"><textarea id="inputData" rows="5"></textarea></paper-input-decorator></div><div class="eventContainer"><b>Available events:</b><events-list api="{{api}}" cbeventclicked="{{eventSelected}}"></events-list></div></div><paper-button dismissive="">Cancel</paper-button><paper-button affirmative="" on-click="{{clickFireEvent}}">Fire Event</paper-button></paper-action-dialog></template><script>Polymer("event-fire-dialog",{ready:function(){this.eventSelected=this.eventSelected.bind(this)},show:function(eventType,eventData){this.setEventType(eventType);this.setEventData(eventData);this.$.dialog.toggle()},setEventType:function(eventType){this.$.inputType.value=eventType},setEventData:function(eventData){this.$.inputData.value=eventData},eventSelected:function(eventType){this.setEventType(eventType)},clickFireEvent:function(){var data;if(this.$.inputData.value!=""){data=JSON.parse(this.$.inputData.value)}else{data={}}this.api.fire_event(this.$.inputType.value,data)}});</script></polymer-element><polymer-element name="paper-dialog-transition" extends="core-transition-css" assetpath="polymer/bower_components/paper-dialog/"><template><style no-shim="">:host(.paper-dialog-transition){outline:0;opacity:0;transition:transform .2s cubic-bezier(0.4,0,.2,1),opacity .2s cubic-bezier(0.4,0,.2,1);-webkit-transition:-webkit-transform .2s cubic-bezier(0.4,0,.2,1),opacity .2s cubic-bezier(0.4,0,.2,1)}:host(.paper-dialog-transition.core-opened){opacity:1;transform:none;-webkit-transform:none}:host(.paper-dialog-transition-bottom){transform:scale(0.9) translateY(200%);-webkit-transform:scale(0.9) translateY(200%)}:host(.paper-dialog-transition-center.core-opened){animation:paper-dialog-transition-center-keyframes .2s cubic-bezier(0.4,0,.2,1);-webkit-animation:paper-dialog-transition-center-keyframes .2s cubic-bezier(0.4,0,.2,1)}@keyframes paper-dialog-transition-center-keyframes{0%{transform:scale(0.5) translateY(0);-webkit-transform:scale(0.5) translateY(0)}90%{transform:scale(1) translateY(-10px);-webkit-transform:scale(1) translateY(-10px)}100%{transform:scale(1) translateY(0);-webkit-transform:scale(1) translateY(0)}}@-webkit-keyframes paper-dialog-transition-center-keyframes{0%{transform:scale(0.5) translateY(0);-webkit-transform:scale(0.5) translateY(0)}90%{transform:scale(1) translateY(-10px);-webkit-transform:scale(1) translateY(-10px)}100%{transform:scale(1) translateY(0);-webkit-transform:scale(1) translateY(0)}}</style></template><script>Polymer("paper-dialog-transition",{baseClass:"paper-dialog-transition"});</script></polymer-element><paper-dialog-transition id="paper-dialog-transition-bottom" transitiontype="bottom"></paper-dialog-transition><paper-dialog-transition id="paper-dialog-transition-center" transitiontype="center"></paper-dialog-transition><polymer-element name="core-item" attributes="label icon src" horizontal="" center="" layout="" assetpath="polymer/bower_components/core-item/"><template><style>:host{display:block;position:relative;min-height:40px;white-space:nowrap}:host(.font-scalable){min-height:2.5em}:host(.core-selected){font-weight:700}#icon{margin:0 16px 0 4px}:host(.font-scalable) #icon{margin:0 1em 0 .25em;height:1.5em;width:1.5em}polyfill-next-selector{content:':host > a'}::content>a{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.000001)}</style><template if="{{icon || src}}"><core-icon src="{{src}}" id="icon" icon="{{icon}}" hidden?="{{!src && !icon}}"></core-icon></template><div id="label">{{label}}</div><content></content></template><script>Polymer("core-item",{});</script></polymer-element><style shim-shadowdom="">html /deep/ core-collapse{display:block}html /deep/ .core-collapse-closed{display:none}</style><polymer-element name="core-collapse" attributes="target horizontal opened duration fixedSize allowOverflow" assetpath="polymer/bower_components/core-collapse/"><template><content></content></template><script>Polymer("core-collapse",{target:null,horizontal:false,opened:false,duration:.33,fixedSize:false,allowOverflow:false,created:function(){this.transitionEndListener=this.transitionEnd.bind(this)},ready:function(){this.target=this.target||this},domReady:function(){this.async(function(){this.afterInitialUpdate=true})},detached:function(){if(this.target){this.removeListeners(this.target)}},targetChanged:function(old){if(old){this.removeListeners(old)}if(!this.target){return}this.isTargetReady=!!this.target;this.classList.toggle("core-collapse-closed",this.target!==this);this.toggleOpenedStyle(false);this.horizontalChanged();this.addListeners(this.target);this.toggleClosedClass(true);this.update()},addListeners:function(node){node.addEventListener("transitionend",this.transitionEndListener)},removeListeners:function(node){node.removeEventListener("transitionend",this.transitionEndListener)},horizontalChanged:function(){this.dimension=this.horizontal?"width":"height"},openedChanged:function(){this.update();this.fire("core-collapse-open",this.opened)},toggle:function(){this.opened=!this.opened},setTransitionDuration:function(duration){var s=this.target.style;s.transition=duration?this.dimension+" "+duration+"s":null;if(duration===0){this.async("transitionEnd")}},transitionEnd:function(){if(this.opened&&!this.fixedSize){this.updateSize("auto",null)}this.setTransitionDuration(null);this.toggleOpenedStyle(this.opened);this.toggleClosedClass(!this.opened);this.asyncFire("core-resize",null,this.target)},toggleClosedClass:function(closed){this.hasClosedClass=closed;this.target.classList.toggle("core-collapse-closed",closed)},toggleOpenedStyle:function(opened){this.target.style.overflow=this.allowOverflow&&opened?"":"hidden"},updateSize:function(size,duration,forceEnd){this.setTransitionDuration(duration);this.calcSize();var s=this.target.style;var nochange=s[this.dimension]===size;s[this.dimension]=size;if(forceEnd&&nochange){this.transitionEnd()}},update:function(){if(!this.target){return}if(!this.isTargetReady){this.targetChanged()}this.horizontalChanged();this[this.opened?"show":"hide"]()},calcSize:function(){return this.target.getBoundingClientRect()[this.dimension]+"px"},getComputedSize:function(){return getComputedStyle(this.target)[this.dimension]},show:function(){this.toggleClosedClass(false);if(!this.afterInitialUpdate){this.transitionEnd();return}if(!this.fixedSize){this.updateSize("auto",null);var s=this.calcSize();if(s=="0px"){this.transitionEnd();return}this.updateSize(0,null)}this.async(function(){this.updateSize(this.size||s,this.duration,true)})},hide:function(){this.toggleOpenedStyle(false);if(this.hasClosedClass&&!this.fixedSize){return}if(this.fixedSize){this.size=this.getComputedSize()}else{this.updateSize(this.calcSize(),null)}this.async(function(){this.updateSize(0,this.duration)})}});</script></polymer-element><polymer-element name="core-submenu" attributes="selected selectedItem label icon src valueattr" assetpath="polymer/bower_components/core-menu/"><template><style>:host{display:block;height:auto}:host(.core-selected,[active]){font-weight:initial}core-item{cursor:default}::content>core-item{cursor:default}:host(.font-scalable)>core-item{min-height:2.5em}:host(.font-scalable)>core-item::shadow core-icon{margin:0 1em 0 .25em;height:1.5em;width:1.5em}#submenu{margin:0 0 0 44px}:host(.font-scalable)>#submenu{margin:0 0 0 2.75em}</style><core-item id="submenuItem" src="{{src}}" label="{{label}}" icon="{{icon}}" class="{{ {'core-selected' : active} | tokenList}}" on-tap="{{activate}}"><content select=".item-content"></content></core-item><core-menu id="submenu" selected="{{selected}}" selecteditem="{{selectedItem}}" valueattr="{{valueattr}}"><content></content></core-menu><core-collapse target="{{$.submenu}}" opened="{{opened}}"></core-collapse></template><script>Polymer("core-submenu",{publish:{active:{value:false,reflect:true}},opened:false,get items(){return this.$.submenu.items},hasItems:function(){return!!this.items.length},unselectAllItems:function(){this.$.submenu.selected=null;this.$.submenu.clearSelection()},activeChanged:function(){if(this.hasItems()){this.opened=this.active}if(!this.active){this.unselectAllItems()}},toggle:function(){this.opened=!this.opened},activate:function(){if(this.hasItems()&&this.active){this.toggle();this.unselectAllItems()}}});</script></polymer-element><polymer-element name="services-list" attributes="api cbServiceClicked" assetpath="polymer/"><template><style>:host{display:block}core-menu{margin-top:0;font-size:1rem}a{display:block}</style><template if="{{cbServiceClicked}}"><style>a,core-submenu{text-decoration:underline;cursor:pointer}</style></template><div><core-menu selected="0"><template repeat="{{serv in services}}"><core-submenu icon="{{serv.domain | getIcon}}" label="{{serv.domain}}"><template repeat="{{service in serv.services}}"><a on-click="{{serviceClicked}}" data-domain="{{serv.domain}}">{{service}}</a></template></core-submenu></template></core-menu></div></template><script>Polymer("services-list",{services:[],cbServiceClicked:null,domReady:function(){this.services=this.api.services;this.api.addEventListener("services-updated",this.servicesUpdated.bind(this))},getIcon:function(domain){return(new DomainIcon).icon(domain)},servicesUpdated:function(){this.services=this.api.services},serviceClicked:function(ev){if(this.cbServiceClicked){var target=ev.path[0];var domain=target.getAttributeNode("data-domain").value;var service=target.innerHTML;this.cbServiceClicked(domain,service)}}});</script></polymer-element><polymer-element name="service-call-dialog" attributes="api" assetpath="polymer/"><template><paper-action-dialog id="dialog" heading="Call Service" transition="core-transition-bottom" backdrop="true"><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}paper-input:first-child{padding-top:0}.serviceContainer{margin-left:30px}@media all and (max-width:620px){paper-action-dialog{margin:0;width:100%;height:calc(100% - 64px);top:64px}.serviceContainer{display:none}}</style><div layout="" horizontal=""><div><paper-input id="inputDomain" label="Domain" floatinglabel="true" autofocus required></paper-input><paper-input id="inputService" label="Service" floatinglabel="true" required></paper-input><paper-input-decorator label="Service Data (JSON, optional)" floatinglabel="true"><textarea id="inputData" rows="5"></textarea></paper-input-decorator></div><div class="serviceContainer"><b>Available services:</b><services-list api="{{api}}" cbserviceclicked="{{serviceSelected}}"></services-list></div></div><paper-button dismissive="">Cancel</paper-button><paper-button affirmative="" on-click="{{clickCallService}}">Call Service</paper-button></paper-action-dialog></template><script>Polymer("service-call-dialog",{ready:function(){this.serviceSelected=this.serviceSelected.bind(this)},show:function(domain,service,serviceData){this.setService(domain,service);this.$.inputData.value=serviceData;this.$.dialog.toggle()},setService:function(domain,service){this.$.inputDomain.value=domain;this.$.inputService.value=service},serviceSelected:function(domain,service){this.setService(domain,service)},clickCallService:function(){var data;if(this.$.inputData.value!=""){data=JSON.parse(this.$.inputData.value)}this.api.call_service(this.$.inputDomain.value,this.$.inputService.value,data)}});</script></polymer-element><polymer-element name="entity-list" attributes="api cbEntityClicked" assetpath="polymer/"><template><style>:host{display:block}.entityContainer{font-size:1rem}</style><template if="{{cbEntityClicked}}"><style>a{text-decoration:underline;cursor:pointer}</style></template><div><template repeat="{{state in states}}"><div class="eventContainer"><a on-click="{{handleClick}}">{{state.entity_id}}</a></div></template></div></template><script>Polymer("entity-list",{cbEventClicked:null,states:[],domReady:function(){this.api.addEventListener("states-updated",this.statesUpdated.bind(this));this.statesUpdated()},statesUpdated:function(){this.states=this.api.states},handleClick:function(ev){if(this.cbEntityClicked){this.cbEntityClicked(ev.path[0].innerHTML)}}});</script></polymer-element><polymer-element name="state-set-dialog" attributes="api" assetpath="polymer/"><template><paper-action-dialog id="dialog" heading="Set State" transition="core-transition-bottom" backdrop="true"><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}paper-input:first-child{padding-top:0}.stateContainer{margin-left:30px}@media all and (max-width:620px){paper-action-dialog{margin:0;width:100%;height:calc(100% - 64px);top:64px}.stateContainer{display:none}}</style><div layout="" horizontal=""><div><paper-input id="inputEntityID" label="Entity ID" floatinglabel="true" autofocus required></paper-input><paper-input id="inputState" label="State" floatinglabel="true" required></paper-input><paper-input-decorator label="State attributes (JSON, optional)" floatinglabel="true"><textarea id="inputData" rows="5"></textarea></paper-input-decorator></div><div class="stateContainer"><b>Current entities:</b><entity-list api="{{api}}" cbentityclicked="{{entitySelected}}"></entity-list></div></div><paper-button dismissive="">Cancel</paper-button><paper-button affirmative="" on-click="{{clickSetState}}">Set State</paper-button></paper-action-dialog></template><script>Polymer("state-set-dialog",{ready:function(){this.entitySelected=this.entitySelected.bind(this)},show:function(entityId,state,stateData){this.setEntityId(entityId);this.setState(state);this.setStateData(stateData);this.$.dialog.toggle()},setEntityId:function(entityId){this.$.inputEntityID.value=entityId},setState:function(state){this.$.inputState.value=state},setStateData:function(stateData){var value=stateData?JSON.stringify(stateData,null,"  "):"";this.$.inputData.value=value},entitySelected:function(entityId){this.setEntityId(entityId);var state=this.api.getState(entityId);this.setState(state.state);this.setStateData(state.attributes)},clickSetState:function(){this.api.set_state(this.$.inputEntityID.value,this.$.inputState.value,JSON.parse(this.$.inputData.value))}});</script></polymer-element><polymer-element name="home-assistant-api" attributes="auth" assetpath="polymer/"><template><paper-toast id="toast" role="alert" text=""></paper-toast><event-fire-dialog id="eventDialog" api="{{api}}"></event-fire-dialog><service-call-dialog id="serviceDialog" api="{{api}}"></service-call-dialog><state-set-dialog id="stateDialog" api="{{api}}"></state-set-dialog></template><script>State=function(json,api){this.api=api;this.attributes=json.attributes;this.entity_id=json.entity_id;var parts=json.entity_id.split(".");this.domain=parts[0];this.entity=parts[1];if(this.attributes.friendly_name){this.entityDisplay=this.attributes.friendly_name}else{this.entityDisplay=this.entity.replace(/_/g," ")}this.state=json.state;this.last_changed=json.last_changed};Object.defineProperties(State.prototype,{stateDisplay:{get:function(){var state=this.state.replace(/_/g," ");if(this.attributes.unit_of_measurement){return state+" "+this.attributes.unit_of_measurement}else{return state}}},isCustomGroup:{get:function(){return this.domain=="group"&&!this.attributes.auto}},canToggle:{get:function(){return this.domain=="group"&&(this.state=="on"||this.state=="off")||this.api.hasService(this.domain,"turn_on")}}});Polymer("home-assistant-api",{auth:"not-set",states:[],services:[],events:[],stateUpdateTimeout:null,created:function(){this.api=this;this.turn_on=this.turn_on.bind(this);this.turn_off=this.turn_off.bind(this)},getState:function(entityId){var found=this.states.filter(function(state){return state.entity_id==entityId},this);return found.length>0?found[0]:null},hasService:function(domain,service){var found=this.services.filter(function(serv){return serv.domain==domain&&serv.services.indexOf(service)!==-1},this);return found.length>0},_laterFetchStates:function(){if(this.stateUpdateTimeout){clearTimeout(this.stateUpdateTimeout)}this.stateUpdateTimeout=setTimeout(this.fetchStates.bind(this),6e4)},_sortStates:function(states){states.sort(function(one,two){if(one.entity_id>two.entity_id){return 1}else if(one.entity_id<two.entity_id){return-1}else{return 0}})},_pushNewState:function(new_state){var state;var stateFound=false;for(var i=0;i<this.states.length;i++){if(this.states[i].entity_id==new_state.entity_id){state=this.states[i];state.attributes=new_state.attributes;state.last_changed=new_state.last_changed;state.state=new_state.state;stateFound=true;break}}if(!stateFound){this.states.push(new State(new_state,this));this._sortStates(this.states)}this.fire("states-updated")},fetchAll:function(){this.fetchStates();this.fetchServices();this.fetchEvents()},fetchState:function(entityId){var successStateUpdate=function(new_state){this._pushNewState(new_state)};this.call_api("GET","states/"+entityId,null,successStateUpdate.bind(this))},fetchStates:function(onSuccess,onError){var successStatesUpdate=function(newStates){this._sortStates(newStates);this.states=newStates.map(function(json){return new State(json,this)}.bind(this));this.fire("states-updated");this._laterFetchStates();if(onSuccess){onSuccess(this.states)}};this.call_api("GET","states",null,successStatesUpdate.bind(this),onError)},fetchEvents:function(onSuccess,onError){var successEventsUpdated=function(events){this.events=events;this.fire("events-updated");if(onSuccess){onSuccess(events)}};this.call_api("GET","events",null,successEventsUpdated.bind(this),onError)},fetchServices:function(onSuccess,onError){var successServicesUpdated=function(services){this.services=services;this.fire("services-updated");if(onSuccess){onSuccess(this.services)}};this.call_api("GET","services",null,successServicesUpdated.bind(this),onError)},turn_on:function(entity_id){var parts=entity_id.split(".");this.call_service(parts[0],"turn_on",{entity_id:entity_id})},turn_off:function(entity_id){var parts=entity_id.split(".");this.call_service(parts[0],"turn_off",{entity_id:entity_id})},set_state:function(entity_id,state,attributes){var payload={state:state};if(attributes){payload.attributes=attributes}var successToast=function(new_state){this.showToast("State of "+entity_id+" set to "+state+".");this._pushNewState(new_state)};this.call_api("POST","states/"+entity_id,payload,successToast.bind(this))},call_service:function(domain,service,parameters){parameters=parameters||{};var successToast=function(){if(service=="turn_on"&&parameters.entity_id){this.showToast("Turned on "+parameters.entity_id+".")}else if(service=="turn_off"&&parameters.entity_id){this.showToast("Turned off "+parameters.entity_id+".")}else{this.showToast("Service "+domain+"/"+service+" called.")}if(parameters&&parameters.entity_id){this.fetchStates()}};this.call_api("POST","services/"+domain+"/"+service,parameters,successToast.bind(this))},fire_event:function(eventType,eventData){eventData=eventData||{};var successToast=function(){this.showToast("Event "+eventType+" fired.")};this.call_api("POST","events/"+eventType,eventData,successToast.bind(this))},call_api:function(method,path,parameters,onSuccess,onError){var req=new XMLHttpRequest;req.open(method,"/api/"+path,true);req.setRequestHeader("X-HA-access",this.auth);req.onreadystatechange=function(){if(req.readyState==4){if(req.status>199&&req.status<300){if(onSuccess){onSuccess(JSON.parse(req.responseText))}}else{if(onError){var data=req.responseText?JSON.parse(req.responseText):{};onError(data)}}}}.bind(this);if(parameters){req.send(JSON.stringify(parameters))}else{req.send()}},showEditStateDialog:function(entityId){var state=this.getState(entityId);this.showSetStateDialog(entityId,state.state,state.attributes)},showSetStateDialog:function(entityId,state,stateAttributes){entityId=entityId||"";state=state||"";stateAttributes=stateAttributes||null;this.$.stateDialog.show(entityId,state,stateAttributes)},showFireEventDialog:function(eventType,eventData){eventType=eventType||"";eventData=eventData||"";this.$.eventDialog.show(eventType,eventData)},showCallServiceDialog:function(domain,service,serviceData){domain=domain||"";service=service||"";serviceData=serviceData||"";this.$.serviceDialog.show(domain,service,serviceData)},showToast:function(message){this.$.toast.text=message;this.$.toast.show()},logOut:function(){this.auth=""}});</script></polymer-element></div>
 
 <polymer-element name="splash-login" attributes="auth" assetpath="polymer/"><template><style>:host{font-family:RobotoDraft,'Helvetica Neue',Helvetica,Arial}paper-input{display:block}.login paper-button{margin-left:242px}.login .interact{height:125px}#validatebox{text-align:center}#validatemessage{margin-top:10px}</style><home-assistant-api auth="{{auth}}" id="api"></home-assistant-api><div layout="" horizontal="" center="" fit="" class="login" id="splash"><div layout="" vertical="" center="" flex=""><img src="/static/favicon-192x192.png"><h1>Home Assistant</h1><a href="polymer/#" id="hideKeyboardOnFocus"></a><div class="interact" layout="" vertical=""><div id="loginform"><paper-input-decorator label="Password" id="passwordDecorator"><input is="core-input" type="password" id="passwordInput" value="{{auth}}" on-keyup="{{passwordKeyup}}" autofocus></paper-input-decorator><paper-button on-click="{{validatePassword}}">Log In</paper-button></div><div id="validatebox" hidden><paper-spinner active="true"></paper-spinner><br><div id="validatemessage">Validating password...</div></div></div></div></div><home-assistant-main api="{{api}}" hidden id="main"></home-assistant-main></template><script>Polymer("splash-login",{state:"no_auth",auth:"",ready:function(){this.api=this.$.api},domReady:function(){document.getElementById("init").remove();if(this.auth){this.validatePassword()}},authChanged:function(oldVal,newVal){if(newVal===""&&this.state==="valid_auth"){this.state="no_auth"}},stateChanged:function(oldVal,newVal){if(newVal==="no_auth"){this.$.loginform.removeAttribute("hidden");this.$.validatebox.setAttribute("hidden",null);this.$.validatemessage.innerHTML="Validating password...";this.$.splash.removeAttribute("hidden");this.$.main.setAttribute("hidden",null)}else{this.$.splash.setAttribute("hidden",null);this.$.main.removeAttribute("hidden")}},passwordKeyup:function(ev){if(ev.keyCode===13){this.validatePassword()}else if(this.$.passwordDecorator.isInvalid){this.$.passwordDecorator.isInvalid=false}},validatePassword:function(){this.$.loginform.setAttribute("hidden",null);this.$.validatebox.removeAttribute("hidden");this.$.hideKeyboardOnFocus.focus();var passwordValid=function(result){this.$.validatemessage.innerHTML="Loading data...";this.api.fetchEvents();this.api.fetchStates(function(){this.state="valid_auth"}.bind(this))};var passwordInvalid=function(result){if(result&&result.message){this.$.passwordDecorator.error=result.message}else{this.$.passwordDecorator.error="Unexpected result from API"}this.auth=null;this.$.passwordDecorator.isInvalid=true;this.$.loginform.removeAttribute("hidden");this.$.validatebox.setAttribute("hidden",null);this.$.passwordInput.focus()};this.api.fetchServices(passwordValid.bind(this),passwordInvalid.bind(this))}});</script></polymer-element>
diff --git a/homeassistant/components/http/www_static/polymer/home-assistant-api.html b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
index 6bd7918fd4e..6f10dbaa84c 100644
--- a/homeassistant/components/http/www_static/polymer/home-assistant-api.html
+++ b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
@@ -206,11 +206,18 @@
     },
 
     turn_on: function(entity_id) {
-      this.call_service("homeassistant", "turn_on", {entity_id: entity_id});
+      // we call the turn_on method on the domain of the entity_id
+      // because the call to homeassistant.turn_on does not wait
+      // till the call is done.
+      var parts = entity_id.split(".");
+
+      this.call_service(parts[0], "turn_on", {entity_id: entity_id});
     },
 
     turn_off: function(entity_id) {
-      this.call_service("homeassistant", "turn_off", {entity_id: entity_id});
+      var parts = entity_id.split(".");
+
+      this.call_service(parts[0], "turn_off", {entity_id: entity_id});
     },
 
     set_state: function(entity_id, state, attributes) {
@@ -243,23 +250,7 @@
 
         // if we call a service on an entity_id, update the state
         if(parameters && parameters.entity_id) {
-          var update_func;
-
-          // if entity_id is a string, update 1 state, else all.
-          if(typeof(parameters.entity_id === "string")) {
-            // if it is a group, fetch all
-            if(parameters.entity_id.slice(0,6) == "group.") {
-              update_func = this.fetchStates;
-            } else {
-              update_func = function() {
-                this.fetchState(parameters.entity_id);
-              };
-            }
-          } else {
-            update_func = this.fetchStates;
-          }
-
-          setTimeout(update_func.bind(this), 1000);
+          this.fetchStates();
         }
       };
 
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 0dc4e7881e5..b8183edc2d0 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -20,7 +20,8 @@ EVENT_HOMEASSISTANT_START = "homeassistant_start"
 EVENT_HOMEASSISTANT_STOP = "homeassistant_stop"
 EVENT_STATE_CHANGED = "state_changed"
 EVENT_TIME_CHANGED = "time_changed"
-EVENT_CALL_SERVICE = "services.call"
+EVENT_CALL_SERVICE = "call_service"
+EVENT_SERVICE_EXECUTED = "service_executed"
 
 # #### STATES ####
 STATE_ON = 'on'
@@ -28,7 +29,7 @@ STATE_OFF = 'off'
 STATE_HOME = 'home'
 STATE_NOT_HOME = 'not_home'
 
-# #### STATE ATTRIBUTES ####
+# #### STATE AND EVENT ATTRIBUTES ####
 # Contains current time for a TIME_CHANGED event
 ATTR_NOW = "now"
 
@@ -36,6 +37,10 @@ ATTR_NOW = "now"
 ATTR_DOMAIN = "domain"
 ATTR_SERVICE = "service"
 
+# Data for a SERVICE_EXECUTED event
+ATTR_SERVICE_CALL_ID = "service_call_id"
+ATTR_RESULT = "result"
+
 # Contains one string or a list of strings, each being an entity id
 ATTR_ENTITY_ID = 'entity_id'