Work in progress; Add device