Jhbate/quick scrub

update with work so far