Merge Cameron's work to implement_spells