2nd attempt at tackling store issues

2nd attempt at tackling store issues