Commented out functionality for devices not yet setup. They will follow in due course.