HG-57 replace Q with Bluebird for promises, needs cleanup