BREAKING CHANGE: abstracted the Economy interface. 
resolve merge conflicts with upstream