consolidated changes

Consolidated changes into one commit 
Please move from the `Futures.addCallback` to the try/catch paradigm.