Have to create the zones that have external ids before the ones that don't or I can get dupes
Deref the device-model->model atom before it is set and closing over it is a recipe for confusion
Fix invalid chars in description
A little progress output, and a minor refactoring