Feature/futures

Adding the futures features