Initial changes for new device class.  Not functional yet