Complete refactor of spells