- More fleshing out of devices