WIP on adding 2nd+ device
added email metadata field