Affix: respect the contract.
Various contract updates
Ditched gen/promises for plain 'ol callbacks