grep out scratch accesses and simpligy replay
Move skippie
More changes that probably belong in a stash than anywhere else