Adding multiple lights (and switches) support

Not ready for use yet.