Added a bunch of stuff to do with switches... More later.