Merging to continue work on spells