Finished port to new futures-based system.  Should finish README.md