Revamped switcher.py, included files to correspond