Adding devices almost done ;)