Changed a lot, including switches, boxes, removal of Pb, and some hacky torch switches.