finish initial pass on local-store