Temporary device add implementation
Merging and fixing conflicts