BIC-93: Fixes to promise work in first half of ticket + completion of feature