Switch Added

Needs to be debugged.