started refactoring stuff with bluebird