Move everything to Futures
Fix up / simplify the chaining of futures, and start working on failure handling.