Sorcery functioning
Reconciled merge conflicts