WIP
Fix bug with adding twice in store