Updating to use futures and config