Added some toggling

I forget what else. merp, just check the diff