Working even more on spell switcher.