WOOHOO...Added all device stuff