updating to match server api changes
adding device stuff