Still refactoring spells into class heirarchy