Lots of changes, moving to simpler future-based model.