Added Switch

Still needs functionality