Connected Living Space

Cherry-picked by pjf.
Closes #84.