Re-added scrubbing. This seems a little messy to me... I haven't found any bugs yet though.