working on rewriting the store