Refactored future shared_state, hopefully right this time