Adding `sweep()` and getting it in most places