Add cancel facility.
Better naming.
refit content sources to use cancel facility.