Work on spell handling