Refactor stores
Add to do list