I think you just about have it. The only thing I would say is that I think that each of the Zwave switches require a neutral wire at the switch. So if you want z-wave then you will have to consider this in your rewiring. -*-