Fleshing out the scrubber a little.
The scrubber is now working a little more as we might expect.