REFACTOR: Spells and contacts