reflects market API changes (pulled from Nikolai's repo)
reflects market API changes (pulled from Nikolai's repo)
merged conficting changes