TODO
TODO
Removing a TODO that was already done.
More specific return types
More specific return types
Moving a method to clarify what's going on.
Compile fix
Simplifying the Executor stuff
Correcting the cancellation behavior
Doing less blocking
Doing less blocking
Our Future now implements Java Future
Executors instead of ExecutorServices
Merge branch 'development'