WIP adding second device. Removed a bunch of files, added a bunch more.