* Better promise handling
* Inclusion of bluebird to handle promises