Working some more on spell switcher.