Add it ALL back inc. Switches

Added new switches plus all of it all back!