Working on adding futures

Also fixing reactivation of saved contexts