starting to add switcher