refactor to inject a store, name as the accountId and polishes