WIP migrating to bluebird promises. Refs #33