Smart Home upgrade

Out with the old in with the new