Adding devices and rooms - still a framework at the moment