Get cancellation working...
5 files changed