Update mage/champ to respect aideck in sandbox. Give mage same refactor I gave champ earlier