Move more stuff into device object.
Correct the none-ness checking.
Service and devices on the parent class.