Spell Map refactor complete and working