Reorg & filled in store scene
Store scene WIP