Yeah i've flattened out the futures myself (haven't pushed back to github yet). There's a lot of other cleanup to do, but that's all incidental now that something works