Fixing so that we have a Future that works