Calculator now returns futures as planned