JAVA-1332 with minimal Async changes.

I removed the larger async changes from #19 as it seemed to get in the way of the review and the updating of async/rx is best done once the apis are solidified.
This could certainly use a lot more tests of the various options, but I'm ok putting that off until a later commit