Sprint 2 Commit minus Store Class

Irene please pull then add store class