Action logic complete. Just need to add device id and device type
Device id and type working