Added two switches - also implemented a giant new feature