Rework the stores so they're standalone objects (day 41)