Shutterbug persistence done, needs some clean up