Some progress, but need to refactor the entire Futures system now...