Jhbate/quick scrub

merging progress so far